Author: jukka
Date: Wed Nov 25 17:37:21 2009
New Revision: 884211
URL: http://svn.apache.org/viewvc?rev=884211&view=rev
Log:
JCR-2389: Update dependency versions for commons-collections, slf4j and derby
Patch by Sébastien Launay
Modified:
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/jackrabbit-standalone/pom.xml
jackrabbit/trunk/jackrabbit-webapp/pom.xml
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=884211&r1=884210&r2=884211&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Wed Nov 25 17:37:21 2009
@@ -40,8 +40,8 @@
</issueManagement>
<properties>
- <slf4j.version>1.5.3</slf4j.version>
- <jetty.version>6.1.14</jetty.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <jetty.version>6.1.22</jetty.version>
<tika.version>0.5</tika.version>
</properties>
@@ -177,22 +177,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -249,17 +234,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.2.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>10.2.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>10.2.1.6</version>
+ <version>10.5.3.0_1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -284,7 +259,7 @@
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
+ <artifactId>jsp-2.1-jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
@@ -293,19 +268,9 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
Modified: jackrabbit/trunk/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/pom.xml?rev=884211&r1=884210&r2=884211&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone/pom.xml Wed Nov 25 17:37:21 2009
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
+ <artifactId>jsp-2.1-jetty</artifactId>
</dependency>
<!--
JCR-1882: Explicitly declare versions of transitive Jetty dependencies
@@ -97,14 +97,6 @@
<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>
Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=884211&r1=884210&r2=884211&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Wed Nov 25 17:37:21 2009
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.9</version>
+ <version>${jetty.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
|