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 2020/03/04 11:08:44 UTC
[camel] branch master updated (c8a8749 -> 5bdb3da)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c8a8749 Upgrade guava
new 5361d2a CAMEL-14640: Remove guava as its not needed
new 6f582f8 CAMEL-14640: Remove guava as its not needed
new 5bdb3da CAMEL-14640: Upgrade guava
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-gora/pom.xml | 35 +++++++---------------
.../services/org/apache/camel/component.properties | 2 +-
components/camel-ignite/pom.xml | 6 ----
tooling/maven/camel-package-maven-plugin/pom.xml | 7 -----
4 files changed, 12 insertions(+), 38 deletions(-)
[camel] 02/03: CAMEL-14640: Remove guava as its not needed
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f582f844e434cefe44f5d6b56cd6341e87c9869
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 11:59:07 2020 +0100
CAMEL-14640: Remove guava as its not needed
---
components/camel-ignite/pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 11f20ce..7d767f2 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -84,12 +84,6 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
[camel] 01/03: CAMEL-14640: Remove guava as its not needed
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5361d2a93647fe1108616ba6772140ea92f462e7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 11:57:11 2020 +0100
CAMEL-14640: Remove guava as its not needed
---
tooling/maven/camel-package-maven-plugin/pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 73e9c28..5b2ba9e 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -118,13 +118,6 @@
<version>${commons-text-version}</version>
</dependency>
- <!-- guava for some word wrap helper -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
- </dependency>
-
<!-- roaster to create java source for Spring Boot auto configuration support -->
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
[camel] 03/03: CAMEL-14640: Upgrade guava
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5bdb3dac6504e9b87f89fe318e7c09a28f22b500
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 12:08:12 2020 +0100
CAMEL-14640: Upgrade guava
---
components/camel-gora/pom.xml | 35 +++++++---------------
.../services/org/apache/camel/component.properties | 2 +-
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index ddbfc54..bfbb385 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -30,7 +30,7 @@
<artifactId>camel-gora</artifactId>
<packaging>jar</packaging>
<name>Camel :: Gora</name>
- <description>Gora Component for Apache Camel.</description>
+ <description>Gora Component for Apache Camel</description>
<properties>
<camel.osgi.import.before.defaults>
@@ -86,11 +86,6 @@
<artifactId>gora-core</artifactId>
<version>${apache-gora-version}</version>
<exclusions>
- <!-- because we have a direct dependency to org.apache.servicemix.bundles:org.apache.servicemix.bundles.hadoop-core -->
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -99,27 +94,23 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <!-- hadoop -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hadoop-core</artifactId>
- <version>${hadoop-bundle-version}</version>
- <exclusions>
<exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-eventbus-version}</version>
+ </dependency>
<!-- Avro -->
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.avro</artifactId>
- <version>${avro-bundle-version}</version>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro-version}</version>
</dependency>
<!-- other -->
@@ -135,10 +126,6 @@
<version>${jackson-version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils-version}</version>
diff --git a/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index ed7e78e..4276a26 100644
--- a/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -4,4 +4,4 @@ groupId=org.apache.camel
artifactId=camel-gora
version=3.2.0-SNAPSHOT
projectName=Camel :: Gora
-projectDescription=Gora Component for Apache Camel.
+projectDescription=Gora Component for Apache Camel