Skip to content

Commit

Permalink
Merge pull request #1459 from gradle/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
tylerbertrand authored Oct 10, 2024
2 parents 2be4008 + cda54ac commit e681e25
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Set up Maven
uses: gradle/develocity-actions/maven-setup@v1.1
uses: gradle/develocity-actions/maven-setup@v1.2
with:
develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
- name: Setup Node.js and Npm
Expand Down
2 changes: 1 addition & 1 deletion build-caching-maven-samples/aspectj-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
</plugins>
<pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion build-caching-maven-samples/kotlin-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<kotlin.version>2.0.20</kotlin.version>
<junit-jupiter.version>5.11.1</junit-jupiter.version>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions build-caching-maven-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion convention-develocity-maven-extension/extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit e681e25

Please sign in to comment.