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 2014/11/11 15:49:05 UTC
[2/3] camel git commit: Use Karaf pom versions
Use Karaf pom versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49bf494b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49bf494b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49bf494b
Branch: refs/heads/master
Commit: 49bf494b06408aee726745dc0777f6426ebf3d83
Parents: a344ba7
Author: Jyrki Ruuskanen <yu...@kotikone.fi>
Authored: Mon Nov 10 22:07:48 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 11 15:48:51 2014 +0100
----------------------------------------------------------------------
.../apache/camel/scr/AbstractCamelRunner.java | 2 +-
.../main/resources/archetype-resources/pom.xml | 27 ++++----------------
2 files changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/49bf494b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
----------------------------------------------------------------------
diff --git a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index 9d583e1..7b4610c 100644
--- a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++ b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -257,7 +257,7 @@ public abstract class AbstractCamelRunner implements Runnable {
log.debug("Set field {} with value {}", field.getName(), propertyValue);
}
} catch (Exception e) {
- log.debug("Error setting field " + field.getName() + " due: " + e.getMessage() + ". This exception is ignored.", e);
+ log.debug("Error setting field " + field.getName() + " due: " + e.getMessage() + ". This exception is ignored.");
}
}
return target;
http://git-wip-us.apache.org/repos/asf/camel/blob/49bf494b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index abc6b21..df5bc38 100644
--- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -63,24 +63,11 @@ This file was generated from ${archetypeGroupId}/${archetypeArtifactId}/${archet
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>2.4.0</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -107,10 +94,6 @@ This file was generated from ${archetypeGroupId}/${archetypeArtifactId}/${archet
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>