You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/10/21 00:05:30 UTC
svn commit: r827816 - in /geronimo/server/trunk/framework:
configs/karaf-framework/pom.xml
configs/karaf-framework/src/main/history/dependencies.xml pom.xml
Author: gawor
Date: Tue Oct 20 22:05:30 2009
New Revision: 827816
URL: http://svn.apache.org/viewvc?rev=827816&view=rev
Log:
commons-logging is not needed
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/framework/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=827816&r1=827815&r2=827816&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Oct 20 22:05:30 2009
@@ -63,7 +63,7 @@
<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.url.version>1.1.2</pax.url.version>
<pax.web.version>0.6.0</pax.web.version>
<servlet.api.version>3.0</servlet.api.version>
<!--<spring.osgi.version>1.2.0</spring.osgi.version>-->
@@ -100,6 +100,55 @@
<artifactId>geronimo-rmi-loader</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
+ <version>${felix.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
+ <version>${felix.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
+ <version>${felix.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
+ <version>${felix.karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=827816&r1=827815&r2=827816&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Tue Oct 20 22:05:30 2009
@@ -12,11 +12,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=827816&r1=827815&r2=827816&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Oct 20 22:05:30 2009
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>1.0.0</version>
+ <version>1.1.2</version>
</dependency>
<!-- overridden dependencies -->