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 2021/03/23 08:20:42 UTC

[camel-quarkus] branch quarkus-master updated (deaabf0 -> d1de40c)

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 deaabf0  Upgrade to Quarkus 1.14.0.Final
     add 210f761  Updated CHANGELOG.md
     add 740a5bb  Fix wrong format of RouteBuilder
     add cfd1973  Add a link to a blog post about Camel Quarkus command line applications
     add 26c6c18  Fix some deprecation warnings
     add 504a427  Deprecate camel-quarkus-componentdsl and camel-quarkus-endpointdsl extensions #2354
     add 397d6dc  openstack: added neutron network tests #1943
     add 98e28d3  Add test coverage for FTPS
     add fef8c31  Updated CHANGELOG.md
     new d1de40c  Upgrade to Quarkus 1.14.0.Final

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   (deaabf0)
            \
             N -- N -- N   refs/heads/quarkus-master (d1de40c)

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:
 CHANGELOG.md                                       |  15 ++-
 docs/modules/ROOT/pages/user-guide/bootstrap.adoc  |   2 +
 docs/modules/ROOT/pages/user-guide/cdi.adoc        |   2 +-
 .../quarkus/core/deployment/CamelProcessor.java    |  10 +-
 .../core/deployment/CamelRegistryProcessor.java    |  17 ++--
 .../quarkus/core/deployment/util/CamelSupport.java |   8 ++
 .../it/OpenstackNeutronNetworkResource.java        | 109 +++++++++++++++++++++
 ...nTest.java => OpenstackNeutronNetworkTest.java} |  15 +--
 .../mappings/neutron/networks/network.json         |  18 ++++
 .../networks/network_delete.json}                  |  10 +-
 .../neutron/networks/network_external.json         |  18 ++++
 .../neutron/networks/networks_filtered.json        |  22 +++++
 .../JacksonDataformatXmlSupportProcessor.java      |   6 +-
 .../deployment/ComponentDSLProcessor.java          |   6 ++
 extensions/componentdsl/runtime/pom.xml            |   1 +
 .../main/resources/META-INF/quarkus-extension.yaml |   1 +
 .../deployment/EndpointDSLProcessor.java           |   5 +
 extensions/endpointdsl/runtime/pom.xml             |   1 +
 .../main/resources/META-INF/quarkus-extension.yaml |   1 +
 .../http/deployment/PlatformHttpProcessor.java     |   2 +-
 .../deployment/VertxWebsocketProcessor.java        |   2 +-
 .../dataformats/json/JsonDataformatsRoute.java     |   4 +-
 .../it/postgres/DebeziumPostgresTestResource.java  |   2 +-
 .../FtpResource.java => ftps/it/FtpsResource.java} |  10 +-
 .../quarkus/component/ftp/it/FtpTestResource.java  |  24 ++++-
 .../camel/quarkus/component/ftps/it/FtpsIT.java}   |   4 +-
 .../camel/quarkus/component/ftps/it/FtpsTest.java} |  25 ++---
 .../component/ftps/it/FtpsTestResource.java}       |  38 +++----
 .../camel/quarkus/component/sftp/it/SftpTest.java  |   7 +-
 .../ftp/src/test/resources/server.jks              | Bin 0 -> 2421 bytes
 .../camel/quarkus/component/grpc/it/GrpcRoute.java |  27 +++--
 .../camel/quarkus/component/grpc/it/GrpcTest.java  |   3 +-
 .../component/kafka/it/CamelKafkaTestResource.java |   4 +-
 .../component/kubernetes/it/KubernetesTest.java    |  12 +--
 34 files changed, 324 insertions(+), 107 deletions(-)
 create mode 100644 extensions-jvm/openstack/integration-test/src/main/java/org/apache/camel/quarkus/component/openstack/it/OpenstackNeutronNetworkResource.java
 copy extensions-jvm/openstack/integration-test/src/test/java/org/apache/camel/quarkus/component/openstack/it/{OpenstackKeystoneDomainTest.java => OpenstackNeutronNetworkTest.java} (76%)
 create mode 100644 extensions-jvm/openstack/integration-test/src/test/resources/mappings/neutron/networks/network.json
 copy extensions-jvm/openstack/integration-test/src/test/resources/mappings/{keystone/groups/groups_delete.json => neutron/networks/network_delete.json} (50%)
 create mode 100644 extensions-jvm/openstack/integration-test/src/test/resources/mappings/neutron/networks/network_external.json
 create mode 100644 extensions-jvm/openstack/integration-test/src/test/resources/mappings/neutron/networks/networks_filtered.json
 copy integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/{ftp/it/FtpResource.java => ftps/it/FtpsResource.java} (85%)
 copy integration-tests/{as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2IT.java => ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsIT.java} (91%)
 copy integration-tests/{vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java => ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java} (69%)
 copy integration-tests/{openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java => ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTestResource.java} (50%)
 create mode 100644 integration-tests/ftp/src/test/resources/server.jks

