You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2016/06/02 15:01:40 UTC
[1/6] camel git commit: CAMEL-10011 - fix Overlap in management name
for multiple contexts in OSGi bundle
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 3628697f3 -> 4d90ef903
refs/heads/master a24158b45 -> fbd0a358f
CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi bundle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22e0a3e7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22e0a3e7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22e0a3e7
Branch: refs/heads/master
Commit: 22e0a3e78c93874f89db5d56b3c542afb7e9fd0e
Parents: a24158b
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 12:16:15 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:17:29 2016 -0230
----------------------------------------------------------------------
.../org/apache/camel/core/osgi/OsgiManagementNameStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/22e0a3e7/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
index 78468c6..d372aa1 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
@@ -46,7 +46,7 @@ public class OsgiManagementNameStrategy extends DefaultManagementNameStrategy {
private final BundleContext bundleContext;
public OsgiManagementNameStrategy(CamelContext camelContext, BundleContext bundleContext) {
- super(camelContext, "#symbolicName#", "#symbolicName#-#counter#");
+ super(camelContext, "#symbolicName#-#name#", "#symbolicName#-#name#-#counter#");
this.bundleContext = bundleContext;
}
[3/6] camel git commit: widen jms version range on camel-amqp to
match camel-jms
Posted by ja...@apache.org.
widen jms version range on camel-amqp to match camel-jms
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbd0a358
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbd0a358
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbd0a358
Branch: refs/heads/master
Commit: fbd0a358fafaba9fa1a92a3358860fd2707495f2
Parents: b902fb5
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 12:21:50 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:21:50 2016 -0230
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fbd0a358/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 70986ab..51a37ad 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -34,6 +34,7 @@
Remove this after migration to ServiceMix bundles. -->
<camel.osgi.import>
org.apache.qpid.jms,
+ javax.jms;version="[1.1,3)",
${camel.osgi.import.defaults},
*
</camel.osgi.import>
[5/6] camel git commit: get rid of redundant dependency
Posted by ja...@apache.org.
get rid of redundant dependency
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87e7e31b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87e7e31b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87e7e31b
Branch: refs/heads/camel-2.17.x
Commit: 87e7e31b22b4c8f870841642ad8a63f1f96c0b25
Parents: d3dcf62
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 00:26:37 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:31:20 2016 -0230
----------------------------------------------------------------------
components/camel-leveldb/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/87e7e31b/components/camel-leveldb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 316c8d2..e86d6ec 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -46,11 +46,6 @@
<version>${leveldbjni-version}</version>
</dependency>
<dependency>
- <groupId>org.fusesource.leveldbjni</groupId>
- <artifactId>leveldbjni</artifactId>
- <version>${leveldbjni-version}</version>
- </dependency>
- <dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>${hawtbuf-version}</version>
[4/6] camel git commit: CAMEL-10011 - fix Overlap in management name
for multiple contexts in OSGi bundle
Posted by ja...@apache.org.
CAMEL-10011 - fix Overlap in management name for multiple contexts in OSGi bundle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3dcf620
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3dcf620
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3dcf620
Branch: refs/heads/camel-2.17.x
Commit: d3dcf6205055718288d71ada448a052d04586aff
Parents: 3628697
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 12:16:15 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:31:20 2016 -0230
----------------------------------------------------------------------
.../org/apache/camel/core/osgi/OsgiManagementNameStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d3dcf620/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
index 78468c6..d372aa1 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiManagementNameStrategy.java
@@ -46,7 +46,7 @@ public class OsgiManagementNameStrategy extends DefaultManagementNameStrategy {
private final BundleContext bundleContext;
public OsgiManagementNameStrategy(CamelContext camelContext, BundleContext bundleContext) {
- super(camelContext, "#symbolicName#", "#symbolicName#-#counter#");
+ super(camelContext, "#symbolicName#-#name#", "#symbolicName#-#name#-#counter#");
this.bundleContext = bundleContext;
}
[2/6] camel git commit: get rid of redundant dependency
Posted by ja...@apache.org.
get rid of redundant dependency
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b902fb51
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b902fb51
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b902fb51
Branch: refs/heads/master
Commit: b902fb51b7682009cae4815e20222eb2d6c96843
Parents: 22e0a3e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 00:26:37 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:17:30 2016 -0230
----------------------------------------------------------------------
components/camel-leveldb/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b902fb51/components/camel-leveldb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 5947f45..ede0589 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -46,11 +46,6 @@
<version>${leveldbjni-version}</version>
</dependency>
<dependency>
- <groupId>org.fusesource.leveldbjni</groupId>
- <artifactId>leveldbjni</artifactId>
- <version>${leveldbjni-version}</version>
- </dependency>
- <dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>${hawtbuf-version}</version>
[6/6] camel git commit: widen jms version range on camel-amqp to
match camel-jms
Posted by ja...@apache.org.
widen jms version range on camel-amqp to match camel-jms
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d90ef90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d90ef90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d90ef90
Branch: refs/heads/camel-2.17.x
Commit: 4d90ef903c7a8fc9300cfe20acfceec8bd66b1e5
Parents: 87e7e31
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jun 2 12:21:50 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jun 2 12:31:21 2016 -0230
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4d90ef90/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 16fe612..1ca76d3 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -34,6 +34,7 @@
Remove this after migration to ServiceMix bundles. -->
<camel.osgi.import>
org.apache.qpid.jms,
+ javax.jms;version="[1.1,3)",
${camel.osgi.import.defaults},
*
</camel.osgi.import>