You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/08/10 10:16:33 UTC
svn commit: r802688 - in /felix/trunk/karaf: assembly/pom.xml
jaas/jaas-config/pom.xml pom.xml
Author: gnodet
Date: Mon Aug 10 08:16:33 2009
New Revision: 802688
URL: http://svn.apache.org/viewvc?rev=802688&view=rev
Log:
Upgrade various pax dependencies
Modified:
felix/trunk/karaf/assembly/pom.xml
felix/trunk/karaf/jaas/jaas-config/pom.xml
felix/trunk/karaf/pom.xml
Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=802688&r1=802687&r2=802688&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Mon Aug 10 08:16:33 2009
@@ -159,10 +159,6 @@
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
Modified: felix/trunk/karaf/jaas/jaas-config/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/pom.xml?rev=802688&r1=802687&r2=802688&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/jaas-config/pom.xml (original)
+++ felix/trunk/karaf/jaas/jaas-config/pom.xml Mon Aug 10 08:16:33 2009
@@ -60,21 +60,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>blueprint-bundle</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=802688&r1=802687&r2=802688&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Mon Aug 10 08:16:33 2009
@@ -67,8 +67,6 @@
</prerequisites>
<properties>
- <aopalliance.version>1.0_1</aopalliance.version>
- <cglib.version>2.1_3_2-SNAPSHOT</cglib.version>
<commons.logging.version>1.1.1</commons.logging.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
@@ -92,12 +90,12 @@
<log4j.version>1.2.14</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.0-M6</mina.version>
- <pax.exam.version>0.5.0</pax.exam.version>
- <pax.logging.version>1.3.1-SNAPSHOT</pax.logging.version>
- <pax.url.version>0.3.3</pax.url.version>
+ <pax.exam.version>1.0.0</pax.exam.version>
+ <pax.logging.version>1.4</pax.logging.version>
+ <pax.runner.version>1.1.1</pax.runner.version>
+ <pax.url.version>1.0.0</pax.url.version>
<pax.web.version>0.6.0</pax.web.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.specs.version>1.4-SNAPSHOT</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<spring.version>2.5.6.SEC01</spring.version>
@@ -246,7 +244,7 @@
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.demos</artifactId>
<version>${pom.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.felix.karaf.features</groupId>
<artifactId>org.apache.felix.karaf.features.core</artifactId>
@@ -521,56 +519,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.oro</artifactId>
- <version>${oro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
- <version>${aopalliance.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>${cglib.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
- <version>${commons.jexl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
- <version>${commons.vfs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -705,7 +657,7 @@
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<version>${equinox.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -715,6 +667,12 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>blueprint-bundle</artifactId>
<version>${geronimo.blueprint.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix.gogo</groupId>
@@ -726,6 +684,11 @@
<artifactId>org.apache.felix.gogo.commands</artifactId>
<version>${felix.gogo.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ <version>${pax.runner.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>