Introduce cache for Maven dependencies.

.gitlab-ci.yml

@@ -138,7 +138,7 @@ default:
     KUBERNETES_CPU_REQUEST: 8
     KUBERNETES_MEMORY_REQUEST: 8Gi
     KUBERNETES_MEMORY_LIMIT: 8Gi
-    CACHE_TYPE: lib #default
+    CACHE_TYPE: "lib" #default
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "slowest"
 
@@ -148,10 +148,11 @@ default:
   cache:
     - key: dependency-$CACHE_TYPE # Dependencies cache
       paths:
-        # Cached dependencies and wrappers for gradle
+        # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
+        - .mvn/caches
       policy: $DEPENDENCY_CACHE_POLICY
       unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
@@ -174,6 +175,7 @@ default:
     - export GRADLE_USER_HOME=$(pwd)/.gradle
     # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
     - sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
+    - mkdir -p .mvn/caches
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
@@ -246,7 +248,7 @@ build:
   extends: .gradle_build
   variables:
     BUILD_CACHE_POLICY: push
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
     DEPENDENCY_CACHE_POLICY: pull
   script:
     - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi
@@ -365,7 +367,7 @@ test_published_artifacts:
   stage: tests
   needs: [ build ]
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   script:
     - mvn_local_repo=$(./mvnw help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
     - rm -rf "${mvn_local_repo}/com/datadoghq"
@@ -393,7 +395,7 @@ test_published_artifacts:
   needs: [ build ]
   stage: tests
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "inst"
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version
@@ -454,7 +456,7 @@ muzzle:
     matrix:
       - CI_SPLIT: ["1/8", "2/8", "3/8", "4/8", "5/8", "6/8", "7/8", "8/8"]
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew --version
@@ -476,7 +478,7 @@ muzzle-dep-report:
   needs: [ build_tests ]
   stage: tests
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew --version
@@ -809,7 +811,7 @@ deploy_to_maven_central:
   stage: publish
   needs: [ build ]
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   rules:
     - if: '$POPULATE_CACHE'
       when: never

dd-java-agent/instrumentation/mule-4.5/build.gradle

@@ -221,16 +221,30 @@ tasks.register('extractLatestMuleServices', Sync) {
 
 // build the mule application via maven
 tasks.register('mvnPackage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/mvnw", "-Ddatadog.builddir=$buildDir", "-Ddatadog.name=mule-test-application", "-Ddatadog.version=$version", 'package'
+
+  List<String> mvnArgs = [
+    "$rootDir/mvnw",
+    "-Ddatadog.builddir=$buildDir",
+    "-Ddatadog.name=mule-test-application",
+    "-Ddatadog.version=$version",
+    "package"
+  ]
+
+  // Specify caches folder on CI.
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  commandLine(mvnArgs)
+
   outputs.dir("$buildDir/target")
   inputs.dir("$appDir/src")
   inputs.file("$appDir/pom.xml")
   inputs.file("$appDir/mule-artifact.json")
 }
 
-
 // generate a properties file so the test knows where to run mule, and what jar to deploy
 tasks.register('generateAppResources') {
   createAppResourceTask(it, "test")

dd-smoke-tests/springboot-openliberty-20/build.gradle

@@ -1,4 +1,3 @@
-
 apply from: "$rootDir/gradle/java.gradle"
 description = 'SpringBoot Open Liberty 20-22 Smoke Tests'
 
@@ -14,9 +13,18 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
 
 // compile the Open liberty spring boot server
 tasks.register('mvnStage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
+
+  List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
+
+  // Specify caches folder on CI.
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  commandLine(mvnArgs)
+
   inputs.dir "$appDir/src"
   inputs.file "$appDir/pom.xml"
   outputs.file jarPath

dd-smoke-tests/springboot-openliberty-23/build.gradle

@@ -13,9 +13,18 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
 
 // compile the Open liberty spring boot server
 tasks.register('mvnStage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
+
+  List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
+
+  // Specify caches folder on CI.
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  commandLine(mvnArgs)
+
   inputs.dir "$appDir/src"
   inputs.file "$appDir/pom.xml"
   outputs.file jarPath