[camel-quarkus] branch main updated: Fix #2285 upgrade to use the lasest narayana lra-coordinator

[jamesnetherton]

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


The following commit(s) were added to refs/heads/main by this push:
     new e2c6181  Fix #2285 upgrade to use the lasest narayana lra-coordinator
e2c6181 is described below

commit e2c61818bb43ce43d2a3442a0fc30b8e792c26fe
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Fri Jun 25 13:43:17 2021 +0800

    Fix #2285 upgrade to use the lasest narayana lra-coordinator
---
 .../quarkus/component/lra/it/LraTestResource.java  | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 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 f799209..7ef35b7 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,9 +28,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
 public class LraTestResource implements QuarkusTestResourceLifecycleManager {
 
     private static final Integer LRA_PORT = 
AvailablePortFinder.getNextAvailable();
-    // TODO: Use a newer lra-coordinator
-    // https://github.com/apache/camel-quarkus/issues/2285
-    private static final String LRA_IMAGE = 
"jbosstm/lra-coordinator:5.9.3.Final";
+    private static final String LRA_IMAGE = 
"jbosstm/lra-coordinator:5.12.0.Final";
 
     private GenericContainer container;
     private String hostname;
@@ -43,13 +41,8 @@ public class LraTestResource implements 
QuarkusTestResourceLifecycleManager {
                 hostname = "localhost";
                 container = new GenericContainer(LRA_IMAGE)
                         .withNetworkMode("host")
-                        .withCommand(
-                                "java",
-                                "-jar",
-                                "/deployments/lra-coordinator-swarm.jar",
-                                "-Djava.net.preferIPv4Stack=true",
-                                "-Dswarm.http.port=" + LRA_PORT)
-                        .waitingFor(Wait.forLogMessage(".*WFSWARM99999.*", 1));
+                        .withEnv("JAVA_OPTS", "-Dquarkus.http.port=" + 
LRA_PORT)
+                        
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
                 container.start();
                 lraPort = LRA_PORT;
             } else {
@@ -57,13 +50,8 @@ public class LraTestResource implements 
QuarkusTestResourceLifecycleManager {
                 container = new GenericContainer(LRA_IMAGE)
                         .withNetworkMode("bridge")
                         .withExposedPorts(LRA_PORT)
-                        .withCommand(
-                                "java",
-                                "-jar",
-                                "/deployments/lra-coordinator-swarm.jar",
-                                "-Djava.net.preferIPv4Stack=true",
-                                "-Dswarm.http.port=" + LRA_PORT)
-                        .waitingFor(Wait.forLogMessage(".*WFSWARM99999.*", 1));
+                        .withEnv("JAVA_OPTS", "-Dquarkus.http.port=" + 
LRA_PORT)
+                        
.waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
                 container.start();
                 lraPort = container.getMappedPort(LRA_PORT);
             }