camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhira...@apache.org
Subject camel git commit: CAMEL-8609: Removed open-jpa bundle from camel-jpa feature, updated itests to load the openjpa bundle explicitly
Date Thu, 09 Apr 2015 18:34:51 GMT
Repository: camel
Updated Branches:
  refs/heads/master 1073ef853 -> 581910646


CAMEL-8609: Removed open-jpa bundle from camel-jpa feature, updated itests to load the openjpa
bundle explicitly


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

Branch: refs/heads/master
Commit: 581910646e8fa87939e238dc1196c6253b8b1768
Parents: 1073ef8
Author: Dhiraj Bokde <dhirajsb@yahoo.com>
Authored: Thu Apr 9 11:29:28 2015 -0700
Committer: Dhiraj Bokde <dhirajsb@yahoo.com>
Committed: Thu Apr 9 11:34:38 2015 -0700

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml            | 1 -
 .../java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java | 1 +
 .../src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/58191064/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 d44eb20..c035f29 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -831,7 +831,6 @@
     <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.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.openjpa/openjpa/${openjpa-version}</bundle>
     <feature version='${spring-version-range-karaf}'>spring-orm</feature>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-jpa/${project.version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/58191064/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
index 3675e3e..1c0f263 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
@@ -70,6 +70,7 @@ public class JpaBlueprintRouteTest extends OSGiBlueprintTestSupport {
                     .build()),
                
                 scanFeatures(getKarafEnterpriseFeatureUrl(), "jndi", "jpa", "transaction"),
+                mavenBundle("org.apache.openjpa", "openjpa", "2.3.0"),
                 mavenBundle("org.apache.derby", "derby", "10.4.2.0"),
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),

http://git-wip-us.apache.org/repos/asf/camel/blob/58191064/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
index 3d111b8..e3bb417 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
@@ -136,6 +136,7 @@ public class JpaRouteTest extends OSGiIntegrationTestSupport {
             loadCamelFeatures("camel-jpa"),
 
             // use derby as the database
+            mavenBundle().groupId("org.apache.openjpa").artifactId("openjpa").version("2.3.0"),
             mavenBundle().groupId("org.apache.derby").artifactId("derby").version("10.4.2.0"));
 
         return options;


Mime
View raw message