You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/27 04:24:56 UTC
[1/3] camel git commit: Fixed CS errors
Repository: camel
Updated Branches:
refs/heads/master a891c651a -> 04ba08b08
Fixed CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4fc424fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fc424fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fc424fc
Branch: refs/heads/master
Commit: 4fc424fc8d6aa8b35ff87f8872d9aed6e98d1fee
Parents: a891c65
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 11:17:34 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 11:17:34 2015 +0800
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/main/MainSupport.java | 2 +-
.../camel/component/google/calendar/GoogleCalendarEndpoint.java | 3 ++-
.../apache/camel/component/google/drive/GoogleDriveEndpoint.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc424fc/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index 726e0d6..de0fbdf 100644
--- a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -205,7 +205,7 @@ public abstract class MainSupport extends ServiceSupport {
for (MainListener listener : listeners) {
listener.afterStop(this);
}
- }
+ }
private void internalBeforeStop() {
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc424fc/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index f8d1cb4..838415c 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Represents a GoogleCalendar endpoint.
*/
-@UriEndpoint(scheme = "google-calendar", title = "Google Calendar", syntax = "google-calendar:apiName/methodName", consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer", label = "api,cloud")
+@UriEndpoint(scheme = "google-calendar", title = "Google Calendar", syntax = "google-calendar:apiName/methodName",
+consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer", label = "api,cloud")
public class GoogleCalendarEndpoint extends AbstractApiEndpoint<GoogleCalendarApiName, GoogleCalendarConfiguration> {
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc424fc/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index d9cc550..fe2fc92 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Represents a GoogleDrive endpoint.
*/
-@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = "google:drive:apiName/methodName", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label = "api,cloud,file")
+@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = "google:drive:apiName/methodName",
+consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label = "api,cloud,file")
public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName, GoogleDriveConfiguration> {
private Object apiProxy;
[2/3] camel git commit: Moved the commons-codec version into
parent/pom.xml
Posted by ni...@apache.org.
Moved the commons-codec version into parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/12098f71
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/12098f71
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/12098f71
Branch: refs/heads/master
Commit: 12098f71367c0f2cc8ca3539d9d4fc2d3405a463
Parents: 4fc424f
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 11:20:46 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 11:23:20 2015 +0800
----------------------------------------------------------------------
components/camel-atom/pom.xml | 1 -
components/camel-aws/pom.xml | 1 -
components/camel-base64/pom.xml | 1 -
components/camel-crypto/pom.xml | 1 -
components/camel-github/pom.xml | 1 -
components/camel-hbase/pom.xml | 1 -
components/camel-hdfs/pom.xml | 1 -
components/camel-hdfs2/pom.xml | 1 -
components/camel-http/pom.xml | 1 -
components/camel-smpp/pom.xml | 1 -
components/camel-solr/pom.xml | 1 -
components/camel-xmlsecurity/pom.xml | 1 -
parent/pom.xml | 6 ++++++
13 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-atom/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 5b88e37..605fd63 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-aws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 6edcf31..623ab65 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -115,7 +115,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-base64/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index fa7b4d3..7e9450e 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -48,7 +48,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index f181bc5..2601dd9 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -55,7 +55,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-github/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index 3c07536..8f49658 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 851eaf5..e5e14a6 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 4f0088d..02f0a09 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -81,7 +81,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-hdfs2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index 9a44f3e..a2f6605 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -74,7 +74,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 006df2e..7648d67 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -64,7 +64,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-smpp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index eaf99be..af34a9e 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-solr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 387f8c9..737de6f 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/components/camel-xmlsecurity/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 6cb26e9..fc5aff6 100755
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/12098f71/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5feafb6..c6e0d25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1918,6 +1918,12 @@
<version>${commons-logging-version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
+ </dependency>
+
<!-- optional dependencies for osgi -->
<dependency>
<groupId>org.osgi</groupId>
[3/3] camel git commit: CAMEL-8548 Upgraded commons-codec version to
1.10
Posted by ni...@apache.org.
CAMEL-8548 Upgraded commons-codec version to 1.10
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04ba08b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04ba08b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04ba08b0
Branch: refs/heads/master
Commit: 04ba08b085af7931502b56ee444504555487ec55
Parents: 12098f7
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 11:24:32 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 11:24:32 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/04ba08b0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c6e0d25..3be974b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -95,7 +95,7 @@
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
<cometd-java-server>2.3.1</cometd-java-server>
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
- <commons-codec-version>1.9</commons-codec-version>
+ <commons-codec-version>1.10</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-compress-version>1.5</commons-compress-version>
<commons-configuration-version>1.9</commons-configuration-version>