You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/12/22 13:58:13 UTC

[camel-k-runtime] branch master updated: Update to camel-quarkus 1.0.0-M2

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b153d2c  Update to camel-quarkus 1.0.0-M2
b153d2c is described below

commit b153d2c487c0254a382b9720128663db9f92d6db
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Dec 22 10:58:27 2019 +0100

    Update to camel-quarkus 1.0.0-M2
---
 Jenkinsfile                                        |  2 +-
 .../it/src/main/resources/application.properties   |  4 ---
 .../k/quarkus/deployment/DeploymentProcessor.java  | 30 ----------------------
 pom.xml                                            |  4 +--
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0c74fc0..34867b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
     stages {
         stage('Test & Install') {
             steps {
-                sh "./mvnw $MAVEN_PARAMS clean install -Dcheckstyle.failOnViolation=true -Psourcecheck -f pom.xml"
+                sh "./mvnw $MAVEN_PARAMS clean install -Dcheckstyle.failOnViolation=true -Psourcecheck -f pom.xml -Dnative -Dnative-image.docker-build=true"
             }
         }
 
diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties
index 91d5d75..876ce6b 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties
+++ b/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties
@@ -24,7 +24,3 @@ quarkus.log.console.enable = false
 # Camel
 #
 camel.context.name = camel-k-quarkus-ctx
-
-#
-# Integration
-#
diff --git a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
deleted file mode 100644
index 6f71be3..0000000
--- a/camel-k-quarkus/camel-k-runtime-quarkus/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/DeploymentProcessor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.k.quarkus.deployment;
-
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.runtime.configuration.TemporaryConfigSourceProvider;
-
-public class DeploymentProcessor {
-    @BuildStep
-    void registerReflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
-        // TODO: this is needed as workaround for https://github.com/quarkusio/quarkus/issues/3498
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, TemporaryConfigSourceProvider.class));
-    }
-}
diff --git a/pom.xml b/pom.xml
index bfc30bc..66c7da2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <camel.version>3.0.0</camel.version>
-        <camel-quarkus.version>1.0.0-M1</camel-quarkus.version>
+        <camel-quarkus.version>1.0.0-M2</camel-quarkus.version>
         <catalog.version>${camel.version}</catalog.version>
         <junit.version>5.5.2</junit.version>
         <joor.version>0.9.12</joor.version>
@@ -60,7 +60,7 @@
         <undertow.version>1.4.26.Final</undertow.version>
         <vertx.version>3.8.3</vertx.version>
         <graalvm.version>19.2.1</graalvm.version>
-        <quarkus.version>1.0.1.Final</quarkus.version>
+        <quarkus.version>1.1.0.Final</quarkus.version>
         <jandex.version>2.1.2.Final</jandex.version>
         <javapoet.version>1.11.1</javapoet.version>
         <auto-service.version>1.0-rc6</auto-service.version>