You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/01/07 09:20:43 UTC

[1/2] camel git commit: Upgrade OpenJPA to version 2.4.2

Repository: camel
Updated Branches:
  refs/heads/master e71b0b4e8 -> b20726641


Upgrade OpenJPA to version 2.4.2


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

Branch: refs/heads/master
Commit: 6e34c2ba069514309232d3774a59e40588833c65
Parents: e71b0b4
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Jan 7 10:17:37 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Jan 7 10:17:37 2017 +0100

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6e34c2ba/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1869751..29a2490 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -472,7 +472,7 @@
     <openhft-affinity-version>3.0.6</openhft-affinity-version>
     <openhft-compiler-version>2.2.5</openhft-compiler-version>
     <openhft-lang-version>6.8.2</openhft-lang-version>
-    <openjpa-version>2.4.1</openjpa-version>
+    <openjpa-version>2.4.2</openjpa-version>
     <openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
     <openstack4j-version>3.0.2</openstack4j-version>
     <openstack4j-guava-version>17.0</openstack4j-guava-version>

[2/2] camel git commit: CAMEL-10672: Karaf itests will now have to specify the org.apache.camel.karaf/apache-camel version to use through the camelKarafFeatureVersion system property. Added camelKarafFeatureVersion to default profile.

Posted by ac...@apache.org.
CAMEL-10672: Karaf itests will now have to specify the org.apache.camel.karaf/apache-camel version to use through the camelKarafFeatureVersion system property. Added camelKarafFeatureVersion to default profile.


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

Branch: refs/heads/master
Commit: b207266414885b39717473f0e21c1b1aa7082f39
Parents: 6e34c2b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Jan 7 10:18:52 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Jan 7 10:18:52 2017 +0100

----------------------------------------------------------------------
 tests/camel-itest-karaf/pom.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b2072664/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 4fe345a..c716808 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -199,6 +199,7 @@
           <!--<rerunFailingTestsCount>0</rerunFailingTestsCount>-->
           <systemPropertyVariables>
             <karafVersion>${karaf-version}</karafVersion>
+            <camelKarafFeatureVersion>${project.version}</camelKarafFeatureVersion>
           </systemPropertyVariables>
         </configuration>
       </plugin>