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 2023/03/20 16:32:18 UTC
[camel-quarkus] branch 2.13.x updated (8f4bd39223 -> d1da61a750)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 8f4bd39223 CamelQuarkusTestSupport: Lifecycle.PER_CLASS may cause following tests to fail #4569
new 63d0b0272e Move Qute component camel-package-maven-plugin execution phase to process-classes
new 71df9e6da1 Exclude banned xml-apis from org.seleniumhq.selenium:htmlunit-driver
new d3d09136d7 Aws2-cw: dependency io.quarkus:quarkus-jaxp is not needed for the native run #4614
new a80fe32857 Register atlasmap.properties as a native image resource
new a19329b06c Make AWS test class names in grouped testing unique
new 22c6c2d277 Fix #4667 to use quay.io/jbosstm/lra-coordinator
new d1da61a750 Use QUARKUS_HTTP_PORT env in LraTestResource (#4670)
The 7 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:
.../atlasmap/deployment/AtlasmapProcessor.java | 5 +--
extensions/aws2-cw/deployment/pom.xml | 4 ---
extensions/aws2-cw/runtime/pom.xml | 4 ---
extensions/qute/component/pom.xml | 2 +-
.../org/apache/camel/component/qute/qute.json | 2 +-
.../aws2-quarkus-client/aws2-ddb/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-s3/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-ses/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-sqs/pom.xml | 5 +++
.../component/atlasmap/it/AtlasmapResource.java | 13 +++++++
.../component/atlasmap/it/AtlasmapTest.java | 17 +++++++++
integration-tests/aws2-grouped/pom.xml | 5 +++
.../aws2-quarkus-client-grouped/pom.xml | 10 ++++++
.../quarkus/component/lra/it/LraTestResource.java | 6 ++--
poms/bom-test/pom.xml | 4 +++
tooling/scripts/copy-tests.groovy | 11 ++++--
tooling/scripts/group-test-utils.groovy | 42 ++++++++++++++++++++++
tooling/scripts/group-tests.groovy | 7 ++++
19 files changed, 140 insertions(+), 17 deletions(-)
create mode 100644 tooling/scripts/group-test-utils.groovy
[camel-quarkus] 01/07: Move Qute component camel-package-maven-plugin execution phase to process-classes
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 63d0b0272e5568dae8059e66789612813651dc7e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Feb 22 07:32:49 2023 +0000
Move Qute component camel-package-maven-plugin execution phase to process-classes
---
extensions/qute/component/pom.xml | 2 +-
.../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extensions/qute/component/pom.xml b/extensions/qute/component/pom.xml
index ea67b8b2b7..d599ffd974 100644
--- a/extensions/qute/component/pom.xml
+++ b/extensions/qute/component/pom.xml
@@ -103,7 +103,7 @@
<goals>
<goal>generate-component</goal>
</goals>
- <phase>process-resources</phase>
+ <phase>process-classes</phase>
</execution>
</executions>
</plugin>
diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
index ba4efd9a44..7143fd554c 100644
--- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
+++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
@@ -11,7 +11,7 @@
"supportLevel": "Preview",
"groupId": "org.apache.camel.quarkus",
"artifactId": "camel-quarkus-qute-component",
- "version": "2.12.0-SNAPSHOT",
+ "version": "2.13.3-SNAPSHOT",
"scheme": "qute",
"extendsScheme": "",
"syntax": "qute:resourceUri",
[camel-quarkus] 07/07: Use QUARKUS_HTTP_PORT env in LraTestResource (#4670)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d1da61a75070e09354e2393da17c785b2dbf8803
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Mon Mar 20 16:37:18 2023 +0800
Use QUARKUS_HTTP_PORT env in LraTestResource (#4670)
---
.../org/apache/camel/quarkus/component/lra/it/LraTestResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
index 72c856ec57..a9fb8ae379 100644
--- a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
+++ b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
@@ -41,7 +41,7 @@ public class LraTestResource implements QuarkusTestResourceLifecycleManager {
hostname = "localhost";
container = new GenericContainer(LRA_IMAGE)
.withNetworkMode("host")
- .withEnv("quarkus.http.port", String.valueOf(LRA_PORT))
+ .withEnv("QUARKUS_HTTP_PORT", String.valueOf(LRA_PORT))
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
container.start();
lraPort = LRA_PORT;
@@ -50,7 +50,7 @@ public class LraTestResource implements QuarkusTestResourceLifecycleManager {
container = new GenericContainer(LRA_IMAGE)
.withNetworkMode("bridge")
.withExposedPorts(LRA_PORT)
- .withEnv("quarkus.http.port", String.valueOf(LRA_PORT))
+ .withEnv("QUARKUS_HTTP_PORT", String.valueOf(LRA_PORT))
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
container.start();
lraPort = container.getMappedPort(LRA_PORT);
[camel-quarkus] 04/07: Register atlasmap.properties as a native image resource
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a80fe32857b0368411238d385ee085e6dc82413b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 14 07:43:00 2023 +0000
Register atlasmap.properties as a native image resource
Fixes #4633
---
.../atlasmap/deployment/AtlasmapProcessor.java | 5 +++--
.../quarkus/component/atlasmap/it/AtlasmapResource.java | 13 +++++++++++++
.../quarkus/component/atlasmap/it/AtlasmapTest.java | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
index 5dd694968d..cb326c327f 100644
--- a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
+++ b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java
@@ -70,8 +70,9 @@ class AtlasmapProcessor {
}
@BuildStep
- NativeImageResourceBuildItem resource() {
- return new NativeImageResourceBuildItem("META-INF/services/atlas/module/atlas.module");
+ void nativeImageResources(BuildProducer<NativeImageResourceBuildItem> nativeImageResource) {
+ nativeImageResource.produce(new NativeImageResourceBuildItem("META-INF/services/atlas/module/atlas.module"));
+ nativeImageResource.produce(new NativeImageResourceBuildItem("atlasmap.properties"));
}
@BuildStep
diff --git a/integration-tests/atlasmap/src/main/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapResource.java b/integration-tests/atlasmap/src/main/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapResource.java
index 18109ccf9e..f6ddf40a9d 100644
--- a/integration-tests/atlasmap/src/main/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapResource.java
+++ b/integration-tests/atlasmap/src/main/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapResource.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.atlasmap.it;
+import java.util.Map;
+
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
@@ -24,9 +26,12 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import io.atlasmap.core.DefaultAtlasContextFactory;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.quarkus.component.atlasmap.it.model.Person;
+import static io.atlasmap.api.AtlasContextFactory.PROPERTY_ATLASMAP_CORE_VERSION;
+
@Path("/atlasmap")
@ApplicationScoped
@Produces(MediaType.APPLICATION_JSON)
@@ -132,4 +137,12 @@ public class AtlasmapResource {
return producerTemplate.requestBody("atlasmap:mapping/json/atlasmapping-xml-to-csv.json", xml, String.class);
}
+ @GET
+ @Path("version")
+ @Produces(MediaType.TEXT_PLAIN)
+ public String version() {
+ DefaultAtlasContextFactory factory = DefaultAtlasContextFactory.getInstance();
+ Map<String, String> properties = factory.getProperties();
+ return properties.get(PROPERTY_ATLASMAP_CORE_VERSION);
+ }
}
diff --git a/integration-tests/atlasmap/src/test/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapTest.java b/integration-tests/atlasmap/src/test/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapTest.java
index 1a1e11508b..a0a930be33 100644
--- a/integration-tests/atlasmap/src/test/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapTest.java
+++ b/integration-tests/atlasmap/src/test/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.quarkus.component.atlasmap.it;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
import io.quarkus.test.common.http.TestHTTPEndpoint;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
@@ -23,6 +27,7 @@ import org.apache.camel.quarkus.component.atlasmap.it.model.Account;
import org.apache.camel.quarkus.component.atlasmap.it.model.Person;
import org.junit.jupiter.api.Test;
+import static io.atlasmap.api.AtlasContextFactory.PROPERTY_ATLASMAP_CORE_VERSION;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -275,4 +280,16 @@ class AtlasmapTest {
.body(equalTo(expectedResult));
}
+ @Test
+ void testGetAtlasMapVersion() throws IOException {
+ try (InputStream stream = getClass().getResourceAsStream("/atlasmap.properties")) {
+ Properties properties = new Properties();
+ properties.load(stream);
+ String version = properties.getProperty(PROPERTY_ATLASMAP_CORE_VERSION);
+
+ given().get("/version")
+ .then()
+ .body(equalTo(version));
+ }
+ }
}
[camel-quarkus] 05/07: Make AWS test class names in grouped testing unique
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a19329b06cdabda9d772fe9d20c11a17c517227d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Mar 17 10:43:49 2023 +0000
Make AWS test class names in grouped testing unique
Fixes #4664
---
.../aws2-quarkus-client/aws2-ddb/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-s3/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-ses/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 5 +++
.../aws2-quarkus-client/aws2-sqs/pom.xml | 5 +++
integration-tests/aws2-grouped/pom.xml | 5 +++
.../aws2-quarkus-client-grouped/pom.xml | 10 ++++++
tooling/scripts/copy-tests.groovy | 11 ++++--
tooling/scripts/group-test-utils.groovy | 42 ++++++++++++++++++++++
tooling/scripts/group-tests.groovy | 7 ++++
10 files changed, 98 insertions(+), 2 deletions(-)
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
index 38a9a3e80d..db5f68cc96 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS 2 DynamoDB Quarkus Client</name>
<description>Integration tests for Camel Quarkus AWS 2 DynamoDB extension with the Quarkus AWS DynamoDB client</description>
+ <properties>
+ <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -119,6 +123,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties, **/*Stream*</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
index 92501adb98..38438775cf 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS 2 S3 Quarkus Client</name>
<description>Integration tests for Camel Quarkus AWS 2 S3 extension with the Quarkus AWS S3 client</description>
+ <properties>
+ <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -123,6 +127,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
index 2851963460..1148bccf6c 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Simple Email Service (SES) Quarkus Client</name>
<description>Integration tests for Camel Quarkus AWS Simple Email Service (SES) extension with the Quarkus AWS SES client</description>
+ <properties>
+ <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -124,6 +128,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
index 137c6a0980..5376e5d0df 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS 2 SQS and SNS Quarkus Client</name>
<description>Integration tests for SQS and SNS extensions with the Quarkus AWS clients</description>
+ <properties>
+ <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -127,6 +131,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
index 8d8a198552..1e5479f128 100644
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
+++ b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS 2 SQS Quarkus Client</name>
<description>Integration tests for SQS extensions with the Quarkus AWS clients</description>
+ <properties>
+ <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -124,6 +128,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-tests/aws2-grouped/pom.xml b/integration-tests/aws2-grouped/pom.xml
index 6ead4c39be..95e6f97d72 100644
--- a/integration-tests/aws2-grouped/pom.xml
+++ b/integration-tests/aws2-grouped/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS2 Grouped</name>
<description>AWS 2 tests from ../integration-test-groups/aws2 merged together</description>
+ <properties>
+ <test.class.name.prefix>Grouped</test.class.name.prefix>
+ </properties>
+
<!-- Regenerate the dependencies via `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependencies>
<dependency>
@@ -170,6 +174,7 @@
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
<group-tests.concat.rel.paths>src/main/resources/application.properties,src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer</group-tests.concat.rel.paths>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/integration-tests/aws2-quarkus-client-grouped/pom.xml b/integration-tests/aws2-quarkus-client-grouped/pom.xml
index c825301cce..c73e342eff 100644
--- a/integration-tests/aws2-quarkus-client-grouped/pom.xml
+++ b/integration-tests/aws2-quarkus-client-grouped/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: AWS2 Quarkus Client Grouped</name>
<description>AWS 2 tests from ../integration-test-groups/aws2-quarkus-client merged together</description>
+ <properties>
+ <test.class.name.prefix>GroupedQuarkusClient</test.class.name.prefix>
+ </properties>
+
<!-- Regenerate the dependencies via `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependencies>
<dependency>
@@ -159,6 +163,7 @@
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2-quarkus-client</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
<group-tests.concat.rel.paths>src/main/resources/application.properties,src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer</group-tests.concat.rel.paths>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
@@ -174,6 +179,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
@@ -189,6 +195,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties,**/*Stream*</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
@@ -204,6 +211,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
@@ -219,6 +227,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
@@ -234,6 +243,7 @@
<copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
<copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
<copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
+ <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
</properties>
</configuration>
</execution>
diff --git a/tooling/scripts/copy-tests.groovy b/tooling/scripts/copy-tests.groovy
index 2120b73c1c..4c00f779a4 100644
--- a/tooling/scripts/copy-tests.groovy
+++ b/tooling/scripts/copy-tests.groovy
@@ -27,19 +27,26 @@ import java.util.regex.Pattern
import java.util.regex.Matcher
import groovy.ant.AntBuilder
-/* Copies source files from one source test modulesinto one destination module (`copy-tests.dest.module.dir`)
+/* Copies source files from one source test modules into one destination module (`copy-tests.dest.module.dir`)
* so that the tests can be executed. Use of ('copy-tests.exclude') allows to exclude files.
*/
final Path sourceDir = Paths.get(properties['copy-tests.source.dir'])
final Path destinationModuleDir = Paths.get(properties['copy-tests.dest.module.dir'])
final String excl = properties['copy-tests.excludes']
+final String classNamePrefix = properties['group-tests.class.name.prefix'] ?: ""
copyResources(sourceDir.resolve('src/main/resources'), destinationModuleDir.resolve('target/classes'), excl)
copyResources(sourceDir.resolve('src/main/java'), destinationModuleDir.resolve('target/src/main/java'), excl)
copyResources(sourceDir.resolve('src/test/java'), destinationModuleDir.resolve('target/src/test/java'), excl)
copyResources(sourceDir.resolve('src/test/resources'), destinationModuleDir.resolve('target/test-classes'), excl)
-
+
+String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
+File sourceFile = new File("${scriptDir}/group-test-utils.groovy")
+Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(sourceFile);
+GroovyObject utils = (GroovyObject) groovyClass.getDeclaredConstructor().newInstance();
+utils.makeTestClassNamesUnique(destinationModuleDir.resolve('target/src/test/java').toFile(), classNamePrefix)
+
static void copyResources(Path source, Path dest, String excl) {
if (Files.exists(source)) {
new AntBuilder().copy(todir: dest) {
diff --git a/tooling/scripts/group-test-utils.groovy b/tooling/scripts/group-test-utils.groovy
new file mode 100644
index 0000000000..c12a0bd318
--- /dev/null
+++ b/tooling/scripts/group-test-utils.groovy
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def makeTestClassNamesUnique(File sourceDir, String classNamePrefix) {
+ if (!classNamePrefix.isEmpty()) {
+ sourceDir.eachFileRecurse { file ->
+ String originalName = file.name
+ if ((originalName.endsWith("Test.java") || originalName.endsWith("IT.java")) && !originalName.startsWith(classNamePrefix)) {
+ String className = originalName.replace(".java", "")
+ String newClassName = "${classNamePrefix}${className}"
+
+ String content = file.text
+ content = content.replaceAll("${className}(?!EnvCustomizer)", "${classNamePrefix}${className}")
+
+ if (originalName.endsWith("IT.java")) {
+ String originalExtendsClassName = className.replace("IT", "Test")
+ String extendsClassName = newClassName.replace("IT", "Test")
+ content = content.replaceAll(originalExtendsClassName, extendsClassName)
+ }
+
+ file.write(content)
+
+ String path = file.absolutePath.replace(originalName, "${classNamePrefix}${originalName}")
+ file.renameTo(path)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tooling/scripts/group-tests.groovy b/tooling/scripts/group-tests.groovy
index 02eba771f7..87c2d4ba47 100644
--- a/tooling/scripts/group-tests.groovy
+++ b/tooling/scripts/group-tests.groovy
@@ -34,6 +34,7 @@ import groovy.ant.AntBuilder
final Path sourceDir = Paths.get(properties['group-tests.source.dir'])
final String[] concatRelPaths = properties['group-tests.concat.rel.paths'].split('[\\s,]+')
final Path destinationModuleDir = Paths.get(properties['group-tests.dest.module.dir'])
+final String classNamePrefix = properties['group-tests.class.name.prefix'] ?: ""
/* Property names whose values originating from distinct application.properties files can be concatenated using comma as a separator */
final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set;
@@ -53,6 +54,12 @@ Files.list(sourceDir)
copyResources(p.resolve('src/test/resources'), destinationModuleDir.resolve('target/test-classes'))
}
+String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
+File sourceFile = new File("${scriptDir}/group-test-utils.groovy")
+Class groovyClass = new GroovyClassLoader(getClass().getClassLoader()).parseClass(sourceFile)
+GroovyObject utils = (GroovyObject) groovyClass.getDeclaredConstructor().newInstance()
+utils.makeTestClassNamesUnique(destinationModuleDir.resolve('target/src/test/java').toFile(), classNamePrefix)
+
mergedFiles.each { relPath, cat ->
String destRelPath = relPath.replace('src/main/resources/', 'target/classes/').replace('src/test/resources/', 'target/test-classes/')
Path destPath = destinationModuleDir.resolve(destRelPath)
[camel-quarkus] 06/07: Fix #4667 to use quay.io/jbosstm/lra-coordinator
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 22c6c2d277de6c77b5d235dfe5bd9d2b5e02b4bd
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Fri Mar 17 23:49:41 2023 +0800
Fix #4667 to use quay.io/jbosstm/lra-coordinator
---
.../org/apache/camel/quarkus/component/lra/it/LraTestResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
index bd5f6f73a1..72c856ec57 100644
--- a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
+++ b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
@@ -28,7 +28,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
public class LraTestResource implements QuarkusTestResourceLifecycleManager {
private static final Integer LRA_PORT = AvailablePortFinder.getNextAvailable();
- private static final String LRA_IMAGE = "jbosstm/lra-coordinator:5.12.0.Final";
+ private static final String LRA_IMAGE = "quay.io/jbosstm/lra-coordinator:5.13.1.Final-2.16.4.Final";
private GenericContainer container;
private String hostname;
@@ -41,7 +41,7 @@ public class LraTestResource implements QuarkusTestResourceLifecycleManager {
hostname = "localhost";
container = new GenericContainer(LRA_IMAGE)
.withNetworkMode("host")
- .withEnv("JAVA_OPTS", "-Dquarkus.http.port=" + LRA_PORT)
+ .withEnv("quarkus.http.port", String.valueOf(LRA_PORT))
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
container.start();
lraPort = LRA_PORT;
@@ -50,7 +50,7 @@ public class LraTestResource implements QuarkusTestResourceLifecycleManager {
container = new GenericContainer(LRA_IMAGE)
.withNetworkMode("bridge")
.withExposedPorts(LRA_PORT)
- .withEnv("JAVA_OPTS", "-Dquarkus.http.port=" + LRA_PORT)
+ .withEnv("quarkus.http.port", String.valueOf(LRA_PORT))
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
container.start();
lraPort = container.getMappedPort(LRA_PORT);
[camel-quarkus] 03/07: Aws2-cw: dependency io.quarkus:quarkus-jaxp is not needed for the native run #4614
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d3d09136d73bd4a18b605e3e50d5790217bbb308
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Mar 1 16:32:51 2023 +0100
Aws2-cw: dependency io.quarkus:quarkus-jaxp is not needed for the native run #4614
---
extensions/aws2-cw/deployment/pom.xml | 4 ----
extensions/aws2-cw/runtime/pom.xml | 4 ----
2 files changed, 8 deletions(-)
diff --git a/extensions/aws2-cw/deployment/pom.xml b/extensions/aws2-cw/deployment/pom.xml
index 4c0d63dbcc..2c9a5113ba 100644
--- a/extensions/aws2-cw/deployment/pom.xml
+++ b/extensions/aws2-cw/deployment/pom.xml
@@ -38,10 +38,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-aws2-cw</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jaxp-deployment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2-deployment</artifactId>
diff --git a/extensions/aws2-cw/runtime/pom.xml b/extensions/aws2-cw/runtime/pom.xml
index 4cf005db7c..5bd6401eff 100644
--- a/extensions/aws2-cw/runtime/pom.xml
+++ b/extensions/aws2-cw/runtime/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-aws2</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jaxp</artifactId>
- </dependency>
</dependencies>
<build>
[camel-quarkus] 02/07: Exclude banned xml-apis from org.seleniumhq.selenium:htmlunit-driver
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 71df9e6da1278761ffce1a16ca6858a08da0b361
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 1 08:05:24 2023 +0000
Exclude banned xml-apis from org.seleniumhq.selenium:htmlunit-driver
---
poms/bom-test/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index b03ec55c29..a4b2324ee8 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -328,6 +328,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>