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 2016/10/14 11:23:52 UTC
[1/2] camel git commit: Use directly the JNats bundle instead of the
one from Servicemix, from 0.5.3 JNats is a bundle
Repository: camel
Updated Branches:
refs/heads/master 25d2f4b84 -> 1e96d6331
Use directly the JNats bundle instead of the one from Servicemix, from 0.5.3 JNats is a bundle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/041f1024
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/041f1024
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/041f1024
Branch: refs/heads/master
Commit: 041f102428ff4dba9c18ccf8b76b978cd89b3dfd
Parents: 25d2f4b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Oct 14 13:19:05 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Oct 14 13:19:40 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/041f1024/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ca0b53b..e0d8c73 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -293,7 +293,6 @@
<java-ewah-version>0.7.9</java-ewah-version>
<jna-version>4.2.1</jna-version>
<jnats-version>0.5.3</jnats-version>
- <jnats-bundle-version>0.5.3_1</jnats-bundle-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
<javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/041f1024/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 df432a8..78413bc 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1245,7 +1245,7 @@
</feature>
<feature name='camel-nats' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jnats/${jnats-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:io.nats/jnats/${jnats-version}</bundle>
<bundle>mvn:org.apache.camel/camel-nats/${project.version}</bundle>
</feature>
<feature name='camel-netty' version='${project.version}' resolver='(obr)' start-level='50'>
[2/2] camel git commit: Upgrade JNats to version 0.6.0
Posted by ac...@apache.org.
Upgrade JNats to version 0.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e96d633
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e96d633
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e96d633
Branch: refs/heads/master
Commit: 1e96d6331238aa867d0417bb676b9103e4636236
Parents: 041f102
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Oct 14 13:23:11 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Oct 14 13:23:11 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1e96d633/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e0d8c73..e117fda 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -292,7 +292,7 @@
<java-apns-version>1.0.0.Beta6</java-apns-version>
<java-ewah-version>0.7.9</java-ewah-version>
<jna-version>4.2.1</jna-version>
- <jnats-version>0.5.3</jnats-version>
+ <jnats-version>0.6.0</jnats-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
<javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/1e96d633/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 78413bc..d1034d7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1246,6 +1246,7 @@
<feature name='camel-nats' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.nats/jnats/${jnats-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle>mvn:org.apache.camel/camel-nats/${project.version}</bundle>
</feature>
<feature name='camel-netty' version='${project.version}' resolver='(obr)' start-level='50'>