[camel-quarkus] branch master updated (2e04ba4 -> 74b3b2c)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel-quarkus] branch master updated (2e04ba4 -> 74b3b2c)

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

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


    from 2e04ba4  Update tags on github for camel-quarkus
     new 04e720e  Upgrade to Quarkus 1.7.0.CR1
     new 74b3b2c  Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel

The 2 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:
 extensions/avro/deployment/pom.xml                 |  4 ++++
 extensions/avro/runtime/pom.xml                    |  4 ++++
 extensions/elasticsearch-rest/deployment/pom.xml   |  4 ++++
 extensions/elasticsearch-rest/runtime/pom.xml      |  4 ++--
 .../rest/it/ElasticSearchTestResource.java         |  4 ++--
 pom.xml                                            |  3 +--
 poms/bom/pom.xml                                   |  5 -----
 .../quarkus/maven/UpdateExtensionDocPageMojo.java  | 22 +++++++---------------
 8 files changed, 24 insertions(+), 26 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel-quarkus] 01/02: Upgrade to Quarkus 1.7.0.CR1

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

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

commit 04e720e2129adbbfd47340b8c229f1864b2c9336
Author: James Netherton <[hidden email]>
AuthorDate: Mon Jul 6 12:26:55 2020 +0100

    Upgrade to Quarkus 1.7.0.CR1
---
 extensions/avro/deployment/pom.xml                                   | 4 ++++
 extensions/avro/runtime/pom.xml                                      | 4 ++++
 extensions/elasticsearch-rest/deployment/pom.xml                     | 4 ++++
 extensions/elasticsearch-rest/runtime/pom.xml                        | 4 ++--
 .../component/elasticsearch/rest/it/ElasticSearchTestResource.java   | 4 ++--
 pom.xml                                                              | 3 +--
 poms/bom/pom.xml                                                     | 5 -----
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/extensions/avro/deployment/pom.xml b/extensions/avro/deployment/pom.xml
index 6194192..048d4ea 100644
--- a/extensions/avro/deployment/pom.xml
+++ b/extensions/avro/deployment/pom.xml
@@ -31,6 +31,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-avro-deployment</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
diff --git a/extensions/avro/runtime/pom.xml b/extensions/avro/runtime/pom.xml
index 3825e0b..78f9469 100644
--- a/extensions/avro/runtime/pom.xml
+++ b/extensions/avro/runtime/pom.xml
@@ -47,6 +47,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-avro</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
         </dependency>
diff --git a/extensions/elasticsearch-rest/deployment/pom.xml b/extensions/elasticsearch-rest/deployment/pom.xml
index c576986..6c712b7 100644
--- a/extensions/elasticsearch-rest/deployment/pom.xml
+++ b/extensions/elasticsearch-rest/deployment/pom.xml
@@ -35,6 +35,10 @@
             <artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
         </dependency>
         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
diff --git a/extensions/elasticsearch-rest/runtime/pom.xml b/extensions/elasticsearch-rest/runtime/pom.xml
index 5c9ff99..a66ff41 100644
--- a/extensions/elasticsearch-rest/runtime/pom.xml
+++ b/extensions/elasticsearch-rest/runtime/pom.xml
@@ -51,8 +51,8 @@
             <artifactId>quarkus-elasticsearch-rest-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java b/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
index e2b42ee..763b5ba 100644
--- a/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
+++ b/integration-tests/elasticsearch-rest/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/it/ElasticSearchTestResource.java
@@ -30,7 +30,7 @@ import org.testcontainers.utility.TestcontainersConfiguration;
 public class ElasticSearchTestResource implements QuarkusTestResourceLifecycleManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchTestResource.class);
-    private static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.6.1";
+    private static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.7.0";
     private static final int ELASTICSEARCH_PORT = 9200;
 
     private GenericContainer container;
