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/30 17:26:11 UTC
svn commit: r831374 - in /geronimo/server/trunk/framework:
configs/karaf-framework/src/main/history/dependencies.xml pom.xml
Author: gawor
Date: Fri Oct 30 16:26:10 2009
New Revision: 831374
URL: http://svn.apache.org/viewvc?rev=831374&view=rev
Log:
minor dependency fixes
Modified:
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/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=831374&r1=831373&r2=831374&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 Fri Oct 30 16:26:10 2009
@@ -248,16 +248,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.impl.bundle.jmx</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=831374&r1=831373&r2=831374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Oct 30 16:26:10 2009
@@ -65,7 +65,11 @@
<version>2.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
@@ -116,14 +120,19 @@
<version>1.1.1</version>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
- <version>1.4</version>
+ <version>${pax.logging.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
- <version>1.4</version>
+ <version>${pax.logging.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -131,11 +140,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <version>1.1.2</version>
- </dependency>
<!-- overridden dependencies -->
<!--<dependency>-->
@@ -202,22 +206,6 @@
<artifactId>jul-to-slf4j</artifactId>
<version>1.5.6</version>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>${pax.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <version>${pax.logging.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.bundles</groupId>-->
<!--<artifactId>plexus-archiver</artifactId>-->