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 2020/02/03 10:26:18 UTC
[camel-k-runtime] branch master updated: Update camel-quarkus to
v1.0.0-M3
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 0b55008 Update camel-quarkus to v1.0.0-M3
0b55008 is described below
commit 0b55008a1fc53d362c91d4471dd82caad0f43a9b
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Feb 3 09:21:52 2020 +0100
Update camel-quarkus to v1.0.0-M3
---
camel-k-loader-js/pom.xml | 1 -
.../knative/KnativeSourceRoutesLoaderTest.java | 2 +-
.../quarkus/deployment/DeploymentProcessor.java | 11 +++++++
.../camel-k-quarkus-knative/runtime/pom.xml | 1 -
.../quarkus/deployment/DeploymentProcessor.java | 10 ++++++
.../component/knative/KnativeComponentTest.java | 36 +++++++++++++++++++++-
pom.xml | 18 +++++++++--
7 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 7dbc524..27498e3 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
- <version>${graalvm.version}</version>
</dependency>
<dependency>
diff --git a/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java b/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
index 1e615fc..8138f8a 100644
--- a/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
+++ b/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
@@ -138,7 +138,7 @@ public class KnativeSourceRoutesLoaderTest {
KnativeComponent component = new KnativeComponent();
component.setEnvironment(KnativeEnvironment.on(
- KnativeEnvironment.endpoint(Knative.EndpointKind.source, "sink", "localhost", port)
+ KnativeEnvironment.endpoint(Knative.EndpointKind.sink, "sink", "localhost", port)
));
TestRuntime runtime = new TestRuntime();
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
index 313aea5..4503b63 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
+++ b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
@@ -27,9 +27,11 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import org.apache.camel.k.Constants;
import org.apache.camel.k.Runtime;
import org.apache.camel.k.core.quarkus.RuntimeRecorder;
import org.apache.camel.quarkus.core.deployment.CamelMainListenerBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem;
import org.apache.camel.spi.HasId;
import org.apache.camel.spi.StreamCachingStrategy;
import org.jboss.jandex.IndexView;
@@ -38,6 +40,15 @@ import static org.apache.camel.k.core.quarkus.deployment.DeploymentSupport.getAl
public class DeploymentProcessor {
@BuildStep
+ CamelServicePatternBuildItem servicePatterns() {
+ return new CamelServicePatternBuildItem(
+ CamelServicePatternBuildItem.CamelServiceDestination.REGISTRY,
+ true,
+ Constants.ROUTES_LOADER_RESOURCE_PATH + "/*",
+ Constants.CONTEXT_CUSTOMIZER_RESOURCE_PATH + "/*");
+ }
+
+ @BuildStep
void registerServices(
BuildProducer<ServiceProviderBuildItem> serviceProvider,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
index 1076f2e..b45b5e6 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
@@ -51,7 +51,6 @@
<dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
- <version>${graalvm.version}</version>
</dependency>
</dependencies>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
index 1ac414a..bfb999e 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
+++ b/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
@@ -27,9 +27,11 @@ import org.apache.camel.k.loader.yaml.model.Node;
import org.apache.camel.k.loader.yaml.model.Step;
import org.apache.camel.k.loader.yaml.parser.HasDataFormat;
import org.apache.camel.k.loader.yaml.parser.HasExpression;
+import org.apache.camel.k.loader.yaml.parser.StepParser;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.ClassInfo;
@@ -41,6 +43,14 @@ public class DeploymentProcessor {
public static final DotName YAML_STEP_DEFINITION_ANNOTATION = DotName.createSimple("org.apache.camel.k.annotation.yaml.YAMLNodeDefinition");
@BuildStep
+ CamelServicePatternBuildItem servicePatterns() {
+ return new CamelServicePatternBuildItem(
+ CamelServicePatternBuildItem.CamelServiceDestination.REGISTRY,
+ true,
+ StepParser.SERVICE_LOCATION + "/*");
+ }
+
+ @BuildStep
void registerReflectiveClasses(
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
CombinedIndexBuildItem combinedIndexBuildItem) {
diff --git a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
index 14df215..57daf0f 100644
--- a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
+++ b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
@@ -17,9 +17,18 @@
package org.apache.camel.component.knative;
import org.apache.camel.CamelContext;
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
import org.apache.camel.component.knative.spi.Knative;
import org.apache.camel.component.knative.spi.KnativeEnvironment;
+import org.apache.camel.component.knative.spi.KnativeTransport;
+import org.apache.camel.component.knative.spi.KnativeTransportConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.support.DefaultProducer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -63,8 +72,33 @@ public class KnativeComponentTest {
assertThat(env.stream()).anyMatch(s -> s.getType() == Knative.Type.channel);
assertThat(env.stream()).anyMatch(s -> s.getType() == Knative.Type.endpoint);
- KnativeComponent component = context.getComponent("knative", KnativeComponent.class);
+ KnativeComponent component = new KnativeComponent();
component.setEnvironment(env);
+ component.setTransport(new KnativeTransport() {
+ @Override
+ public void start() {
+ }
+
+ @Override
+ public void stop() {
+ }
+
+ @Override
+ public Producer createProducer(Endpoint endpoint, KnativeTransportConfiguration configuration, KnativeEnvironment.KnativeServiceDefinition service) {
+ return new DefaultProducer(endpoint) {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ }
+ };
+ }
+
+ @Override
+ public Consumer createConsumer(Endpoint endpoint, KnativeTransportConfiguration configuration, KnativeEnvironment.KnativeServiceDefinition service, Processor processor) {
+ return new DefaultConsumer(endpoint, processor);
+ }
+ });
+
+ context.addComponent("knative", component);
//
// Channels
diff --git a/pom.xml b/pom.xml
index 4b1b30c..9a66661 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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-M2</camel-quarkus.version>
+ <camel.version>3.0.1</camel.version>
+ <camel-quarkus.version>1.0.0-M3</camel-quarkus.version>
<catalog.version>${camel.version}</catalog.version>
<junit.version>5.6.0</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.5</vertx.version>
<graalvm.version>19.2.1</graalvm.version>
- <quarkus.version>1.1.0.Final</quarkus.version>
+ <quarkus.version>1.2.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>
@@ -470,6 +470,18 @@
<artifactId>camel-k-loader-knative</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- graalvm -->
+ <dependency>
+ <groupId>org.graalvm.js</groupId>
+ <artifactId>js</artifactId>
+ <version>${graalvm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.substratevm</groupId>
+ <artifactId>svm</artifactId>
+ <version>${graalvm.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>