camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [1/2] camel git commit: Revert "CAMEL-8198: Upgrade to JAXB 2.2.11 which is an OSGi bundle now."
Date Mon, 16 Mar 2015 03:18:52 GMT
Repository: camel
Updated Branches:
  refs/heads/master 204c315c8 -> b9fe0513f


Revert "CAMEL-8198: Upgrade to JAXB 2.2.11 which is an OSGi bundle now."

This reverts commit b7c37e50726cab0587004b0ee5b558697c0e3df9.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/69729b16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/69729b16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/69729b16

Branch: refs/heads/master
Commit: 69729b16fc2c7eb41d39359c371bd30febe634b6
Parents: 204c315
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Mon Mar 16 11:12:54 2015 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Mon Mar 16 11:12:54 2015 +0800

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/69729b16/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index db3ad5f..f951f01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,6 +240,7 @@
     <javax.el-version>2.2.4</javax.el-version>
     <javax-inject-bundle-version>1_2</javax-inject-bundle-version>
     <javax-mail-version>1.4.7</javax-mail-version>
+    <jaxb-bundle-version>2.2.6_1</jaxb-bundle-version>
     <jaxen-version>1.1.6</jaxen-version>
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
     <jboss-logging-version>3.1.4.GA</jboss-logging-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/69729b16/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 71c8db3..0483493 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -23,9 +23,9 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
-    <bundle dependency='true'>mvn:com.sun.xml.bind/jaxb-core/${jaxb-version}</bundle>

     <bundle>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
     <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
   </feature>
   <feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
@@ -1075,7 +1075,7 @@
     <bundle dependency='true'>mvn:org.kie/kie-internal/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-core/${drools-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-compiler/${drools-version}</bundle>
-    <bundle dependency='true'>mvn:com.sun.xml.bind/jaxb-xjc/${jaxb-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
     <!-- the ecj bundle on the central is malformed as both 'META-INF' and 'META-INF/MANIFEST.MF'
entries are NOT the first 2 entries inside the jar when -->
     <!-- one verifies this through 'jar -tf ecj-${eclipse-compiler-version}.jar'. one
possible workaround for this is to make use of the wrap protocol. -->
     <bundle dependency='true'>wrap:mvn:org.eclipse.jdt.core.compiler/ecj/${eclipse-compiler-version}</bundle>


Mime
View raw message