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/08/24 11:19:29 UTC

[camel-quarkus] branch quarkus-master updated (ead8909 -> 9835e0e)

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

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


 discard ead8909  Build quarkus instead of relying on oss-snapshots
 discard 7730fbe  Upgrade to Quarkus 1.8.0 - WIP
     add fb2ea42  APNS JVM support
     add ea3e610  Asterisk JVM support
     add a6fbe32  Atom JVM support
     add 7c49a8a  Atmos JVM support
     add b3ffe82  Fix itest when Twitter acount have spaces in name
     add 3ba6b43  Build quarkus instead of relying on oss-snapshots
     new 9835e0e  Upgrade to Quarkus 1.8.0 - WIP

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ead8909)
            \
             N -- N -- N   refs/heads/quarkus-master (9835e0e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 catalog/pom.xml                                    |  4 ++
 docs/modules/ROOT/nav.adoc                         |  4 ++
 docs/modules/ROOT/pages/reference/components.adoc  | 12 ++++
 .../extensions/{groovy.adoc => apns.adoc}          | 14 ++--
 .../extensions/{xml-jaxp.adoc => asterisk.adoc}    | 14 ++--
 .../extensions/{nitrite.adoc => atmos.adoc}        | 14 ++--
 .../extensions/{groovy.adoc => atom.adoc}          | 14 ++--
 docs/modules/ROOT/pages/reference/index.adoc       | 12 ++++
 .../apns}/deployment/pom.xml                       |  8 +--
 .../component/apns/deployment/ApnsProcessor.java}  |  8 +--
 .../{ognl => apns}/integration-test/pom.xml        | 26 ++++++--
 .../quarkus/component/apns/it/ApnsResource.java}   | 20 +++---
 .../camel/quarkus/component/apns/it/ApnsTest.java} |  8 +--
 .../flatpack => extensions-jvm/apns}/pom.xml       |  5 +-
 .../apns}/runtime/pom.xml                          | 10 +--
 .../main/resources/META-INF/quarkus-extension.yaml |  6 +-
 .../asterisk}/deployment/pom.xml                   |  8 +--
 .../asterisk/deployment/AsteriskProcessor.java}    |  8 +--
 .../integration-test/pom.xml                       | 26 ++++++--
 .../component/asterisk/it/AsteriskResource.java}   | 20 +++---
 .../component/asterisk/it/AsteriskTest.java}       |  8 +--
 .../flatpack => extensions-jvm/asterisk}/pom.xml   |  5 +-
 .../asterisk}/runtime/pom.xml                      | 10 +--
 .../main/resources/META-INF/quarkus-extension.yaml |  6 +-
 .../atmos}/deployment/pom.xml                      |  8 +--
 .../atmos/deployment/AtmosProcessor.java}          |  8 +--
 .../integration-test/pom.xml                       | 26 ++++++--
 .../quarkus/component/atmos/it/AtmosResource.java} | 20 +++---
 .../quarkus/component/atmos/it/AtmosTest.java}     |  8 +--
 .../flatpack => extensions-jvm/atmos}/pom.xml      |  5 +-
 .../git => extensions-jvm/atmos}/runtime/pom.xml   | 17 ++---
 .../main/resources/META-INF/quarkus-extension.yaml |  6 +-
 .../git => extensions-jvm/atom}/deployment/pom.xml | 12 ++--
 .../component/atom/deployment/AtomProcessor.java}  |  8 +--
 .../{ognl => atom}/integration-test/pom.xml        | 26 ++++++--
 .../quarkus/component/atom/it/AtomResource.java}   | 20 +++---
 .../camel/quarkus/component/atom/it/AtomTest.java} |  8 +--
 .../flatpack => extensions-jvm/atom}/pom.xml       |  5 +-
 .../git => extensions-jvm/atom}/runtime/pom.xml    | 14 ++--
 .../main/resources/META-INF/quarkus-extension.yaml |  6 +-
 extensions-jvm/pom.xml                             |  4 ++
 .../quarkus/component/twitter/CamelResource.java   |  5 +-
 pom.xml                                            |  1 +
 poms/bom/pom.xml                                   | 77 ++++++++++++++++++++++
 44 files changed, 366 insertions(+), 188 deletions(-)
 copy docs/modules/ROOT/pages/reference/extensions/{groovy.adoc => apns.adoc} (63%)
 copy docs/modules/ROOT/pages/reference/extensions/{xml-jaxp.adoc => asterisk.adoc} (63%)
 copy docs/modules/ROOT/pages/reference/extensions/{nitrite.adoc => atmos.adoc} (60%)
 copy docs/modules/ROOT/pages/reference/extensions/{groovy.adoc => atom.adoc} (65%)
 copy {extensions/grok => extensions-jvm/apns}/deployment/pom.xml (90%)
 copy extensions-jvm/{grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java => apns/deployment/src/main/java/org/apache/camel/quarkus/component/apns/deployment/ApnsProcessor.java} (89%)
 copy extensions-jvm/{ognl => apns}/integration-test/pom.xml (76%)
 copy extensions-jvm/{avro-rpc/integration-test/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroResource.java => apns/integration-test/src/main/java/org/apache/camel/quarkus/component/apns/it/ApnsResource.java} (75%)
 copy extensions-jvm/{ognl/integration-test/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java => apns/integration-test/src/test/java/org/apache/camel/quarkus/component/apns/it/ApnsTest.java} (86%)
 copy {extensions/flatpack => extensions-jvm/apns}/pom.xml (91%)
 copy {extensions/flatpack => extensions-jvm/apns}/runtime/pom.xml (91%)
 copy extensions-jvm/{openstack => apns}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (91%)
 copy {extensions/flatpack => extensions-jvm/asterisk}/deployment/pom.xml (90%)
 copy extensions-jvm/{protobuf/deployment/src/main/java/org/apache/camel/quarkus/component/protobuf/deployment/ProtobufProcessor.java => asterisk/deployment/src/main/java/org/apache/camel/quarkus/component/asterisk/deployment/AsteriskProcessor.java} (88%)
 copy extensions-jvm/{rabbitmq => asterisk}/integration-test/pom.xml (76%)
 copy extensions-jvm/{rabbitmq/integration-test/src/main/java/org/apache/camel/quarkus/component/rabbitmq/it/RabbitmqResource.java => asterisk/integration-test/src/main/java/org/apache/camel/quarkus/component/asterisk/it/AsteriskResource.java} (74%)
 copy extensions-jvm/{avro-rpc/integration-test/src/test/java/org/apache/camel/quarkus/component/avro/it/AvroTest.java => asterisk/integration-test/src/test/java/org/apache/camel/quarkus/component/asterisk/it/AsteriskTest.java} (85%)
 copy {extensions/flatpack => extensions-jvm/asterisk}/pom.xml (91%)
 copy {extensions/flatpack => extensions-jvm/asterisk}/runtime/pom.xml (91%)
 copy extensions-jvm/{openstack => asterisk}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (91%)
 copy {extensions/grok => extensions-jvm/atmos}/deployment/pom.xml (90%)
 copy extensions-jvm/{grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java => atmos/deployment/src/main/java/org/apache/camel/quarkus/component/atmos/deployment/AtmosProcessor.java} (88%)
 copy extensions-jvm/{google-pubsub => atmos}/integration-test/pom.xml (74%)
 copy extensions-jvm/{groovy/integration-test/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyResource.java => atmos/integration-test/src/main/java/org/apache/camel/quarkus/component/atmos/it/AtmosResource.java} (74%)
 copy extensions-jvm/{ognl/integration-test/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java => atmos/integration-test/src/test/java/org/apache/camel/quarkus/component/atmos/it/AtmosTest.java} (86%)
 copy {extensions/flatpack => extensions-jvm/atmos}/pom.xml (91%)
 copy {extensions/git => extensions-jvm/atmos}/runtime/pom.xml (86%)
 copy extensions-jvm/{avro-rpc => atmos}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (89%)
 copy {extensions/git => extensions-jvm/atom}/deployment/pom.xml (86%)
 copy extensions-jvm/{grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java => atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java} (89%)
 copy extensions-jvm/{ognl => atom}/integration-test/pom.xml (76%)
 copy extensions-jvm/{avro-rpc/integration-test/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroResource.java => atom/integration-test/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java} (75%)
 copy extensions-jvm/{ognl/integration-test/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java => atom/integration-test/src/test/java/org/apache/camel/quarkus/component/atom/it/AtomTest.java} (86%)
 copy {extensions/flatpack => extensions-jvm/atom}/pom.xml (91%)
 copy {extensions/git => extensions-jvm/atom}/runtime/pom.xml (89%)
 copy extensions-jvm/{groovy => atom}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (92%)


