Author: maven-release Date: 2012-06-08 09:50:13 +0200 (Fri, 08 Jun 2012) New Revision: 707 Url: http://nuiton.org/repositories/revision/jrst/707 Log: Merge from branche Revert version to 1.6-SNAPSHOT Modified: trunk/ trunk/docutils/pom.xml trunk/doxia-module-jrst-legacy/pom.xml trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst-doc/src/site/resources/images/biohazard.png trunk/jrst/pom.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/jrst-docutils-jython:642-699 + /branches/jrst-docutils-jython:642-706 Modified: trunk/docutils/pom.xml =================================================================== (Binary files differ) Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2012-06-08 07:44:09 UTC (rev 706) +++ trunk/doxia-module-jrst/pom.xml 2012-06-08 07:50:13 UTC (rev 707) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.1-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/doxia-module-jrst-legacy/pom.xml =================================================================== --- trunk/doxia-module-jrst-legacy/pom.xml 2012-06-08 07:44:09 UTC (rev 706) +++ trunk/doxia-module-jrst-legacy/pom.xml 2012-06-08 07:50:13 UTC (rev 707) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.1-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> @@ -53,6 +53,14 @@ <groupId>xalan</groupId> <artifactId>xalan</artifactId> </exclusion> + <exclusion> + <groupId>org.nuiton.jrst</groupId> + <artifactId>docutils</artifactId> + </exclusion> + <exclusion> + <groupId>org.python</groupId> + <artifactId>jython-standalone</artifactId> + </exclusion> </exclusions> </dependency> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2012-06-08 07:44:09 UTC (rev 706) +++ trunk/jrst/pom.xml 2012-06-08 07:50:13 UTC (rev 707) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.1-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2012-06-08 07:44:09 UTC (rev 706) +++ trunk/jrst-doc/pom.xml 2012-06-08 07:50:13 UTC (rev 707) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.1-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Property changes on: trunk/jrst-doc/src/site/resources/images/biohazard.png ___________________________________________________________________ Modified: svn:mergeinfo - + /branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png:689-706 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-08 07:44:09 UTC (rev 706) +++ trunk/pom.xml 2012-06-08 07:50:13 UTC (rev 707) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.1-SNAPSHOT</version> + <version>1.6-SNAPSHOT</version> <modules> <module>docutils</module>