[GEODE-10672] WanCopyRegionFunctionServiceTest fails

.github/workflows/gradle.yml

@@ -451,7 +451,7 @@ jobs:
             geode-connectors:distributedTest \
             geode-old-client:distributedTest \
             extensions:geode-modules:distributedTest \
-            extensions:geode-modules-tomcat10:distributedTest --console=plain --no-daemon
+            extensions:geode-modules-tomcat8:distributedTest --console=plain --no-daemon
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -967,13 +967,13 @@ lib/HdrHistogram-2.2.2.jar
 lib/HikariCP-4.0.3.jar
 lib/LatencyUtils-2.0.3.jar
 lib/antlr-2.7.7.jar
-lib/classgraph-4.8.147.jar
+lib/classgraph-4.8.146.jar
 lib/commons-beanutils-1.11.0.jar
 lib/commons-codec-1.15.jar
 lib/commons-collections-3.2.2.jar
 lib/commons-digester-2.1.jar
-lib/commons-io-2.11.0.jar
-lib/commons-lang3-3.12.0.jar
+lib/commons-io-2.18.0.jar
+lib/commons-lang3-3.18.0.jar
 lib/commons-logging-1.3.5.jar
 lib/commons-modeler-2.0.1.jar
 lib/commons-validator-1.7.jar
@@ -1059,13 +1059,12 @@ lib/shiro-crypto-core-1.13.0.jar
 lib/shiro-crypto-hash-1.13.0.jar
 lib/shiro-event-1.13.0.jar
 lib/shiro-lang-1.13.0.jar
-lib/slf4j-api-1.7.32.jar
 lib/slf4j-api-1.7.36.jar
 lib/snappy-0.5.jar
-lib/spring-beans-5.3.21.jar
-lib/spring-context-5.3.21.jar
-lib/spring-core-5.3.21.jar
-lib/spring-jcl-5.3.21.jar
+lib/spring-beans-5.3.20.jar
+lib/spring-context-5.3.20.jar
+lib/spring-core-5.3.20.jar
+lib/spring-jcl-5.3.20.jar
 lib/spring-shell-1.2.0.RELEASE.jar
 lib/spring-web-5.3.20.jar
 lib/swagger-annotations-2.2.0.jar
@@ -1077,4 +1076,3 @@ tools/Modules/Apache_Geode_Modules-0.0.0-Tomcat.zip
 tools/Modules/Apache_Geode_Modules-0.0.0-tcServer.zip
 tools/Modules/Apache_Geode_Modules-0.0.0-tcServer30.zip
 tools/Pulse/geode-pulse-0.0.0.war
-lib/byte-buddy-1.14.9.jar

geode-assembly/src/integrationTest/resources/expected_jars.txt

@@ -122,4 +122,3 @@ swagger-core
 swagger-models
 swagger-ui
 webjars-locator-core
-byte-buddy

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

@@ -19,14 +19,13 @@ geode-unsafe-0.0.0.jar
 geode-deployment-legacy-0.0.0.jar
 spring-shell-1.2.0.RELEASE.jar
 spring-web-5.3.20.jar
-commons-lang3-3.12.0.jar
+commons-lang3-3.18.0.jar
 rmiio-2.1.2.jar
 jackson-datatype-joda-2.21.6.jar
-jackson-annotations-2.21.jar
 jackson-core-2.21.6.jar
 jackson-datatype-jsr310-2.21.6.jar
 jackson-databind-2.21.6.jar
-swagger-annotations-2.2.1.jar
+swagger-annotations-2.2.0.jar
 jopt-simple-5.0.4.jar
 log4j-slf4j-impl-2.25.5.jar
 log4j-core-2.25.5.jar
@@ -47,14 +46,14 @@ antlr-2.7.7.jar
 istack-commons-runtime-4.0.1.jar
 jaxb-impl-2.3.2.jar
 commons-validator-1.7.jar
-commons-beanutils-1.11.0.jar
 shiro-core-1.13.0.jar
 shiro-config-ogdl-1.13.0.jar
+commons-beanutils-1.11.0.jar
 commons-codec-1.15.jar
 commons-collections-3.2.2.jar
 commons-digester-2.1.jar
-commons-io-2.11.0.jar
-commons-logging-1.2.jar
+commons-io-2.18.0.jar
+commons-logging-1.3.5.jar
 classgraph-4.8.146.jar
 micrometer-core-1.16.7.jar
 fastutil-8.5.8.jar
@@ -77,13 +76,14 @@ shiro-event-1.13.0.jar
 shiro-crypto-core-1.13.0.jar
 shiro-lang-1.13.0.jar
 slf4j-api-1.7.36.jar
+jackson-annotations-2.21.jar
 spring-beans-5.3.20.jar
 javax.activation-api-1.2.0.jar
 jline-2.12.jar
 lucene-queries-6.6.6.jar
 spring-jcl-5.3.20.jar
-micrometer-commons-1.16.7.jar
 micrometer-observation-1.16.7.jar
+micrometer-commons-1.16.7.jar
 jspecify-1.0.1.jar
 HdrHistogram-2.2.2.jar
 LatencyUtils-2.0.3.jar
@@ -93,4 +93,3 @@ jetty-http-9.4.57.v20241219.jar
 jetty-io-9.4.57.v20241219.jar
 jetty-util-ajax-9.4.57.v20241219.jar
 jetty-util-9.4.57.v20241219.jar