[camel-quarkus] 01/01: Upgrade to Quarkus 1.8.0 - WIP

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

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

commit 9835e0e3b2318471199f5511d772e37eecf04214
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Aug 3 08:28:35 2020 +0100

    Upgrade to Quarkus 1.8.0 - WIP
---
 .../component/jpa/deployment/JpaProcessor.java     | 24 +++++-----------------
 pom.xml                                            |  2 +-
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java b/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
index 10be6fb..d2dc9bf 100644
--- a/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
+++ b/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
@@ -16,16 +16,11 @@
  */
 package org.apache.camel.quarkus.component.jpa.deployment;
 
-import java.util.List;
-
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
-import io.quarkus.hibernate.orm.runtime.DefaultEntityManagerFactoryProducer;
 import org.apache.camel.component.jpa.JpaComponent;
 import org.apache.camel.quarkus.component.jpa.CamelJpaRecorder;
 import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
@@ -43,21 +38,12 @@ class JpaProcessor {
     @BuildStep
     void configureJpaComponentBean(
             BuildProducer<CamelRuntimeBeanBuildItem> camelRuntimeBean,
-            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
-            List<PersistenceUnitDescriptorBuildItem> descriptors,
             CamelJpaRecorder recorder) {
 
-        // If there's only 1 persistent unit, then auto configure the JPA component with the EntityManagerFactory
-        if (descriptors.size() == 1) {
-            // Set DefaultEntityManagerFactoryProducer as unremovable as there's no hard requirement for Camel users to @Inject EntityManagerFactory
-            AdditionalBeanBuildItem bean = AdditionalBeanBuildItem.unremovableOf(DefaultEntityManagerFactoryProducer.class);
-            additionalBeans.produce(bean);
-
-            camelRuntimeBean.produce(
-                    new CamelRuntimeBeanBuildItem(
-                            "jpa",
-                            JpaComponent.class.getName(),
-                            recorder.createJpaComponent()));
-        }
+        camelRuntimeBean.produce(
+                new CamelRuntimeBeanBuildItem(
+                        "jpa",
+                        JpaComponent.class.getName(),
+                        recorder.createJpaComponent()));
     }
 }
diff --git a/pom.xml b/pom.xml
index abcd05c..422af92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <kotlin.version>1.3.72</kotlin.version>
         <okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
         <okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
-        <quarkus.version>1.7.0.Final</quarkus.version>
+        <quarkus.version>999-SNAPSHOT</quarkus.version>
         <quarkus-qpid-jms.version>0.17.0</quarkus-qpid-jms.version>
         <protobuf.version>3.11.1</protobuf.version>
         <retrofit.version>2.5.0</retrofit.version>