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
The following commit(s) were added to refs/heads/master by this push:
new deeda64 CAMEL-14640: Upgrade guava
deeda64 is described below
commit deeda64750a23ffda9ef27b5cb08e3695d5aa70b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Mar 4 14:36:37 2020 +0100
CAMEL-14640: Upgrade guava
---
components/camel-flink/pom.xml | 12 ++++++++++++
components/camel-ignite/pom.xml | 24 ------------------------
components/camel-spark/pom.xml | 12 ++++++++++++
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 56704e5..d6842a2 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -106,6 +106,18 @@
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.2-jre</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 7d767f2..2b126a3 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -90,28 +90,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens
java.base/jdk.internal.misc=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 32304f2..6d4389f 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -183,6 +183,18 @@
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.2-jre</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
