Support Java 21 and 25

Author: ihostage

.github/workflows/build-test.yml

@@ -15,15 +15,15 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style # scalafmt, javafmt, headerCheck
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt validateCode
 
   tests:
     name: Tests
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 17, 11
+      java: 25, 21, 17, 11
       scala: 2.12.20
       add-dimensions: >-
         {
@@ -44,4 +44,4 @@ jobs:
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v3
+    uses: playframework/.github/.github/workflows/rtm.yml@v4

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
     if: ${{ github.repository_owner == 'sbt' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0

build.sbt

@@ -36,7 +36,8 @@ developers += Developer(
 )
 
 libraryDependencies ++= Seq(
-  "org.apache.maven.plugins" % "maven-plugin-plugin" % "3.15.1",
+  "org.apache.maven.plugins" % "maven-plugin-plugin" % "3.15.2",
+  "org.apache.maven"         % "maven-core"          % "3.9.12",
   "junit"                    % "junit"               % "4.13.2" % Test
 )
 

src/main/java/com/github/sbt/maven/SbtLogger.java

@@ -28,7 +28,6 @@ import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor
 import org.apache.maven.tools.plugin.generator.GeneratorUtils.toComponentDependencies
 import org.apache.maven.tools.plugin.generator.PluginDescriptorFilesGenerator
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest
-import org.codehaus.plexus.logging
 import org.codehaus.plexus.util.ReflectionUtils.setVariableValueInObject
 
 object SbtMavenPlugin extends AutoPlugin {
@@ -144,10 +143,9 @@ object SbtMavenPlugin extends AutoPlugin {
     project
   }
 
-  private def createMojoExtractor(logger: logging.Logger): MojoDescriptorExtractor = {
+  private def createMojoExtractor(): MojoDescriptorExtractor = {
     val extractor = new JavaAnnotationsMojoDescriptorExtractor()
     val scanner   = new DefaultMojoAnnotationsScanner
-    scanner.enableLogging(logger)
     setVariableValueInObject(extractor, "mojoAnnotationsScanner", scanner)
     extractor
   }
@@ -161,7 +159,7 @@ object SbtMavenPlugin extends AutoPlugin {
     val artifacts          = findRuntimeDependencies(update.value, allDependencies.value, crossVersion)
     val pluginDescriptor   = createPluginDescriptor(mavenPluginGoalPrefix.value, projectId, projectInfo.value, artifacts)
     val request            = new DefaultPluginToolsRequest(project, pluginDescriptor)
-    val extractor          = createMojoExtractor(new SbtLogger(streams.value.log))
+    val extractor          = createMojoExtractor()
     val generator          = new PluginDescriptorFilesGenerator()
 
     extractor.execute(request).forEach { mojo => pluginDescriptor.addMojo(mojo) }

src/main/scala/com/github/sbt/maven/SbtMavenPlugin.scala

@@ -9,8 +9,7 @@
   <version>1.0.0-SNAPSHOT</version>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.release>11</maven.compiler.release>
   </properties>
 
   <dependencies>