You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/10/14 02:11:35 UTC
svn commit: r824982 [2/2] - in /geronimo/sandbox/djencks/osgi/framework: ./
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
bundles/log4j/ bundles/slf4j/ bundles/wstx-asl/ configs/client-system/
configs/client-system/s...
Modified: geronimo/sandbox/djencks/osgi/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/pom.xml?rev=824982&r1=824981&r2=824982&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/pom.xml Wed Oct 14 00:11:33 2009
@@ -33,6 +33,9 @@
<artifactId>framework</artifactId>
<name>Geronimo Framework</name>
<packaging>pom</packaging>
+ <properties>
+ <pax.logging.version>1.4</pax.logging.version>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -113,6 +116,28 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>1.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- bundleized jars -->
@@ -132,14 +157,50 @@
<version>1.0_1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>slf4j</artifactId>
- <version>1.5.5_1-SNAPSHOT</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <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>-->
+ <!--<version>1.0.9_1-SNAPSHOT</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0.9_1-SNAPSHOT</version>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
@@ -161,6 +222,12 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
<version>1.1_2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -176,6 +243,24 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>2.1.6_1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -191,6 +276,16 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<version>2.4.0_2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -208,6 +303,12 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
<version>1.3_2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -219,6 +320,12 @@
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>