In that case, I would say go on wit 2.10.1 and drop JSPWIKI-841 for 2.10.2 regards, Harry Op 23 mei 2014 20:57 schreef "Juan Pablo Santos Rodríguez" < juanpablo.san...@gmail.com>:
> Hi Harry, > > haven't performed the "mvn release:perform" step yet, so we could still > rollback the release without manually reverting all the files. My intention > was to apply the patch at JSPWIKI-841 after releasing 2.10.1 (for 2.10.2), > as I didn't want to delay the release anymore. Also, to make JSPWIKI-841 > surface requires knowing about a property which hasn't been in > jspwiki.properties since at least 2.4.87, which is unlikely (although not > impossible, as demonstrated by that JIRA itself), so it didn't seem a > showstopper for me. > > That said, we can still rollback the release, apply the patch and rearrange > a new release; shouldn't be more than a couple of hours, so if you think is > worth including, please confirm and I'll push the patch into 2.10.1 > > > thx + br, > juan pablo > > > On Fri, May 23, 2014 at 6:34 PM, Harry Metske <harry.met...@gmail.com > >wrote: > > > JP, > > > > shouldn't we first commit JSPWIKI-841 (container managed security not > > working) ? > > > > kind regards, > > Harry > > > > > > > > On 23 May 2014 16:30, <juanpa...@apache.org> wrote: > > > > > Author: juanpablo > > > Date: Fri May 23 14:30:03 2014 > > > New Revision: 1597105 > > > > > > URL: http://svn.apache.org/r1597105 > > > Log: > > > [maven-release-plugin] prepare for next development iteration > > > > > > 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=1597105&r1=1597104&r2=1597105&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 Fri > > > May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> <!-- this enables tests reuse [1/3] --> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&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 Fri May > 23 > > > 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> <!-- this enables tests reuse [1/3] --> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&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 > > > Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> <!-- this enables tests reuse [1/3] --> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&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 > > Fri > > > May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> <!-- this enables tests reuse [1/3] --> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&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 Fri > May > > > 23 14:30:03 2014 > > > @@ -24,7 +24,7 @@ > > > <parent> <!-- this enables tests reuse [1/3] --> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml > > > (original) > > > +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Fri > May > > > 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.it</groupId> > > > <artifactId>jspwiki-it-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</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=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-it-tests/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-it-tests/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki</groupId> > > > <artifactId>jspwiki-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <groupId>org.apache.jspwiki.it</groupId> > > > > > > Modified: jspwiki/trunk/jspwiki-war/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-war/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-war/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki</groupId> > > > <artifactId>jspwiki-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/de/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/de/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/de/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/de/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/en/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/en/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/en/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/en/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/es/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/es/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/es/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/es/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/fi/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/fi/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/fi/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/fi/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/fr/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/fr/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/fr/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/fr/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/it/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/it/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/it/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/it/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/nl/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/nl/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/nl/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/nl/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/pom.xml Fri May 23 14:30:03 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki</groupId> > > > <artifactId>jspwiki-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml Fri May 23 14:30:03 > > 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml (original) > > > +++ jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml Fri May 23 14:30:03 > > 2014 > > > @@ -22,7 +22,7 @@ > > > <parent> > > > <groupId>org.apache.jspwiki.wikipages</groupId> > > > <artifactId>jspwiki-wikipages-builder</artifactId> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > </parent> > > > > > > <modelVersion>4.0.0</modelVersion> > > > > > > Modified: jspwiki/trunk/pom.xml > > > URL: > > > > > > http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1597105&r1=1597104&r2=1597105&view=diff > > > > > > > > > ============================================================================== > > > --- jspwiki/trunk/pom.xml (original) > > > +++ jspwiki/trunk/pom.xml Fri May 23 14:30:03 2014 > > > @@ -29,7 +29,7 @@ > > > <artifactId>jspwiki-builder</artifactId> > > > <modelVersion>4.0.0</modelVersion> > > > <name>Apache JSPWiki</name> > > > - <version>2.10.1</version> > > > + <version>2.10.2-SNAPSHOT</version> > > > <packaging>pom</packaging> > > > <description>Apache JSPWiki is a leading open source WikiWiki > engine, > > > feature-rich > > > and built around standard J2EE components (Java, servlets, > > > JSP).</description> > > > @@ -48,9 +48,9 @@ > > > </prerequisites> > > > > > > <scm> > > > - <connection>scm:svn: > > > http://svn.apache.org/repos/asf/jspwiki/tags/jspwiki_2_10_1 > </connection> > > > - <developerConnection>scm:svn: > > > https://svn.apache.org/repos/asf/jspwiki/tags/jspwiki_2_10_1 > > > </developerConnection> > > > - <url>http://svn.apache.org/viewvc/jspwiki/tags/jspwiki_2_10_1 > </url> > > > + <connection>scm:svn:http://svn.apache.org/repos/asf/jspwiki/trunk > > > </connection> > > > + <developerConnection>scm:svn: > > > https://svn.apache.org/repos/asf/jspwiki/trunk</developerConnection> > > > + <url>http://svn.apache.org/viewvc/jspwiki/trunk</url> > > > </scm> > > > > > > <modules> > > > > > > > > > > > >
