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/05/26 21:32:28 UTC
svn commit: r1486453 - in /incubator/jspwiki/branches/MVN3_BRANCH: ./
jspwiki-it-tests/ jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/
jspwiki-it-tests/jspwiki-it-test-custom-jdbc/
jspwiki-it-tests/jspwiki-it-test-custom/ jspwiki-it-tests/jspwi...
Author: juanpablo
Date: Sun May 26 19:32:28 2013
New Revision: 1486453
URL: http://svn.apache.org/r1486453
Log:
o.a.w.Release pointing to 2.10.0-svn-0
all pom.xml files pointing to 2.10.0-SNAPSHOT.
fixed checkstyle & codestyle files location at maven-eclipse-plugin
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.incubator.jspwiki.it</groupId>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.incubator.jspwiki.it</groupId>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.incubator.jspwiki.it</groupId>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Sun May 26 19:32:28 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun May 26 19:32:28 2013
@@ -55,16 +55,16 @@ public final class Release
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "incubating";
+ private static final String POSTFIX = "svn";
/** The JSPWiki major version. */
public static final int VERSION = 2;
/** The JSPWiki revision. */
- public static final int REVISION = 9;
+ public static final int REVISION = 10;
/** The minor revision. */
- public static final int MINORREVISION = 2;
+ public static final int MINORREVISION = 0;
/** The build number/identifier. This is a String as opposed to an integer, just
* so that people can add other identifiers to it. The build number is incremented
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "14";
+ public static final String BUILD = "0";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/pom.xml?rev=1486453&r1=1486452&r2=1486453&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/pom.xml Sun May 26 19:32:28 2013
@@ -25,7 +25,7 @@
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>Apache JSPWiki (Incubating)</name>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard J2EE components (Java, servlets, JSP).</description>
@@ -313,11 +313,11 @@
<additionalConfig>
<file>
<name>.checkstyle</name>
- <location>src/main/config/dev/jspwiki-checkstyle.xml</location>
+ <location>./jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml</location>
</file>
<file>
<name>.settings/org.eclipse.jdt.core.prefs</name>
- <location>src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+ <location>./jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
</file>
</additionalConfig>
<additionalProjectnatures>