Merge pull request #1324 from gradle/combined-prs-branch

Combined PRs
gradle · Aug 7, 2024 · 890e585 · 890e585
2 parents b84ea9b + bb74434
commit 890e585
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/build-caching-maven-samples/.mvn/develocity.xml b/build-caching-maven-samples/.mvn/develocity.xml
@@ -1,6 +1,6 @@
 <develocity>
     <server>
-        <url>https://localhost</url>
+        <url>https://ge.solutions-team.gradle.com</url>
         <allowUntrusted>true</allowUntrusted>
     </server>
     <buildCache>

diff --git a/build-caching-maven-samples/avro-project/pom.xml b/build-caching-maven-samples/avro-project/pom.xml
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.11.3</version>
+      <version>1.12.0</version>
     </dependency>
   </dependencies>
 
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
-        <version>1.11.3</version>
+        <version>1.12.0</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

diff --git a/build-caching-maven-samples/exec-yarn-project/pom.xml b/build-caching-maven-samples/exec-yarn-project/pom.xml
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <executions>
           <execution>
             <id>yarn-install</id>
@@ -121,6 +121,9 @@
                           <property>
                             <name>forceJava</name>
                           </property>
+                          <property>
+                            <name>includePluginDependencies</name>
+                          </property>
                           <property>
                             <name>skip</name>
                           </property>

diff --git a/build-caching-maven-samples/kotlin-project/pom.xml b/build-caching-maven-samples/kotlin-project/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <properties>
-        <kotlin.version>2.0.0</kotlin.version>
+        <kotlin.version>2.0.10</kotlin.version>
         <junit-jupiter.version>5.10.3</junit-jupiter.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     </properties>