@@ -49,7 +49,7 @@ public class ElasticSearchTestResource implements QuarkusTestResourceLifecycleMa
             container.start();
 
             return CollectionHelper.mapOf(
-                    "camel.component.elasticsearch-rest.host-addresses",
+                    "quarkus.elasticsearch.hosts",
                     String.format("localhost:%s", container.getMappedPort(ELASTICSEARCH_PORT)));
 
         } catch (Exception e) {
diff --git a/pom.xml b/pom.xml
index 6b24360..34116fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
         <awssdk2.version>2.13.33</awssdk2.version>
         <camel.version>3.4.2</camel.version>
         <debezium.version>1.2.0.Final</debezium.version>
-        <elasticsearch.version>7.6.1</elasticsearch.version>
         <freemarker.version>2.3.30</freemarker.version>
         <github-api.version>1.111</github-api.version>
         <google-http-client.version>1.22.0</google-http-client.version>
@@ -67,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.6.1.Final</quarkus.version>
+        <quarkus.version>1.7.0.CR1</quarkus.version>
         <quarkus-qpid-jms.version>0.16.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 b03c9b3..ff125e1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3241,11 +3241,6 @@
                 <version>${stax2.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.elasticsearch.client</groupId>
-                <artifactId>elasticsearch-rest-high-level-client</artifactId>
-                <version>${elasticsearch.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.influxdb</groupId>
                 <artifactId>influxdb-java</artifactId>
                 <version>${influxdb.version}</version>

Reply | Threaded
Open this post in threaded view
|

[camel-quarkus] 02/02: Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel

ppalaga
In reply to this post by ppalaga
This is an automated email from the ASF dual-hosted git repository.

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

commit 74b3b2c22b90ee504ab763a2e02786122e4f9fcc
Author: Peter Palaga <[hidden email]>
AuthorDate: Thu Jun 25 14:35:20 2020 +0200

    Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel
---
 .../quarkus/maven/UpdateExtensionDocPageMojo.java  | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index debe16d..5563e21 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -17,7 +17,6 @@
 package org.apache.camel.quarkus.maven;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -29,7 +28,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -42,6 +40,7 @@ import freemarker.template.TemplateModelException;
 import io.quarkus.annotation.processor.Constants;
 import io.quarkus.annotation.processor.generate_doc.ConfigDocItem;
 import io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil;
+import io.quarkus.annotation.processor.generate_doc.FsMap;
 import org.apache.camel.catalog.Kind;
 import org.apache.camel.tooling.model.ArtifactModel;
 import org.apache.camel.tooling.model.BaseModel;
@@ -54,8 +53,6 @@ import org.apache.maven.plugins.annotations.Parameter;
 @Mojo(name = "update-extension-doc-page", threadSafe = true)
 public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
 
-    private static List<String> list;
-    private static List<String> list2;
     private static final Map<String, Boolean> nativeSslActivators = new ConcurrentHashMap<>();
 
     @Parameter(defaultValue = "false", property = "camel-quarkus.update-extension-doc-page.skip")
@@ -256,25 +253,20 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
         if (configRootClasses.isEmpty()) {
             return Collections.emptyList();
         }
-        final Path configRootsModelsPath = multiModuleProjectDirectory
-                .resolve("target/asciidoc/generated/config/all-configuration-roots-generated-doc.properties");
-        if (!Files.exists(configRootsModelsPath)) {
+        final Path configRootsModelsDir = multiModuleProjectDirectory
+                .resolve("target/asciidoc/generated/config/all-configuration-roots-generated-doc");
+        if (!Files.exists(configRootsModelsDir)) {
             throw new IllegalStateException("You should run " + UpdateExtensionDocPageMojo.class.getSimpleName()
                     + " after compileation with io.quarkus.annotation.processor.ExtensionAnnotationProcessor");
         }
-        final Properties configRootsModels = new Properties();
-        try (InputStream in = Files.newInputStream(configRootsModelsPath)) {
-            configRootsModels.load(in);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not read from " + configRootsModelsPath);
-        }
+        final FsMap configRootsModels = new FsMap(configRootsModelsDir);
 
         final ObjectMapper mapper = new ObjectMapper();
         final List<ConfigDocItem> configDocItems = new ArrayList<ConfigDocItem>();
         for (String configRootClass : configRootClasses) {
-            final String rawModel = configRootsModels.getProperty(configRootClass);
+            final String rawModel = configRootsModels.get(configRootClass);
             if (rawModel == null) {
-                throw new IllegalStateException("Could not find " + configRootClass + " in " + configRootsModelsPath);
+                throw new IllegalStateException("Could not find " + configRootClass + " in " + configRootsModelsDir);
             }
             try {
                 final List<ConfigDocItem> items = mapper.readValue(rawModel, Constants.LIST_OF_CONFIG_ITEMS_TYPE_REF);