Merge branch 'master' into dependabot/maven/org.apache.maven.plugin-t…

…ools-maven-plugin-annotations-3.10.2
spotify · Feb 5, 2024 · 0c609a8 · 0c609a8
2 parents 499fb33 + b9ae294
commit 0c609a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
         with:
           fetch-depth: 2
       - name: Set up JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java_version }}

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -12,7 +12,7 @@
   <packaging>maven-plugin</packaging>
 
   <properties>
-    <maven.api.version>3.9.4</maven.api.version>
+    <maven.api.version>3.9.5</maven.api.version>
   </properties>
 
   <prerequisites>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.2-jre</version>
+      <version>33.0.0-jre</version>
     </dependency>
 
     <!-- maven-plugin-annotations seems to be version differently than Maven API stuff  -->