Author: dkulp
Date: Thu May 29 14:44:36 2014
New Revision: 1598309
URL: http://svn.apache.org/r1598309
Log:
Add bundles for latest JAXB that work with Java8
Added:
servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/
- copied from r1598303, servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/
servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/
- copied from r1598303, servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/
Modified:
servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/pom.xml
servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/pom.xml?rev=1598309&r1=1598303&r2=1598309&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.2.10/pom.xml Thu May 29 14:44:36
2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>11</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.6_2-SNAPSHOT</version>
+ <version>2.2.10_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.6</pkgVersion>
+ <pkgVersion>2.2.10-b140310.1920</pkgVersion>
<servicemix.osgi.export.pkg>
com.sun.xml.bind*;-split-package:=merge-first,
com.sun.istack*;-split-package:=merge-first,
@@ -48,6 +48,7 @@
javax.activation,
javax.imageio,
javax.imageio.stream,
+ javax.lang.model,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.annotation.adapters,
@@ -85,6 +86,12 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<version>1.0.0</version>
@@ -130,6 +137,7 @@
<artifactSet>
<includes>
<include>${pkgGroupId}:${pkgArtifactId}</include>
+ <include>${pkgGroupId}:jaxb-core</include>
</includes>
</artifactSet>
<filters>
@@ -139,6 +147,12 @@
<include>*.properties</include>
</includes>
</filter>
+ <filter>
+
<artifact>${pkgGroupId}:jaxb-core</artifact>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>true</createDependencyReducedPom>
Modified: servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/pom.xml?rev=1598309&r1=1598303&r2=1598309&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.10/pom.xml Thu May 29 14:44:36
2014
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>11</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.6_2-SNAPSHOT</version>
+ <version>2.2.10_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.6</pkgVersion>
+ <pkgVersion>2.2.10-b140310.1920</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,
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>2.2.6_1</version>
+ <version>2.2.10_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=1598309&r1=1598308&r2=1598309&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Thu May 29 14:44:36 2014
@@ -46,6 +46,8 @@
<module>jsmpp-2.1.0</module>
<module>aspectj-1.8.0</module>
<module>zxing-3.0.1</module>
+ <module>jaxb-impl-2.2.10</module>
+ <module>jaxb-xjc-2.2.10</module>
</modules>
</project>
