[tomee] branch tomee-7.1.x updated: Backports the fixes from https://github.com/apache/tomee/commit/8c583b48c4f80f746cba3f67336089054cf9aca6 and https://github.com/apache/tomee/commit/8fd9bb5b5ad9bb8a61c5bdbb810b43309a934889 to LegacyServerTest in 7.1.x

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
     new 1c3de0e755 Backports the fixes from 
https://github.com/apache/tomee/commit/8c583b48c4f80f746cba3f67336089054cf9aca6 
and 
https://github.com/apache/tomee/commit/8fd9bb5b5ad9bb8a61c5bdbb810b43309a934889 
to LegacyServerTest in 7.1.x
1c3de0e755 is described below

commit 1c3de0e755226b59ea3d491992d14184b495d7b3
Author: Richard Zowalla <13417392+r...@users.noreply.github.com>
AuthorDate: Sat Apr 23 11:27:59 2022 +0200

    Backports the fixes from 
https://github.com/apache/tomee/commit/8c583b48c4f80f746cba3f67336089054cf9aca6 
and 
https://github.com/apache/tomee/commit/8fd9bb5b5ad9bb8a61c5bdbb810b43309a934889 
to LegacyServerTest in 7.1.x
---
 itests/legacy-server/pom.xml                                      | 2 +-
 .../java/org/apache/openejb/itest/legacy/LegacyServerTest.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/itests/legacy-server/pom.xml b/itests/legacy-server/pom.xml
index b258361d2d..dcfe310baf 100644
--- a/itests/legacy-server/pom.xml
+++ b/itests/legacy-server/pom.xml
@@ -38,7 +38,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <systemPropertyVariables>
-            <version>4.5.2</version>
+            <version>${project.version}</version>
             
<openejb.client.protocol.version>3.1</openejb.client.protocol.version>
           </systemPropertyVariables>
         </configuration>
diff --git 
a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
 
b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
index 7a76d19e5c..22160e68e9 100644
--- 
a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
+++ 
b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
@@ -75,8 +75,8 @@ public class LegacyServerTest {
         //        System.setProperty("version", 
OpenEjbVersion.get().getVersion());
         System.setProperty("openejb.client.connection.strategy", "roundrobin");
 
-        logger.info("Retrieving standalone server: " + 
Repository.guessVersion("org.apache.openejb", "openejb-standalone") + " - This 
may take a while...");
-        final File zip = Repository.getArtifact("org.apache.openejb", 
"openejb-standalone", "zip");
+        logger.info("Retrieving standalone server: " + 
Repository.guessVersion("org.apache.tomee", "openejb-standalone") + " - This 
may take a while...");
+        final File zip = Repository.getArtifact("org.apache.tomee", 
"openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", 
"failover-ejb", "jar");
 
         final File dir = Files.tmpdir();
@@ -162,6 +162,10 @@ public class LegacyServerTest {
 
         final InitialContext context = new InitialContext(environment);
         final Calculator bean = (Calculator) 
context.lookup("CalculatorBeanRemote");
+        // Lets restart one server. This will change the cluster configuration 
so when we call
+        // 'bean' business methods new ClusterMetaDataUpdated event will be 
triggered
+        servers.get("red").kill();
+        servers.get("red").start(1, TimeUnit.MINUTES);
 
         for (final Map.Entry<String, StandaloneServer> entry : 
servers.entrySet()) {
             final String name = entry.getKey();