You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/12/18 00:46:21 UTC
svn commit: r1551764 [1/2] - in /jspwiki/trunk: ./ jspwiki-it-tests/
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/
jspwiki-it-tests/jspwiki-it-test-cma/
jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/
jspwiki-it-tests/jspwiki-it-test-custom-jdbc/ j...
Author: juanpablo
Date: Tue Dec 17 23:46:20 2013
New Revision: 1551764
URL: http://svn.apache.org/r1551764
Log:
[maven-release-plugin] prepare release jspwiki_2_10_0_rc1
Modified:
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
jspwiki/trunk/jspwiki-it-tests/pom.xml
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-wikipages/de/pom.xml
jspwiki/trunk/jspwiki-wikipages/en/pom.xml
jspwiki/trunk/jspwiki-wikipages/es/pom.xml
jspwiki/trunk/jspwiki-wikipages/fi/pom.xml
jspwiki/trunk/jspwiki-wikipages/fr/pom.xml
jspwiki/trunk/jspwiki-wikipages/it/pom.xml
jspwiki/trunk/jspwiki-wikipages/nl/pom.xml
jspwiki/trunk/jspwiki-wikipages/pom.xml
jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml
jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<!-- Container Managed Authentication -->
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<artifactId>jspwiki-it-test-custom-jdbc</artifactId>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,16 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Tue Dec 17 23:46:20 2013
@@ -17,14 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.10.0</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
@@ -89,7 +87,7 @@
<type>hsqldb</type>
<database>jspwiki</database>
<username>sa</username>
- <password></password>
+ <password />
<sources>
<script>
<sourceFile>jspwiki-selenium-tests/src/main/config/hsql-userdb-setup.sql</sourceFile>
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,352 +1,350 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-war</artifactId>
- <name>Apache JSPWiki Main War</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge</groupId>
- <artifactId>sandler</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.metaparadigm</groupId>
- <artifactId>json-rpc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jvnet.hudson</groupId>
- <artifactId>org.suigeneris.jrcs.diff</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.freshcookies</groupId>
- <artifactId>freshcookies-security</artifactId>
- </dependency>
-
- <dependency>
- <groupId>ecs</groupId>
- <artifactId>ecs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge</groupId>
- <artifactId>akismet-java</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.stripes</groupId>
- <artifactId>stripes</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>sqltool</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>JSPWiki</finalName>
- <plugins>
- <!-- With below plugin can deploy to an embedded Tomcat instance via:
- mvn clean install tomcat7:run-war [-Dmaven.test.skip]
- ...or standalone by adding a <server/> entry "myTomcat":
- http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
- and running tomcat7:redeploy instead of run-war in
- string above.
-
- Either way, JSPWiki URL will be
- http://localhost:8080/JSPWiki
- -->
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <configuration>
- <server>myTomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
-
- <!-- Surefire plugin (running unit tests):
- http://maven.apache.org/surefire/maven-surefire-plugin/
-
- Individual tests can be run command line via:
- mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
-
- All tests can be skipped via -Dmaven.test.skip
- -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- time-consuming tests excluded by default -->
- <exclude>**/StressTestVersioningProvider.java</exclude>
- <exclude>**/StressTestSpeed.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
-
- <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
- Merge and compress CSS and JS files using the WRO4J.
- - use UglifyJS for JS compression
- - use Less as advanced CSS preprocessor
- -->
-
- <plugin>
- <groupId>ro.isdc.wro4j</groupId>
- <artifactId>wro4j-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- <!--<goal>jshint</goal>-->
- </goals>
- </execution>
- </executions>
- <configuration>
- <!--
- <targetGroups>all</targetGroups>
- <minimize>true</minimize>
- <cssDestinationFolder>d:/static/css/</cssDestinationFolder>
- <jsDestinationFolder>d:/static/js/</jsDestinationFolder>
- <ignoreMissingResources>false</ignoreMissingResources>
- -->
- <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
- <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder>
- <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder>
- <contextFolder>${basedir}/src/main/</contextFolder>
- <wroFile>src/main/config/wro/wro.xml</wroFile>
- <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile>
- </configuration>
- </plugin>
-
- <!-- Compress certain CSS and JS files using the YUICompressor
- (http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>compressJSfiles</id>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeResources>true</excludeResources>
- <nosuffix>true</nosuffix>
- <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
- *** relying on jslint-maven-plugin instead, which allows
- better customization ***
- <jswarn>false</jswarn>
- </configuration>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jslint-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>checkJSPWikiFiles</id>
- <goals>
- <goal>jslint</goal>
- </goals>
- <configuration>
- <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
- <failOnIssues>false</failOnIssues>
- <excludes>
- <exclude>prettify.js</exclude>
- </excludes>
- </configuration>
- </execution>
- <!-- Some third party JSs have many multiple number of VARs per function
- block, are outside of our control so suppressing such messages -->
- <execution>
- <id>checkThirdParty</id>
- <goals>
- <goal>jslint</goal>
- </goals>
- <configuration>
- <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
- <failOnIssues>false</failOnIssues>
- <includes>
- <include>prettify.js</include>
- </includes>
- <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <attachClasses>true</attachClasses>
- <webResources>
- <!-- Output directory configured above with the YUICompressor Maven plugin
- <resource>
- <directory>${project.build.directory}/generated-sources/yuicompress</directory>
- </resource>
- -->
- <resource>
- <directory>${project.build.directory}/generated-sources/wro</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-war</artifactId>
+ <name>Apache JSPWiki Main War</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>sandler</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.metaparadigm</groupId>
+ <artifactId>json-rpc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jvnet.hudson</groupId>
+ <artifactId>org.suigeneris.jrcs.diff</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freshcookies</groupId>
+ <artifactId>freshcookies-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ecs</groupId>
+ <artifactId>ecs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge</groupId>
+ <artifactId>akismet-java</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.stripes</groupId>
+ <artifactId>stripes</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>sqltool</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>JSPWiki</finalName>
+ <plugins>
+ <!-- With below plugin can deploy to an embedded Tomcat instance via:
+ mvn clean install tomcat7:run-war [-Dmaven.test.skip]
+ ...or standalone by adding a <server /> entry "myTomcat":
+ http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
+ and running tomcat7:redeploy instead of run-war in
+ string above.
+
+ Either way, JSPWiki URL will be
+ http://localhost:8080/JSPWiki
+ -->
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <server>myTomcat</server>
+ <url>http://localhost:8080/manager/text</url>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
+
+ <!-- Surefire plugin (running unit tests):
+ http://maven.apache.org/surefire/maven-surefire-plugin/
+
+ Individual tests can be run command line via:
+ mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
+
+ All tests can be skipped via -Dmaven.test.skip
+ -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- time-consuming tests excluded by default -->
+ <exclude>**/StressTestVersioningProvider.java</exclude>
+ <exclude>**/StressTestSpeed.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
+ Merge and compress CSS and JS files using the WRO4J.
+ - use UglifyJS for JS compression
+ - use Less as advanced CSS preprocessor
+ -->
+
+ <plugin>
+ <groupId>ro.isdc.wro4j</groupId>
+ <artifactId>wro4j-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ <!--<goal>jshint</goal>-->
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!--
+ <targetGroups>all</targetGroups>
+ <minimize>true</minimize>
+ <cssDestinationFolder>d:/static/css/</cssDestinationFolder>
+ <jsDestinationFolder>d:/static/js/</jsDestinationFolder>
+ <ignoreMissingResources>false</ignoreMissingResources>
+ -->
+ <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
+ <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder>
+ <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder>
+ <contextFolder>${basedir}/src/main/</contextFolder>
+ <wroFile>src/main/config/wro/wro.xml</wroFile>
+ <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile>
+ </configuration>
+ </plugin>
+
+ <!-- Compress certain CSS and JS files using the YUICompressor
+ (http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compressJSfiles</id>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeResources>true</excludeResources>
+ <nosuffix>true</nosuffix>
+ <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
+ *** relying on jslint-maven-plugin instead, which allows
+ better customization ***
+ <jswarn>false</jswarn>
+ </configuration>
+ </plugin>
+ -->
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jslint-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>checkJSPWikiFiles</id>
+ <goals>
+ <goal>jslint</goal>
+ </goals>
+ <configuration>
+ <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+ <failOnIssues>false</failOnIssues>
+ <excludes>
+ <exclude>prettify.js</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <!-- Some third party JSs have many multiple number of VARs per function
+ block, are outside of our control so suppressing such messages -->
+ <execution>
+ <id>checkThirdParty</id>
+ <goals>
+ <goal>jslint</goal>
+ </goals>
+ <configuration>
+ <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+ <failOnIssues>false</failOnIssues>
+ <includes>
+ <include>prettify.js</include>
+ </includes>
+ <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <attachClasses>true</attachClasses>
+ <webResources>
+ <!-- Output directory configured above with the YUICompressor Maven plugin
+ <resource>
+ <directory>${project.build.directory}/generated-sources/yuicompress</directory>
+ </resource>
+ -->
+ <resource>
+ <directory>${project.build.directory}/generated-sources/wro</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/de/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/de/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/de/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/de/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-de</artifactId>
- <name>Apache JSPWiki initial wiki pages (de)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-de</artifactId>
+ <name>Apache JSPWiki initial wiki pages (de)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/en/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/en/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/en/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/en/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-en</artifactId>
- <name>Apache JSPWiki initial wiki pages (en)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-en</artifactId>
+ <name>Apache JSPWiki initial wiki pages (en)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/es/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/es/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/es/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/es/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-es</artifactId>
- <name>Apache JSPWiki initial wiki pages (es)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-es</artifactId>
+ <name>Apache JSPWiki initial wiki pages (es)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/fi/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/fi/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/fi/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/fi/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-fi</artifactId>
- <name>Apache JSPWiki initial wiki pages (fi)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-fi</artifactId>
+ <name>Apache JSPWiki initial wiki pages (fi)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/fr/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/fr/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/fr/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/fr/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-fr</artifactId>
- <name>Apache JSPWiki initial wiki pages (fr)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-fr</artifactId>
+ <name>Apache JSPWiki initial wiki pages (fr)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/it/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/it/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/it/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/it/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-it</artifactId>
- <name>Apache JSPWiki initial wiki pages (it)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-it</artifactId>
+ <name>Apache JSPWiki initial wiki pages (it)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/nl/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/nl/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/nl/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/nl/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-nl</artifactId>
- <name>Apache JSPWiki initial wiki pages (nl)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-nl</artifactId>
+ <name>Apache JSPWiki initial wiki pages (nl)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,47 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <name>Apache JSPWiki initial wiki pages builder</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>de</module>
- <module>en</module>
- <module>es</module>
- <module>fi</module>
- <module>fr</module>
- <module>it</module>
- <module>nl</module>
- <module>pt_BR</module>
- <module>zh_CN</module>
- </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki</groupId>
+ <artifactId>jspwiki-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <name>Apache JSPWiki initial wiki pages builder</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>de</module>
+ <module>en</module>
+ <module>es</module>
+ <module>fi</module>
+ <module>fr</module>
+ <module>it</module>
+ <module>nl</module>
+ <module>pt_BR</module>
+ <module>zh_CN</module>
+ </modules>
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-pt_BR</artifactId>
- <name>Apache JSPWiki initial wiki pages (pt_BR)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-pt_BR</artifactId>
+ <name>Apache JSPWiki initial wiki pages (pt_BR)</name>
+
+</project>
Modified: jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml?rev=1551764&r1=1551763&r2=1551764&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml Tue Dec 17 23:46:20 2013
@@ -1,34 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
- xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.jspwiki.wikipages</groupId>
- <artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jspwiki-wikipages-zh_CN</artifactId>
- <name>Apache JSPWiki initial wiki pages (zh_CN)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.jspwiki.wikipages</groupId>
+ <artifactId>jspwiki-wikipages-builder</artifactId>
+ <version>2.10.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jspwiki-wikipages-zh_CN</artifactId>
+ <name>Apache JSPWiki initial wiki pages (zh_CN)</name>
+
+</project>