Author: dkulp
Date: Fri Oct 19 16:47:00 2012
New Revision: 1400160
URL: http://svn.apache.org/viewvc?rev=1400160&view=rev
Log:
[SMX4-1266] Create bundles for lates jaxb 2.2.x
Added:
servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/
- copied from r1400148, servicemix/smx4/bundles/trunk/jaxb-impl-2.2.4/
servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/
- copied from r1400148, servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.4/
Modified:
servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml
servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml?rev=1400160&r1=1400148&r2=1400160&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml Fri Oct 19 16:47:00
2012
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>2.2.4_3-SNAPSHOT</version>
+ <version>2.2.6_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -38,7 +38,7 @@
<properties>
<pkgGroupId>com.sun.xml.bind</pkgGroupId>
<pkgArtifactId>jaxb-impl</pkgArtifactId>
- <pkgVersion>2.2.4-1</pkgVersion>
+ <pkgVersion>2.2.6</pkgVersion>
<servicemix.osgi.export.pkg>
com.sun.xml.bind*;-split-package:=merge-first,
com.sun.istack*;-split-package:=merge-first,
@@ -61,6 +61,7 @@
javax.xml.transform.sax,
javax.xml.transform.stream,
javax.xml.validation,
+ javax.xml.xpath,
org.w3c.dom,
org.xml.sax,
org.xml.sax.ext,
@@ -92,6 +93,16 @@
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
<version>1.6.0</version>
+ <exclusions>
+ <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>
<!-- sources -->
Modified: servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml?rev=1400160&r1=1400148&r2=1400160&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml Fri Oct 19 16:47:00
2012
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>8</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-xjc</artifactId>
- <version>2.2.4_3-SNAPSHOT</version>
+ <version>2.2.6_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -38,7 +38,7 @@
<properties>
<pkgGroupId>com.sun.xml.bind</pkgGroupId>
<pkgArtifactId>jaxb-xjc</pkgArtifactId>
- <pkgVersion>2.2.4-1</pkgVersion>
+ <pkgVersion>2.2.6</pkgVersion>
<servicemix.osgi.export.pkg>
com.sun.tools.xjc*;-split-package:=merge-first;-noimport:=true,
com.sun.tools.jxc*;-split-package:=merge-first;-noimport:=true,
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>2.2.4_2</version>
+ <version>2.2.6_1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1400160&r1=1400159&r2=1400160&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Oct 19 16:47:00 2012
@@ -44,6 +44,8 @@
<modules>
<module>bcpg-jdk15on-1.47</module>
<module>bcprov-jdk15on-1.47</module>
+ <module>jaxb-xjc-2.2.6</module>
+ <module>jaxb-impl-2.2.4</module>
</modules>
</project>
