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 2022/01/27 16:05:29 UTC
[camel-quarkus] branch main updated (b586b73 -> b3d6d48)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from b586b73 Removed the deprecated @BuildTimeAvroDataFormat annotation #2791
new 7ad4a80 Upgrade Camel to 3.14.1
new b83bdeb Upgrade Quarkus Qpid JMS to 0.32.0
new b3d6d48 camel.main.durationMaxSeconds is not honoured
The 3 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/antora.yml | 2 +-
.../main/java/org/apache/camel/quarkus/main/CamelMain.java | 1 +
integration-tests/jms-artemis-client/pom.xml | 11 +++++++++++
integration-tests/jta/pom.xml | 10 ++++++++++
.../org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java | 4 +---
integration-tests/sjms-artemis-client/pom.xml | 10 ++++++++++
integration-tests/sjms2-artemis-client/pom.xml | 10 ++++++++++
pom.xml | 6 +++---
8 files changed, 47 insertions(+), 7 deletions(-)
[camel-quarkus] 03/03: camel.main.durationMaxSeconds is not honoured
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b3d6d4862f4c7bfd75b221406af114ec2e3ba0a5
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jan 27 10:59:21 2022 +0000
camel.main.durationMaxSeconds is not honoured
Fixes #3394
---
.../src/main/java/org/apache/camel/quarkus/main/CamelMain.java | 1 +
.../java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
index 579e668..a97c38b 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java
@@ -135,6 +135,7 @@ public final class CamelMain extends MainCommandLineSupport implements HasCamelC
public void startEngine() throws Exception {
if (shutdownStrategy.isRunAllowed() && engineStarted.compareAndSet(false, true)) {
init();
+ internalBeforeStart();
beforeStart();
start();
afterStart();
diff --git a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
index ff128aa..f723e4c 100644
--- a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
+++ b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeoutException;
import org.apache.camel.quarkus.test.support.process.QuarkusProcessExecutor;
import org.apache.camel.util.StringHelper;
import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.zeroturnaround.exec.InvalidExitValueException;
import org.zeroturnaround.exec.ProcessResult;
@@ -76,13 +75,12 @@ public class CommandModeTest {
assertThat(result.outputUTF8()).contains("Apache Camel Runner takes the following options");
}
- @Disabled("https://github.com/apache/camel-quarkus/issues/3394")
@Test
void testMainStopsAfterMaxSeconds() throws IOException, InterruptedException, ExecutionException {
final StartedProcess process = new QuarkusProcessExecutor("-Dgreeted.subject=Jade",
"-Dcamel.main.duration-max-seconds=3").start();
try {
- ProcessResult result = process.getFuture().get(4, TimeUnit.SECONDS);
+ ProcessResult result = process.getFuture().get(10, TimeUnit.SECONDS);
Assertions.assertThat(result.getExitValue()).isEqualTo(0);
Assertions.assertThat(result.outputUTF8()).contains("Waiting until complete: Duration max 3 seconds");
Assertions.assertThat(result.outputUTF8()).contains("Logging Hello Jade! - from timer named hello");
[camel-quarkus] 02/03: Upgrade Quarkus Qpid JMS to 0.32.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b83bdebd7a94bd5b9fef4407374ecc9382faff86
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jan 27 11:07:26 2022 +0000
Upgrade Quarkus Qpid JMS to 0.32.0
---
integration-tests/jms-artemis-client/pom.xml | 11 +++++++++++
integration-tests/jta/pom.xml | 10 ++++++++++
integration-tests/sjms-artemis-client/pom.xml | 10 ++++++++++
integration-tests/sjms2-artemis-client/pom.xml | 10 ++++++++++
pom.xml | 2 +-
5 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml
index 87aba1d..832499e 100644
--- a/integration-tests/jms-artemis-client/pom.xml
+++ b/integration-tests/jms-artemis-client/pom.xml
@@ -47,6 +47,17 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml
index dd5058f..713cbf4 100644
--- a/integration-tests/jta/pom.xml
+++ b/integration-tests/jta/pom.xml
@@ -66,6 +66,16 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/sjms-artemis-client/pom.xml b/integration-tests/sjms-artemis-client/pom.xml
index c8eb19f..963edcb 100644
--- a/integration-tests/sjms-artemis-client/pom.xml
+++ b/integration-tests/sjms-artemis-client/pom.xml
@@ -47,6 +47,16 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/sjms2-artemis-client/pom.xml b/integration-tests/sjms2-artemis-client/pom.xml
index 07ff976..ce85979 100644
--- a/integration-tests/sjms2-artemis-client/pom.xml
+++ b/integration-tests/sjms2-artemis-client/pom.xml
@@ -47,6 +47,16 @@
<dependency>
<groupId>io.quarkiverse.artemis</groupId>
<artifactId>quarkus-artemis-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/pom.xml b/pom.xml
index 958a724..1299d0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
<quarkus.version>2.7.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
- <quarkus-qpid-jms.version>0.30.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
+ <quarkus-qpid-jms.version>0.32.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
<!-- Compile dependency versions (keep sorted alphabetically) -->
<!-- Items annotated with @sync can be updated by running mvn cq:sync-versions -N -e -->
[camel-quarkus] 01/03: Upgrade Camel to 3.14.1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7ad4a80c4c67801b91edc87e723c571c1f478d10
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jan 25 15:03:05 2022 +0000
Upgrade Camel to 3.14.1
---
docs/antora.yml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e4761be..ce03b9d 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,7 +29,7 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
- camel-version: 3.14.0 # replace ${camel.version}
+ camel-version: 3.14.1 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.0.Final # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
diff --git a/pom.xml b/pom.xml
index 9ee416b..958a724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.14.0</version>
+ <version>3.14.1</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -40,7 +40,7 @@
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.0</camel.version>
+ <camel.version>${camel.major.minor}.1</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->