diff -Nru jackrabbit-1.5.7/jackrabbit-api/pom.xml jackrabbit-1.5.7-gil/jackrabbit-api/pom.xml --- jackrabbit-1.5.7/jackrabbit-api/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-api/pom.xml 2011-08-13 21:16:08.546825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-api</artifactId> diff -Nru jackrabbit-1.5.7/jackrabbit-classloader/pom.xml jackrabbit-1.5.7-gil/jackrabbit-classloader/pom.xml --- jackrabbit-1.5.7/jackrabbit-classloader/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-classloader/pom.xml 2011-08-13 21:16:08.541825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-classloader</artifactId> @@ -50,12 +50,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-api</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <!-- Logging --> @@ -73,7 +73,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> diff -Nru jackrabbit-1.5.7/jackrabbit-core/pom.xml jackrabbit-1.5.7-gil/jackrabbit-core/pom.xml --- jackrabbit-1.5.7/jackrabbit-core/pom.xml 2009-07-15 20:47:02.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-core/pom.xml 2011-08-13 21:16:08.542825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-core</artifactId> @@ -250,27 +250,27 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-api</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-text-extractors</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -292,13 +292,13 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-benchmark</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> diff -Nru jackrabbit-1.5.7/jackrabbit-jca/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jca/pom.xml --- jackrabbit-1.5.7/jackrabbit-jca/pom.xml 2009-07-15 20:47:02.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-jca/pom.xml 2011-08-13 21:16:08.542825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jca</artifactId> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr2spi/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr2spi/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr2spi/pom.xml 2009-07-15 20:47:02.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr2spi/pom.xml 2011-08-13 21:16:08.544825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr2spi</artifactId> @@ -150,17 +150,17 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -182,7 +182,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-benchmark/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-benchmark/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-benchmark/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-benchmark/pom.xml 2011-08-13 21:16:08.544825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-benchmark</artifactId> @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> </dependencies> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-commons/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-commons/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-commons/pom.xml 2009-04-24 10:49:00.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-commons/pom.xml 2011-08-13 21:16:08.546825933 +0200 @@ -29,11 +29,11 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> <name>Jackrabbit JCR Commons</name> <description>General purpose classes for use with the JCR API</description> <packaging>bundle</packaging> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-rmi/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-rmi/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-rmi/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-rmi/pom.xml 2011-08-13 21:16:08.548825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-rmi</artifactId> @@ -107,13 +107,13 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-api</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-server/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-server/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-server/pom.xml 2009-05-27 14:05:20.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-server/pom.xml 2011-08-13 21:16:08.542825933 +0200 @@ -29,12 +29,12 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-server</artifactId> <name>Jackrabbit JCR Server</name> - <version>1.5.6</version> + <version>1.5.7</version> <description>WebDAV server implementations for JCR</description> <scm> @@ -71,17 +71,17 @@ <!-- temporarily added dependency, needed as long as JCR2 interfaces are contained in jackrabbit-api --> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-api</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-webdav</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-servlet/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-servlet/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-servlet/pom.xml 2009-01-15 15:24:34.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-servlet/pom.xml 2011-08-13 21:16:08.543825933 +0200 @@ -29,12 +29,12 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-servlet</artifactId> <name>Jackrabbit JCR Servlets</name> - <version>1.5.2</version> + <version>1.5.7</version> <description> Servlets and related classes for easy use of JCR content repositories in web applications. @@ -53,18 +53,18 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.2</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-rmi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.5.2</version> + <version>1.5.7</version> <optional>true</optional> </dependency> </dependencies> diff -Nru jackrabbit-1.5.7/jackrabbit-jcr-tests/pom.xml jackrabbit-1.5.7-gil/jackrabbit-jcr-tests/pom.xml --- jackrabbit-1.5.7/jackrabbit-jcr-tests/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-jcr-tests/pom.xml 2011-08-13 21:16:08.544825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-jcr-tests</artifactId> diff -Nru jackrabbit-1.5.7/jackrabbit-ocm/pom.xml jackrabbit-1.5.7-gil/jackrabbit-ocm/pom.xml --- jackrabbit-1.5.7/jackrabbit-ocm/pom.xml 2009-02-22 18:41:44.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-ocm/pom.xml 2011-08-13 21:16:08.543825933 +0200 @@ -29,11 +29,11 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-ocm</artifactId> - <version>1.5.3</version> + <version>1.5.7</version> <name>Jackrabbit Object Content Mapping</name> <description> This Jackrabbit subproject is an object/JCR persistence and @@ -60,7 +60,13 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> + <maxmemory>512m</maxmemory> <source>1.5</source> + <aggregate>true</aggregate> + <links> + <link>http://java.sun.com/j2se/1.5.0/docs/api/</link> + <link>http://www.day.com/maven/jsr170/javadocs/jcr-1.0/</link> + </links> </configuration> </plugin> <plugin> @@ -69,6 +75,7 @@ <argLine>-Xmx256m</argLine> </configuration> </plugin> +<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> @@ -81,6 +88,7 @@ </execution> </executions> </plugin> +--> </plugins> </build> @@ -123,7 +131,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> @@ -141,6 +149,11 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> </dependencies> <scm> diff -Nru jackrabbit-1.5.7/jackrabbit-ocm-nodemanagement/pom.xml jackrabbit-1.5.7-gil/jackrabbit-ocm-nodemanagement/pom.xml --- jackrabbit-1.5.7/jackrabbit-ocm-nodemanagement/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-ocm-nodemanagement/pom.xml 2011-08-13 21:16:08.545825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-ocm-nodemanagement</artifactId> @@ -50,12 +50,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-ocm</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff -Nru jackrabbit-1.5.7/jackrabbit-parent/pom.xml jackrabbit-1.5.7-gil/jackrabbit-parent/pom.xml --- jackrabbit-1.5.7/jackrabbit-parent/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-parent/pom.xml 2011-08-13 21:16:08.548825933 +0200 @@ -36,7 +36,7 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> <name>Jackrabbit Parent POM</name> - <version>1.5.0</version> + <version>1.5.7</version> <packaging>pom</packaging> <!-- Keep the description on a single line. Otherwise Maven might generate @@ -96,8 +96,9 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <source>1.4</source> + <source>1.5</source> <aggregate>true</aggregate> + <maxmemory>512m</maxmemory> <links> <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> <link>http://www.day.com/maven/jsr170/javadocs/jcr-1.0/</link> @@ -160,11 +161,12 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> + <artifactId>maven-pmd-plugin</artifactId> </plugin> +<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> + <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -175,6 +177,7 @@ <findbugsXmlOutput>true</findbugsXmlOutput> </configuration> </plugin> +--> </plugins> </reporting> diff -Nru jackrabbit-1.5.7/jackrabbit-spi/pom.xml jackrabbit-1.5.7-gil/jackrabbit-spi/pom.xml --- jackrabbit-1.5.7/jackrabbit-spi/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-spi/pom.xml 2011-08-13 21:16:08.545825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-spi</artifactId> diff -Nru jackrabbit-1.5.7/jackrabbit-spi2jcr/pom.xml jackrabbit-1.5.7-gil/jackrabbit-spi2jcr/pom.xml --- jackrabbit-1.5.7/jackrabbit-spi2jcr/pom.xml 2009-07-15 14:35:40.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-spi2jcr/pom.xml 2011-08-13 21:16:08.546825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-spi2jcr</artifactId> @@ -87,25 +87,25 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <classifier></classifier> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi-commons</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -119,38 +119,38 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-benchmark</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-rmi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr2spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr2spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <classifier></classifier> <scope>test</scope> </dependency> @@ -159,5 +159,10 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff -Nru jackrabbit-1.5.7/jackrabbit-spi-commons/pom.xml jackrabbit-1.5.7-gil/jackrabbit-spi-commons/pom.xml --- jackrabbit-1.5.7/jackrabbit-spi-commons/pom.xml 2009-04-24 10:49:00.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-spi-commons/pom.xml 2011-08-13 21:16:08.547825933 +0200 @@ -29,11 +29,11 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-spi-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> <name>Jackrabbit SPI Commons</name> <scm> @@ -190,12 +190,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-spi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>commons-collections</groupId> diff -Nru jackrabbit-1.5.7/jackrabbit-standalone/pom.xml jackrabbit-1.5.7-gil/jackrabbit-standalone/pom.xml --- jackrabbit-1.5.7/jackrabbit-standalone/pom.xml 2009-07-15 20:47:02.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-standalone/pom.xml 2011-08-13 21:16:08.545825933 +0200 @@ -1,41 +1,41 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - -<!-- ====================================================================== --> -<!-- P R O J E C T D E S C R I P T I O N --> -<!-- ====================================================================== --> - <parent> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> - <relativePath>../jackrabbit-parent/pom.xml</relativePath> - </parent> - <artifactId>jackrabbit-standalone</artifactId> - <name>Jackrabbit Standalone</name> +<?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"> + <modelVersion>4.0.0</modelVersion> + +<!-- ====================================================================== --> +<!-- P R O J E C T D E S C R I P T I O N --> +<!-- ====================================================================== --> + <parent> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-parent</artifactId> + <version>1.5.7</version> + <relativePath>../jackrabbit-parent/pom.xml</relativePath> + </parent> + <artifactId>jackrabbit-standalone</artifactId> + <name>Jackrabbit Standalone</name> <version>1.5.7</version> - <description>Runnable jar packaging of Apache Jackrabbit</description> + <description>Runnable jar packaging of Apache Jackrabbit</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -109,92 +109,92 @@ </build> </profile> </profiles> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.apache.jackrabbit.standalone.Main</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-dependencies</id> - <phase>process-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - <excludes> - LICENSE*, NOTICE*, META-INF/LICENSE*, META-INF/NOTICE*, - license, license/**/*, test, test/**/*, - WEB-INF/web.xml, WEB-INF/log4j.*, - WEB-INF/lib, WEB-INF/lib/**/*, - WEB-INF/classes, WEB-INF/classes/**/* - </excludes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-webapp</artifactId> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.apache.jackrabbit.standalone.Main</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-dependencies</id> + <phase>process-resources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + <excludes> + LICENSE*, NOTICE*, META-INF/LICENSE*, META-INF/NOTICE*, + license, license/**/*, test, test/**/*, + WEB-INF/web.xml, WEB-INF/log4j.*, + WEB-INF/lib, WEB-INF/lib/**/*, + WEB-INF/classes, WEB-INF/classes/**/* + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-webapp</artifactId> <version>1.5.7</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-webapp</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-webapp</artifactId> <version>1.5.7</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1</artifactId> - </dependency> - <!-- - JCR-1882: Explicitly declare versions of transitive Jetty dependencies - to avoid problems with the ${project.version} setting that Jetty uses. - --> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1</artifactId> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - -</project> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + </dependency> + <!-- + JCR-1882: Explicitly declare versions of transitive Jetty dependencies + to avoid problems with the ${project.version} setting that Jetty uses. + --> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + +</project> diff -Nru jackrabbit-1.5.7/jackrabbit-text-extractors/pom.xml jackrabbit-1.5.7-gil/jackrabbit-text-extractors/pom.xml --- jackrabbit-1.5.7/jackrabbit-text-extractors/pom.xml 2008-12-02 14:02:14.000000000 +0100 +++ jackrabbit-1.5.7-gil/jackrabbit-text-extractors/pom.xml 2011-08-13 21:16:08.543825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-text-extractors</artifactId> diff -Nru jackrabbit-1.5.7/jackrabbit-webapp/pom.xml jackrabbit-1.5.7-gil/jackrabbit-webapp/pom.xml --- jackrabbit-1.5.7/jackrabbit-webapp/pom.xml 2009-07-15 20:47:02.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-webapp/pom.xml 2011-08-13 21:16:08.547825933 +0200 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-webapp</artifactId> @@ -140,12 +140,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-server</artifactId> - <version>1.5.6</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-webdav</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> <exclusions> <!-- JCR-683: The commons-httpclient dependency from --> <!-- jackrabbit-webapp depends on commons-logging. Since this --> @@ -161,12 +161,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-servlet</artifactId> - <version>1.5.2</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-rmi</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff -Nru jackrabbit-1.5.7/jackrabbit-webdav/pom.xml jackrabbit-1.5.7-gil/jackrabbit-webdav/pom.xml --- jackrabbit-1.5.7/jackrabbit-webdav/pom.xml 2009-04-24 10:49:00.000000000 +0200 +++ jackrabbit-1.5.7-gil/jackrabbit-webdav/pom.xml 2011-08-13 21:16:08.543825933 +0200 @@ -29,11 +29,11 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>../jackrabbit-parent/pom.xml</relativePath> </parent> <artifactId>jackrabbit-webdav</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> <name>Jackrabbit WebDAV Library</name> <description>WebDAV library used by the Jackrabbit WebDAV support</description> @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> - <version>1.5.5</version> + <version>1.5.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff -Nru jackrabbit-1.5.7/pom.xml jackrabbit-1.5.7-gil/pom.xml --- jackrabbit-1.5.7/pom.xml 2009-07-15 14:35:40.000000000 +0200 +++ jackrabbit-1.5.7-gil/pom.xml 2011-08-13 21:16:08.544825933 +0200 @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-parent</artifactId> - <version>1.5.0</version> + <version>1.5.7</version> <relativePath>jackrabbit-parent/pom.xml</relativePath> </parent>