-byte-buddy-1.14.9.jar

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

@@ -1,4 +1,4 @@
-spring-web-5.3.21.jar
+spring-web-5.3.20.jar
 shiro-event-1.13.0.jar
 shiro-crypto-hash-1.13.0.jar
 shiro-crypto-cipher-1.13.0.jar
@@ -7,7 +7,7 @@ commons-digester-2.1.jar
 commons-validator-1.7.jar
 spring-jcl-5.3.20.jar
 commons-codec-1.15.jar
-classgraph-4.8.147.jar
+classgraph-4.8.146.jar
 commons-logging-1.3.5.jar
 jackson-databind-2.21.6.jar
 geode-management-0.0.0.jar
@@ -17,7 +17,7 @@ javax.resource-api-1.7.1.jar
 LatencyUtils-2.0.3.jar
 jline-2.12.jar
 jetty-servlet-9.4.57.v20241219.jar
-spring-core-5.3.21.jar
+spring-core-5.3.20.jar
 jetty-util-ajax-9.4.57.v20241219.jar
 geode-cq-0.0.0.jar
 geode-old-client-support-0.0.0.jar
@@ -29,7 +29,7 @@ spring-beans-5.3.20.jar
 lucene-queries-6.6.6.jar
 shiro-core-1.13.0.jar
 HikariCP-4.0.3.jar
-slf4j-api-1.7.32.jar
+slf4j-api-1.7.36.jar
 geode-http-service-0.0.0.jar
 commons-collections-3.2.2.jar
 httpclient-4.5.13.jar
@@ -50,10 +50,10 @@ log4j-slf4j-impl-2.25.5.jar
 lucene-analyzers-common-6.6.6.jar
 geode-membership-0.0.0.jar
 jetty-webapp-9.4.57.v20241219.jar
-commons-lang3-3.12.0.jar
+commons-lang3-3.18.0.jar
 jopt-simple-5.0.4.jar
 swagger-annotations-2.2.0.jar
-snappy-0.4.jar
+snappy-0.5.jar
 geode-wan-0.0.0.jar
 log4j-api-2.25.5.jar
 geode-serialization-0.0.0.jar
@@ -79,10 +79,10 @@ jspecify-1.0.1.jar
 shiro-config-ogdl-1.13.0.jar
 geode-log4j-0.0.0.jar
 lucene-analyzers-phonetic-6.6.6.jar
-spring-context-5.3.21.jar
+spring-context-5.3.20.jar
 jetty-security-9.4.57.v20241219.jar
 geode-logging-0.0.0.jar
-commons-io-2.11.0.jar
+commons-io-2.18.0.jar
 shiro-lang-1.13.0.jar
 javax.transaction-api-1.3.jar
 geode-common-0.0.0.jar
@@ -93,4 +93,3 @@ jetty-server-9.4.57.v20241219.jar
 jackson-datatype-jsr310-2.21.6.jar
 jackson-datatype-joda-2.21.6.jar
 joda-time-2.12.7.jar
-byte-buddy-1.14.9.jar

geode-wan/src/test/java/org/apache/geode/cache/wan/internal/WanCopyRegionFunctionServiceTest.java

@@ -22,8 +22,11 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -35,11 +38,20 @@ public class WanCopyRegionFunctionServiceTest {
 
   private WanCopyRegionFunctionService service;
   private final InternalCache cache = mock(InternalCache.class);
+  private ExecutorService executor;
 
   @Before
   public void setUp() throws Exception {
     service = new WanCopyRegionFunctionService();
     service.init(cache);
+    executor = Executors.newCachedThreadPool();
+  }
+
+  @After
+  public void tearDown() {
+    if (executor != null) {
+      executor.shutdownNow();
+    }
   }
 
   @Test
@@ -59,7 +71,7 @@ public void severalExecuteWithSameRegionAndSenderNotAllowed() {
           } catch (Exception e) {
             return null;
           }
-        });
+        }, executor);
 
     // Wait for the execute function to start
     await().untilAsserted(() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(1));
@@ -90,7 +102,7 @@ public void cancelRunningExecutionReturnsSuccess() {
           } catch (Exception e) {
             return null;
           }
-        });
+        }, executor);
 
     // Wait for the function to start execution
     await().untilAsserted(() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(1));
@@ -127,7 +139,7 @@ public void cancelAllExecutionsWithRunningExecutionsReturnsCanceledExecutions()
           } catch (Exception e) {
             return null;
           }
-        });
+        }, executor);
 
     Callable<CliFunctionResult> secondExecution = () -> {
       latch.await(GeodeAwaitility.getTimeout().getSeconds(), TimeUnit.SECONDS);
@@ -141,7 +153,7 @@ public void cancelAllExecutionsWithRunningExecutionsReturnsCanceledExecutions()
           } catch (Exception e) {
             return null;
           }
-        });
+        }, executor);
 
     // Wait for the functions to start execution
     await().untilAsserted(() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(2));
@@ -172,7 +184,7 @@ public void severalExecuteWithDifferentRegionOrSenderAreAllowed() throws Interru
             } catch (Exception e) {
               return null;
             }
-          });
+          }, executor);
 
       // Wait for this specific execution to be registered before starting the next one
       // This ensures we don't have a race where multiple tasks try to start simultaneously