You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/09/21 09:01:58 UTC

[camel-quarkus] branch master updated (1c66638 -> bb804d9)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


    from 1c66638  Updated CHANGELOG.md
     new 3f2ab72  Align google-http-client version with Quarkus
     new bb804d9  Align guava version with Quarkus

The 2 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:
 pom.xml          | 4 ++--
 poms/bom/pom.xml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)


[camel-quarkus] 02/02: Align guava version with Quarkus

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit bb804d96d2f9b46329c42982e09b21e7a6fb453e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Sep 21 08:30:19 2020 +0100

    Align guava version with Quarkus
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 921a63e..2895bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <fommil.netlib.core.version>1.1.2</fommil.netlib.core.version><!-- Mess in Weka transitive deps -->
         <github-api.version>1.111</github-api.version>
         <google-http-client.version>1.34.0</google-http-client.version>
-        <guava.version>26.0-jre</guava.version>
+        <guava.version>29.0-jre</guava.version>
         <gson.version>2.8.5</gson.version>
         <hapi.version>4.1.0</hapi.version>
         <httpclient.cache.version>4.5.5</httpclient.cache.version>


[camel-quarkus] 01/02: Align google-http-client version with Quarkus

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 3f2ab7239b7d85c8bd940d32191448092793697c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Sep 21 08:29:58 2020 +0100

    Align google-http-client version with Quarkus
---
 pom.xml          | 2 +-
 poms/bom/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f55a2e0..921a63e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <freemarker.version>2.3.30</freemarker.version>
         <fommil.netlib.core.version>1.1.2</fommil.netlib.core.version><!-- Mess in Weka transitive deps -->
         <github-api.version>1.111</github-api.version>
-        <google-http-client.version>1.22.0</google-http-client.version>
+        <google-http-client.version>1.34.0</google-http-client.version>
         <guava.version>26.0-jre</guava.version>
         <gson.version>2.8.5</gson.version>
         <hapi.version>4.1.0</hapi.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 32d0da7..0ce222b 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1492,6 +1492,12 @@
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-pulsar</artifactId>
                 <version>${camel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.j2objc</groupId>
+                        <artifactId>j2objc-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>