camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [1/2] camel git commit: Upgrade Johnzon to version 1.1.0
Date Mon, 15 May 2017 06:35:19 GMT
Repository: camel
Updated Branches:
  refs/heads/master 62fc367ee -> 8e1d10a46


Upgrade Johnzon to version 1.1.0


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

Branch: refs/heads/master
Commit: 805fa85fae63f37c320742f86674417c079d1aad
Parents: 62fc367
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Mon May 15 08:31:20 2017 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Mon May 15 08:31:20 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/805fa85f/components/camel-johnzon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 611298b..8352bb2 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-json_1.0_spec</artifactId>
+          <artifactId>geronimo-json_1.1_spec</artifactId>
           <version>${geronimo-json-spec-version}</version>
           <scope>compile</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/805fa85f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3f4c417..c72b97b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -232,7 +232,7 @@
     <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
     <geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
     <geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version>
-    <geronimo-json-spec-version>1.0-alpha-1</geronimo-json-spec-version>
+    <geronimo-json-spec-version>1.0</geronimo-json-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
     <geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version>
@@ -368,7 +368,7 @@
     <jolokia-version>1.3.6</jolokia-version>
     <jolt-version>0.1.0</jolt-version>
     <jolt-bundle-version>0.1.0_1</jolt-bundle-version>
-    <johnzon-version>1.0.0</johnzon-version>
+    <johnzon-version>1.1.0</johnzon-version>
     <josql-bundle-version>1.5_5</josql-bundle-version>
     <josql-version>1.5</josql-version>
     <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->

http://git-wip-us.apache.org/repos/asf/camel/blob/805fa85f/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 69bf7ef..321496a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1077,7 +1077,7 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.0_spec/${geronimo-json-spec-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${geronimo-json-spec-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-johnzon/${project.version}</bundle>
   </feature>
   <feature name='camel-josql' version='${project.version}' resolver='(obr)' start-level='50'>


Mime
View raw message