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/10/08 16:26:06 UTC

[camel-quarkus] branch master updated (a99ac88 -> bda1034)

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 a99ac88  Upgrade Quarkus to 1.9.0.CR1
     new 7ecb81c  Remove dependencyManagement for httpclient-cache
     new 5882abb  Remove dependencyManagement for httpmime
     new bda1034  Remove redundant BuildStep for CacheLoader reflection registration

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:
 .../component/caffeine/deployment/CaffeineProcessor.java | 15 ---------------
 extensions/jira/runtime/pom.xml                          |  6 ++++++
 pom.xml                                                  |  2 --
 poms/bom/pom.xml                                         | 16 ----------------
 4 files changed, 6 insertions(+), 33 deletions(-)


[camel-quarkus] 03/03: Remove redundant BuildStep for CacheLoader reflection registration

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 bda1034d3b45512c995dc04c7720d0714a27d087
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 8 13:23:42 2020 +0100

    Remove redundant BuildStep for CacheLoader reflection registration
    
    Fixes #1790
---
 .../component/caffeine/deployment/CaffeineProcessor.java  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java b/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java
index 2a420a3..47f00be 100644
--- a/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java
+++ b/extensions/caffeine/deployment/src/main/java/org/apache/camel/quarkus/component/caffeine/deployment/CaffeineProcessor.java
@@ -16,12 +16,8 @@
  */
 package org.apache.camel.quarkus.component.caffeine.deployment;
 
-import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 
 class CaffeineProcessor {
@@ -32,15 +28,4 @@ class CaffeineProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
-
-    @BuildStep
-    void reflectiveClasses(
-            CombinedIndexBuildItem combinedIndex,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
-
-        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, "com.github.benmanes.caffeine.cache.CacheLoader"));
-        for (ClassInfo info : combinedIndex.getIndex().getAllKnownImplementors(CACHE_LOADER_NAME)) {
-            reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, info.name().toString()));
-        }
-    }
 }


[camel-quarkus] 01/03: Remove dependencyManagement for httpclient-cache

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 7ecb81c225ead9093e6a007a691072841bcef4d1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 8 10:39:38 2020 +0100

    Remove dependencyManagement for httpclient-cache
    
    Fixes #1704
---
 extensions/jira/runtime/pom.xml |  6 ++++++
 pom.xml                         |  1 -
 poms/bom/pom.xml                | 11 -----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/extensions/jira/runtime/pom.xml b/extensions/jira/runtime/pom.xml
index 555437c..b30be7f 100644
--- a/extensions/jira/runtime/pom.xml
+++ b/extensions/jira/runtime/pom.xml
@@ -86,6 +86,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-cache</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index a15f318..b0e8b99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
         <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>
         <httpclient.version>4.5.12</httpclient.version><!-- keep in sync with both Camel and Quarkus -->
         <influxdb.version>2.20</influxdb.version>
         <jackson.version>2.10.5</jackson.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 3826390..ee078e7 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5386,17 +5386,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient-cache</artifactId>
-                <version>${httpclient.cache.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>


[camel-quarkus] 02/03: Remove dependencyManagement for httpmime

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 5882abb0e2bbf8e41ac8a04f10d181cd15289de3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 8 10:41:41 2020 +0100

    Remove dependencyManagement for httpmime
    
    Fixes #1763
---
 pom.xml          | 1 -
 poms/bom/pom.xml | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0e8b99..927eff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
         <guava.version>29.0-jre</guava.version>
         <gson.version>2.8.5</gson.version>
         <hapi.version>4.1.0</hapi.version>
-        <httpclient.version>4.5.12</httpclient.version><!-- keep in sync with both Camel and Quarkus -->
         <influxdb.version>2.20</influxdb.version>
         <jackson.version>2.10.5</jackson.version>
         <java.xml.ws.version>2.3.1</java.xml.ws.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index ee078e7..b58f31e 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5385,11 +5385,6 @@
                 <version>${jaxen.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpmime</artifactId>
-                <version>${httpclient.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>connect-runtime</artifactId>
                 <version>${kafka.version}</version>