Skip to content

Commit

Permalink
Merge pull request #319 from groovy/updates
Browse files Browse the repository at this point in the history
Update dependencies and plugins
  • Loading branch information
keeganwitt authored Dec 31, 2024
2 parents fb6e39e + 4e4927c commit 1d09b7b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
matrix:
groovy-version:
- 2.5.23
- 3.0.22
- 4.0.23
- 5.0.0-alpha-10
- 3.0.23
- 4.0.24
- 5.0.0-alpha-11
env:
MVN_GROOVY_GROUP_ID: ${{format('{0}{1}', '-DgroovyVersion=', matrix.groovy-version)}}
MVN_GROOVY_VERSION: ${{(startsWith(matrix.groovy-version, '2') || startsWith(matrix.groovy-version, '3')) && '-DgroovyGroupId=org.codehaus.groovy' || '-DgroovyGroupId=org.apache.groovy'}}
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<mavenVersion>3.6.3</mavenVersion>
<jacocoPluginVersion>0.8.12</jacocoPluginVersion>
<javadocPluginVersion>3.10.1</javadocPluginVersion>
<javadocPluginVersion>3.11.2</javadocPluginVersion>
<shortJavaVersion>8</shortJavaVersion>
<!-- these are properties so integration tests can use them -->
<javaVersion>1.${shortJavaVersion}</javaVersion>
<dependencyPluginVersion>3.8.0</dependencyPluginVersion>
<dependencyPluginVersion>3.8.1</dependencyPluginVersion>
<compilerPluginVersion>3.13.0</compilerPluginVersion>
<resourcesPluginVersion>3.3.1</resourcesPluginVersion>
<junitVersion>4.13.2</junitVersion>
<surefirePluginVersion>3.5.0</surefirePluginVersion>
<pluginPluginVersion>3.15.0</pluginPluginVersion>
<surefirePluginVersion>3.5.2</surefirePluginVersion>
<pluginPluginVersion>3.15.1</pluginPluginVersion>
<!-- this is a property so that site generation can use it -->
<sourcePluginVersion>3.3.1</sourcePluginVersion>
<!-- these are properties so that site generation and integration tests can use it -->
<groovyGroupId>org.apache.groovy</groovyGroupId>
<groovyVersion>4.0.23</groovyVersion>
<groovyVersion>4.0.24</groovyVersion>
</properties>

<dependencies>
Expand Down Expand Up @@ -57,13 +57,13 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.13.1</version>
<version>3.15.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand All @@ -74,7 +74,7 @@
<!-- fix CVE-2020-8908 and CVE-2023-2976 from org.apache.maven:maven-core -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -149,7 +149,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.14.1</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<project.build.sourceEncoding>@project.build.sourceEncoding@</project.build.sourceEncoding>
<commonsLang3Version>3.17.0</commonsLang3Version>
<mavenVersion>3.9.9</mavenVersion>
<junit5Version>5.11.1</junit5Version>
<junit5Version>5.11.4</junit5Version>
</properties>

<dependencyManagement>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.15.0</version>
<version>3.15.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M11</version>
<version>2.0.1</version>
</skin>

<custom>
Expand Down

0 comments on commit 1d09b7b

Please sign in to comment.