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/06/10 10:56:43 UTC

[camel-quarkus] branch quarkus-master updated (5337e82 -> 2e1104c)

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 5337e82  Upgrade to Quarkus 1.6.0 - WIP
     add 619e9e6  Fixed contributor guide index.adoc links
     add 5f080c4  Merge pull request #1330 from apache/index.adoc-quarkus-contr-guide
     add 624729e  Fixed how to build link in create new extension guide
     add 009306f  Fixed extensions documentation link in create new extension docs
     add feb46f8  Merge pull request #1332 from apache/link-fix
     add 7e67e6b  Revert "Fixed contributor guide index.adoc links"
     add 89fbdd6  Revert "Fixed extensions documentation link in create new extension docs"
     add 1ad0ef2  Merge pull request #1333 from apache/revert-link
     add 62e3a46  Set up JDK before attempting builds
     new 2e1104c  Upgrade to Quarkus 1.6.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   (5337e82)
            \
             N -- N -- N   refs/heads/quarkus-master (2e1104c)

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:
 .github/workflows/ci-build.yaml                                   | 8 ++++----
 .../ROOT/pages/contributor-guide/create-new-extension.adoc        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


[camel-quarkus] 01/01: Upgrade to Quarkus 1.6.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 2e1104cf63713f1f0ec49d5e44661a1ef9e55b44
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri May 29 09:57:38 2020 +0100

    Upgrade to Quarkus 1.6.0 - WIP
---
 .../quarkus/support/xalan/deployment/XalanNativeImageProcessor.java | 1 +
 pom.xml                                                             | 2 +-
 poms/bom/pom.xml                                                    | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
index 4311694..1278dbb 100644
--- a/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
+++ b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
@@ -49,6 +49,7 @@ class XalanNativeImageProcessor {
                 "org.apache.camel.quarkus.support.xalan.XalanTransformerFactory",
                 "org.apache.xalan.xsltc.dom.ObjectFactory",
                 "org.apache.xalan.xsltc.dom.XSLTCDTMManager",
+                "org.apache.xalan.xsltc.trax.ObjectFactory",
                 "org.apache.xalan.xsltc.trax.TransformerFactoryImpl",
                 "org.apache.xml.serializer.OutputPropertiesFactory",
                 "org.apache.xml.serializer.CharInfo",
diff --git a/pom.xml b/pom.xml
index b8f484c..6f9404b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,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.5.0.Final</quarkus.version>
+        <quarkus.version>999-SNAPSHOT</quarkus.version>
         <quarkus-qpid-jms.version>0.15.0</quarkus-qpid-jms.version>
         <protobuf.version>3.11.1</protobuf.version>
         <retrofit.version>2.5.0</retrofit.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 46d5252..a8058c6 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -770,6 +770,12 @@
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-microprofile-fault-tolerance</artifactId>
                 <version>${camel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+                        <artifactId>microprofile-fault-tolerance-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>