[camel-quarkus] 01/01: Upgrade to Quarkus 1.14.0.Final

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 d1de40cf1e4d604a7f28479cb05e4dc3866996c3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Mar 18 16:50:15 2021 +0000

    Upgrade to Quarkus 1.14.0.Final
---
 .../camel/quarkus/component/grpc/it/GrpcRoute.java | 27 +++++++++++++++-------
 .../camel/quarkus/component/grpc/it/GrpcTest.java  |  3 ++-
 pom.xml                                            |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java b/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
index 4adfd56..23f31f6 100644
--- a/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
+++ b/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
@@ -16,22 +16,33 @@
  */
 package org.apache.camel.quarkus.component.grpc.it;
 
+import java.util.Optional;
+
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.quarkus.component.grpc.it.model.PingRequest;
 import org.apache.camel.quarkus.component.grpc.it.model.PongResponse;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 public class GrpcRoute extends RouteBuilder {
 
     @Override
     public void configure() throws Exception {
-        from("grpc://localhost:9000/org.apache.camel.quarkus.component.grpc.it.model.PingPong?synchronous=true")
-                .process(exchange -> {
-                    final Message message = exchange.getMessage();
-                    final PingRequest request = message.getBody(PingRequest.class);
-                    final PongResponse response = PongResponse.newBuilder().setPongName(request.getPingName() + " PONG")
-                            .setPongId(request.getPingId()).build();
-                    message.setBody(response);
-                });
+        fromF("grpc://localhost:%d/org.apache.camel.quarkus.component.grpc.it.model.PingPong?synchronous=true",
+                getServerPort())
+                        .process(exchange -> {
+                            final Message message = exchange.getMessage();
+                            final PingRequest request = message.getBody(PingRequest.class);
+                            final PongResponse response = PongResponse.newBuilder().setPongName(request.getPingName() + " PONG")
+                                    .setPongId(request.getPingId()).build();
+                            message.setBody(response);
+                        });
+    }
+
+    public static int getServerPort() {
+        Config config = ConfigProvider.getConfig();
+        Optional<Integer> testServerPort = config.getOptionalValue("quarkus.grpc.server.test-port", Integer.class);
+        return testServerPort.orElse(9000);
     }
 }
diff --git a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
index 4625a0c..e983b49 100644
--- a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
+++ b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
@@ -38,7 +38,8 @@ class GrpcTest {
     public void consumer() {
         ManagedChannel syncRequestChannel = null;
         try {
-            syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", 9000).usePlaintext().build();
+            syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GrpcRoute.getServerPort()).usePlaintext()
+                    .build();
             final PingPongBlockingStub blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
 
             final PingRequest pingRequest = PingRequest.newBuilder()
diff --git a/pom.xml b/pom.xml
index d88d695..57e3eb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <optaplanner.version>7.46.0.Final</optaplanner.version>
         <quarkiverse.freemarker.version>0.2.2</quarkiverse.freemarker.version>
         <quarkiverse-minio.version>0.2.0</quarkiverse-minio.version>
-        <quarkus.version>1.13.0.CR1</quarkus.version>
+        <quarkus.version>999-SNAPSHOT</quarkus.version>
         <quarkus-google-cloud.version>0.3.0</quarkus-google-cloud.version>
         <quarkus-hazelcast-client.version>1.1.1</quarkus-hazelcast-client.version>
         <quarkus-qpid-jms.version>0.23.0</quarkus-qpid-jms.version>