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/17 04:14:25 UTC
[camel-quarkus] branch quarkus-master updated (234e8c2 -> 8908e5e)
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 234e8c2 Fix #1403 quarkus-extension-processor race conditions when modules are built in parallel
discard cfc050f Upgrade to Quarkus 1.7.0 - WIP
omit b173013 Fixup #1468 Intermittent failure of CamelDevModeTest
add 7c81c50 Fixup #1468 Intermittent failure of CamelDevModeTest
add c785c51 Upgrade to Apache Camel 3.4.1
add 44d1b79 Reproducer for #1459
new a6eef50 Upgrade to Quarkus 1.7.0 - WIP
new 8908e5e 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 (234e8c2)
\
N -- N -- N refs/heads/quarkus-master (8908e5e)
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:
.../org/apache/camel/quarkus/component/bean/CamelResource.java | 8 ++++++++
.../org/apache/camel/quarkus/component/bean/CamelRoute.java | 4 ++++
.../apache/camel/quarkus/component/bean/WithHandlerBean.java | 5 +++++
.../java/org/apache/camel/quarkus/component/bean/BeanTest.java | 10 ++++++++++
pom.xml | 2 +-
5 files changed, 28 insertions(+), 1 deletion(-)
[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 8908e5eff363d6adee455f0ecdb3514df820f205
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);
[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 a6eef501805367e231c11453dfff8701e8dd535a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jul 6 12:26:55 2020 +0100
Upgrade to Quarkus 1.7.0 - WIP
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 49b1e41..daf6a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,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.0.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>