You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/07/28 04:08:39 UTC
[camel-quarkus] branch quarkus-master updated (fe42f10 -> 90a0e00)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard fe42f10 Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel
discard a61a0f7 Upgrade to Quarkus 1.7.0 - WIP
add 72bc9bb Fixup #1244 Improve the docs about the default REST transport provider
new 3588f35 Upgrade to Quarkus 1.7.0 - WIP
new 90a0e00 Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel
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 (fe42f10)
\
N -- N -- N refs/heads/quarkus-master (90a0e00)
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 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:
docs/modules/ROOT/pages/extensions/rest.adoc | 23 +++++++++++++++++++++-
.../rest/runtime/src/main/doc/configuration.adoc | 23 +++++++++++++++++++++-
2 files changed, 44 insertions(+), 2 deletions(-)
[camel-quarkus] 01/02: Upgrade to Quarkus 1.7.0 - WIP
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3588f358044043388d398b9e62bdc3e048b40c76
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jul 6 12:26:55 2020 +0100
Upgrade to Quarkus 1.7.0 - WIP
---
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 aa6511a..7f83be4 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>999-SNAPSHOT</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 4135874..2e92ac5 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3226,11 +3226,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>
[camel-quarkus] 02/02: Fix #1403 quarkus-extension-processor race
conditions when modules are built in parallel
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 90a0e006d3b7a5322b9ec58a936501207e5f7c49
Author: Peter Palaga <pp...@redhat.com>
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);