You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/18 14:32:04 UTC
[1/3] camel git commit: Reduce dependency in Camel commands to avoid
class loading issues for 3rd parties.
Repository: camel
Updated Branches:
refs/heads/master a17d10ccb -> 56ddf955f
Reduce dependency in Camel commands to avoid class loading issues for 3rd parties.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4adde28e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4adde28e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4adde28e
Branch: refs/heads/master
Commit: 4adde28e308aefd65916beb7e3d20809c4ecd460
Parents: a17d10c
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 18 14:24:41 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 18 14:24:41 2015 +0100
----------------------------------------------------------------------
platforms/commands/commands-core/pom.xml | 4 ----
platforms/commands/commands-jolokia/pom.xml | 4 ----
.../apache/camel/commands/jolokia/JolokiaClientFactory.java | 6 ------
3 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4adde28e/platforms/commands/commands-core/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index bf5a011..8adc045 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -45,10 +45,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<!-- Test -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4adde28e/platforms/commands/commands-jolokia/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/pom.xml b/platforms/commands/commands-jolokia/pom.xml
index 74d8492..168386c 100644
--- a/platforms/commands/commands-jolokia/pom.xml
+++ b/platforms/commands/commands-jolokia/pom.xml
@@ -41,10 +41,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-commands-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<!-- jolokia -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4adde28e/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
index 69a9ac0..b8c3046 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
@@ -19,8 +19,6 @@ package org.apache.camel.commands.jolokia;
import org.jolokia.client.BasicAuthenticator;
import org.jolokia.client.J4pClient;
import org.jolokia.client.J4pClientBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
@@ -29,14 +27,10 @@ import static org.apache.camel.util.ObjectHelper.isNotEmpty;
*/
public final class JolokiaClientFactory {
- private static final Logger LOG = LoggerFactory.getLogger(JolokiaClientFactory.class);
-
private JolokiaClientFactory() {
}
public static J4pClient createJolokiaClient(String jolokiaUrl, String username, String password) {
- LOG.info("Creating jolokia client at URL: {}", jolokiaUrl);
-
J4pClientBuilder builder = J4pClient.url(jolokiaUrl);
boolean auth = false;
if (isNotEmpty(username)) {
[3/3] camel git commit: Reduce dependency in Camel commands to avoid
class loading issues for 3rd parties.
Posted by da...@apache.org.
Reduce dependency in Camel commands to avoid class loading issues for 3rd parties.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56ddf955
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56ddf955
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56ddf955
Branch: refs/heads/master
Commit: 56ddf955ff1fce0ee6f214ac09cf682ccb028294
Parents: 6fa248a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 18 14:31:24 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 18 14:31:24 2015 +0100
----------------------------------------------------------------------
.../apache/camel/commands/jolokia/JolokiaClientFactory.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/56ddf955/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
index b8c3046..e56a16e 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java
@@ -20,8 +20,6 @@ import org.jolokia.client.BasicAuthenticator;
import org.jolokia.client.J4pClient;
import org.jolokia.client.J4pClientBuilder;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-
/**
* A factory to create a {@link org.jolokia.client.J4pClient} jolokia client that connects to a remote JVM.
*/
@@ -47,4 +45,8 @@ public final class JolokiaClientFactory {
return builder.build();
}
+ private static boolean isNotEmpty(String text) {
+ return text != null && !text.isEmpty();
+ }
+
}
[2/3] camel git commit: Catalog should have test scope for jackson
Posted by da...@apache.org.
Catalog should have test scope for jackson
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6fa248a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6fa248a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6fa248a3
Branch: refs/heads/master
Commit: 6fa248a3f4cec18a6e924ae74caaa81e42811e1d
Parents: 4adde28
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 18 14:24:53 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 18 14:24:53 2015 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6fa248a3/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index f61325d..94321d2 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -44,6 +44,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson2-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>