Merge branch 'feature/mvn_3_9#102' into develop

bsorrentino · Sep 15, 2023 · 3e635da · 3e635da
2 parents adcde7c + 9076fdf
commit 3e635da
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 20 deletions.
diff --git a/compiler-jdk8/pom.xml b/compiler-jdk8/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-processor-plugin-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.0-jdk8-rc3</version>
+        <version>5.0-jdk8-SNAPSHOT</version>
         <relativePath>../pom-jdk8.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/compiler-jdk8/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java b/compiler-jdk8/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java
@@ -423,6 +423,10 @@ public void setProcessors(Iterable<? extends Processor> processors) {
             public void setLocale(Locale locale) {
                 throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
             }
+            @Override
+            public void addModules(Iterable<String> moduleNames) {
+                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+            }
 
             @Override
             public Boolean call() {

diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-processor-plugin-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>5.0-rc3</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom-jdk8.xml b/pom-jdk8.xml
@@ -3,7 +3,7 @@
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>5.0-jdk8-rc3</version>
+  <version>5.0-jdk8-SNAPSHOT</version>
   <name>MAVEN PROCESSOR PLUGIN PARENT (JDK8)</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 
@@ -13,7 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <url>https://github.com/bsorrentino/maven-annotation-plugin</url>
 
   <prerequisites>
-      <maven>3.5</maven>
+      <maven>3.6</maven>
   </prerequisites>
 
   <distributionManagement>
@@ -36,9 +36,9 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
       <release.repo.id>sonatype-repo</release.repo.id>
       <release.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2</release.repo.url>
 
-      <maven.version>3.5.4</maven.version>
+      <maven.version>3.6.0</maven.version>
       <maven.plugin.version>3.6.0</maven.plugin.version>
-      <plexus.compiler.version>2.8.3</plexus.compiler.version>
+      <plexus.compiler.version>2.13.0</plexus.compiler.version>
 
       <maven.compiler.source>1.8</maven.compiler.source>
       <maven.compiler.target>1.8</maven.compiler.target>
@@ -156,13 +156,25 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.11.0</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <propertiesEncoding>UTF-8</propertiesEncoding>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.8.2</version>
+                <version>3.12.1</version>
             </plugin>
 
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>5.0-rc3</version>
+  <version>5.0-SNAPSHOT</version>
   <name>MAVEN PROCESSOR PLUGIN PARENT</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 
@@ -13,7 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <url>https://github.com/bsorrentino/maven-annotation-plugin</url>
 
   <prerequisites>
-      <maven>3.5</maven>
+      <maven>3.6</maven>
   </prerequisites>
 
   <distributionManagement>
@@ -36,9 +36,9 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
       <release.repo.id>sonatype-repo</release.repo.id>
       <release.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2</release.repo.url>
 
-      <maven.version>3.5.4</maven.version>
+      <maven.version>3.6.0</maven.version>
       <maven.plugin.version>3.6.0</maven.plugin.version>
-      <plexus.compiler.version>2.8.3</plexus.compiler.version>
+      <plexus.compiler.version>2.13.0</plexus.compiler.version>
 
       <maven.compiler.source>1.9</maven.compiler.source>
       <maven.compiler.target>1.9</maven.compiler.target>
@@ -158,13 +158,24 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.11.0</version>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <propertiesEncoding>UTF-8</propertiesEncoding>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.8.2</version>
+                <version>3.12.1</version>
             </plugin>
 
             <plugin>

diff --git a/processor/pom-jdk8.xml b/processor/pom-jdk8.xml
@@ -13,7 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <parent>
       <groupId>org.bsc.maven</groupId>
       <artifactId>maven-processor-plugin-parent</artifactId>
-      <version>5.0-jdk8-rc3</version>
+      <version>5.0-jdk8-SNAPSHOT</version>
       <relativePath>../pom-jdk8.xml</relativePath>
   </parent>
 

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -13,7 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <parent>
       <groupId>org.bsc.maven</groupId>
       <artifactId>maven-processor-plugin-parent</artifactId>
-      <version>5.0-rc3</version>
+      <version>5.0-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/test/app/pom.xml b/test/app/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin-parent</artifactId>
-        <version>5.0-rc3</version>
+        <version>5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/test/processors/pom.xml b/test/processors/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin-parent</artifactId>
-        <version>5.0-rc3</version>
+        <version>5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/utils/pom-jdk8.xml b/utils/pom-jdk8.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin-parent</artifactId>
-        <version>5.0-jdk8-rc3</version>
+        <version>5.0-jdk8-SNAPSHOT</version>
         <relativePath>../pom-jdk8.xml</relativePath>
     </parent>
 

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.bsc.maven</groupId>
         <artifactId>maven-processor-plugin-parent</artifactId>
-        <version>5.0-rc3</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <properties>