camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CAMEL-7110 Upgarde OpenJPA version to 2.3.0
Date Tue, 07 Jan 2014 02:33:20 GMT
Updated Branches:
  refs/heads/master 0b2c650fd -> c3bda4872


CAMEL-7110 Upgarde OpenJPA version to 2.3.0


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

Branch: refs/heads/master
Commit: c3bda487236ab8a03c19fe205b7d6c749581aec1
Parents: 0b2c650
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Jan 7 10:33:06 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Jan 7 10:33:06 2014 +0800

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


http://git-wip-us.apache.org/repos/asf/camel/blob/c3bda487/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4e4e544..3034f29 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -314,7 +314,7 @@
     <openwebbeans-version>1.1.5</openwebbeans-version>
     <ognl-version>3.0.8_1</ognl-version>
     <openejb-version>4.5.2</openejb-version>
-    <openjpa-version>2.2.2</openjpa-version>
+    <openjpa-version>2.3.0</openjpa-version>
     <opensaml-version>2.5.1_2</opensaml-version>
     <optaplanner-version>6.0.1.Final</optaplanner-version>
     <oro-bundle-version>2.0.8_6</oro-bundle-version>
@@ -421,6 +421,8 @@
     <xalan-bundle-version>2.7.1_5</xalan-bundle-version>
     <xalan-version>2.7.1</xalan-version>
     <xbean-spring-version>3.15</xbean-spring-version>
+    <!-- xbean-asm4-bundle is used by openjpa -->
+    <xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
     <xerces-bundle-version>2.11.0_1</xerces-bundle-version>
     <xerces-version>2.11.0</xerces-version>
     <!-- needed to manage the xml-apis version in camel-xmljson -->

http://git-wip-us.apache.org/repos/asf/camel/blob/c3bda487/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 57fcfc0..f522919 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -621,7 +621,7 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}</bundle>
     <bundle>mvn:org.apache.openjpa/openjpa/${openjpa-version}</bundle>
     <feature version='${spring-version-range}'>spring-orm</feature>
     <feature version='${project.version}'>camel-core</feature>


Mime
View raw message