Add gradle-wrapper.jar

Signed-off-by: Rahul Krishna <i.m.ralk@gmail.com>

Author: rahlk

src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java

@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.MountableFile;
@@ -13,6 +14,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.Properties;
 
 
@@ -41,13 +43,10 @@ public class CodeAnalyzerIntegrationTest {
     }
 
     @Container
-    static final GenericContainer<?> container = new GenericContainer<>("openjdk:17-jdk")
+    static final GenericContainer<?> container = new GenericContainer<>("ubuntu:latest")
             .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh"))
             .withCommand("-c", "while true; do sleep 1; done")
-            .withFileSystemBind(
-                    String.valueOf(Paths.get(System.getProperty("user.dir")).resolve("build/libs")),
-                    "/opt/jars",
-                    BindMode.READ_WRITE)
+            .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("build/libs")), "/opt/jars")
             .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("build/libs")), "/opt/jars")
             .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/mvnw-corrupt-test")), "/test-applications/mvnw-corrupt-test")
             .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications/plantsbywebsphere")), "/test-applications/plantsbywebsphere")
@@ -107,6 +106,10 @@ void shouldBeAbleToRunCodeAnalyzer() throws Exception {
 
     @Test
     void callGraphShouldHaveKnownEdges() throws Exception {
+        var listContentsOfTestApplicationDirectory = container.execInContainer("ls", "/test-applications/call-graph-test");
+        Assertions.assertFalse(listContentsOfTestApplicationDirectory.getStdout().isEmpty(), "Directory listing should not be empty");
+        var runGradlew = container.execInContainer("sh", "-c", "/test-applications/call-graph-test/gradlew", "-v");
+        Assertions.assertEquals(0, runGradlew.getExitCode(), "Failed to run gradlew");
         var runCodeAnalyzerOnCallGraphTest = container.withWorkingDirectory("/test-applications/call-graph-test")
                 .execInContainer(
                 "java",
@@ -177,6 +180,10 @@ void shouldBeAbleToGenerateAnalysisArtifactForDaytrader8() throws Exception {
 
     @Test
     void shouldBeAbleToDetectCRUDOperationsAndQueriesForPlantByWebsphere() throws Exception {
+        container.execInContainer("apt-get", "update");
+        var installFindUtils = container.execInContainer("apt-get", "install", "-y", "openjdk-17-jdk", "findutils");
+        var printJavaVersion = container.execInContainer("java", "-version");
+        var printGradleVersion = container.execInContainer("/test-applications/plantsbywebsphere/gradlew", "-v");
         var runCodeAnalyzerOnPlantsByWebsphere = container.execInContainer(
                 "java",
                 "-jar",

src/test/resources/.gitignore

@@ -0,0 +1 @@
+*.json

src/test/resources/generated/.gitignore

@@ -29,6 +29,9 @@ hs_err_pid*
 .gradle/
 build/
 
+# Don't ignore Gradle wrapper jar file
+!gradle-wrapper.jar
+
 # Ignore Maven target folder
 target/
 

src/test/resources/test-applications/.gitignore

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/resources/test-applications/call-graph-test/gradle/wrapper/gradle-wrapper.jar

@@ -33,7 +33,7 @@ task copyServerLibs(type: Copy) {
     into "${buildDir}/wlp/usr/servers/${rootProject.name}Server/lib"
 }
 
-war.archiveName = "${rootProject.name}.war"
+war.archiveFileName = "${rootProject.name}.war"
 test.dependsOn 'war'
 
 test {

src/test/resources/test-applications/call-graph-test/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists