Merge branch 'release/5.1'

bsorrentino · Apr 12, 2024 · ec79932 · ec79932
2 parents 4b4f747 + 861c5a3
commit ec79932
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ target/
 
 issue47.txt
 .okhttpcache/
+/.java-version
diff --git a/README.md b/README.md
@@ -28,14 +28,15 @@ This plugin was born as the 'alter ego' of maven apt plugin [apt-maven-plugin](h
 
 ## Releases
 
- Date  | Version  | Info
---- | --- | ---
-**Sep 21, 2023** | [Release 5.0](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0) | fix [#102](https://github.com/bsorrentino/maven-annotation-plugin/issues/102) - Plugin validation issues on Maven 3.9
-**Jul 12, 2021** | [Release 5.0-rc3](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc3) | merge PR [#96](https://github.com/bsorrentino/maven-annotation-plugin/pull/96) - Thanks to [Ulysses Rangel RIbeiro](https://github.com/ulyssesrr)
+ Date  | Version                                                                                                   | Info
+--- |-----------------------------------------------------------------------------------------------------------| ---
+**Apr 12, 2024** | [Release 5.1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.1)                   | merge PR [#104](https://github.com/bsorrentino/maven-annotation-plugin/pull/104) - Fixed unchanged sources check.Thanks to [AndreaBaroncelli](https://github.com/AndreaBaroncelli)
+**Sep 21, 2023** | [Release 5.0](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0)                   | fix [#102](https://github.com/bsorrentino/maven-annotation-plugin/issues/102) - Plugin validation issues on Maven 3.9
+**Jul 12, 2021** | [Release 5.0-rc3](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc3)           | merge PR [#96](https://github.com/bsorrentino/maven-annotation-plugin/pull/96) - Thanks to [Ulysses Rangel RIbeiro](https://github.com/ulyssesrr)
 **Jul 12, 2021** | [Release 5.0-jdk8-rc3](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-jdk8-rc3) | Maintenance release compatible with JDK8
-**Jun 28, 2021** | [Release 5.0-rc2](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc2) | merge PR [#95](https://github.com/bsorrentino/maven-annotation-plugin/pull/95) - Thanks to [Ulysses Rangel RIbeiro](https://github.com/ulyssesrr)
+**Jun 28, 2021** | [Release 5.0-rc2](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc2)           | merge PR [#95](https://github.com/bsorrentino/maven-annotation-plugin/pull/95) - Thanks to [Ulysses Rangel RIbeiro](https://github.com/ulyssesrr)
 **Jun 28, 2021** | [Release 5.0-jdk8-rc2](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-jdk8-rc2) | Maintenance release compatible with JDK8
-**Feb 04, 2021** | [Release 5.0-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc1) | fix issue [#91](https://github.com/bsorrentino/maven-annotation-plugin/issues/91) [#92](https://github.com/bsorrentino/maven-annotation-plugin/issues/92) [#93](https://github.com/bsorrentino/maven-annotation-plugin/issues/93)
+**Feb 04, 2021** | [Release 5.0-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-rc1)           | fix issue [#91](https://github.com/bsorrentino/maven-annotation-plugin/issues/91) [#92](https://github.com/bsorrentino/maven-annotation-plugin/issues/92) [#93](https://github.com/bsorrentino/maven-annotation-plugin/issues/93)
 **Feb 04, 2021** | [Release 5.0-jdk8-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v5.0-jdk8-rc1) | Maintenance release compatible with JDK8
 
 ## import maven dependency ##

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</version>
+        <version>5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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</version>
+  <version>5.1</version>
   <name>MAVEN PROCESSOR PLUGIN PARENT</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 

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</version>
+      <version>5.1</version>
   </parent>
 
   <properties>

diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java
@@ -597,7 +597,8 @@ private List<String> prepareOptions(JavaCompiler compiler) throws MojoExecutionE
   }
 
   private boolean isSourcesUnchanged(List<JavaFileObject> allSources) throws IOException {
-    if (!areSourceFilesSameAsPreviousRun(allSources))
+    Path sourceFileList = outputDirectory.toPath().resolve(".maven-processor-source-files.txt");
+    if (!areSourceFilesSameAsPreviousRun(allSources, sourceFileList))
       return false;
 
     long maxSourceDate = allSources.stream()
@@ -612,7 +613,7 @@ private boolean isSourcesUnchanged(List<JavaFileObject> allSources) throws IOExc
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
           throws IOException {
-        if (Files.isRegularFile(file)) {
+        if (Files.isRegularFile(file) && !file.equals(sourceFileList)) {
           maxOutputDate.updateAndGet(t -> Math.max(t, file.toFile().lastModified()));
         }
         return FileVisitResult.CONTINUE;
@@ -631,11 +632,11 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
    * Checks the list of {@code allSources} against the stored list of source files in a previous run.
    *
    * @param allSources
+   * @param sourceFileList
    * @return {@code true} when the filenames of the previous run matches exactly with the current run.
    * @throws IOException
    */
-  private boolean areSourceFilesSameAsPreviousRun(List<JavaFileObject> allSources) throws IOException {
-    Path sourceFileList = outputDirectory.toPath().resolve(".maven-processor-source-files.txt");
+  private boolean areSourceFilesSameAsPreviousRun(List<JavaFileObject> allSources, Path sourceFileList) throws IOException {
     try {
       if (!Files.exists(sourceFileList)) {
         getLog().debug("File with previous sources " + sourceFileList + " not found, treating as first run");

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</version>
+        <version>5.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -160,7 +160,7 @@ PROCESSOR PLUGIN
             <dependency>
               <groupId>org.apache.commons</groupId>
               <artifactId>commons-text</artifactId>
-              <version>1.9</version>
+              <version>1.10.0</version>
               <classifier>sources</classifier>
             </dependency>
             <dependency>

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</version>
+        <version>5.1</version>
         <relativePath>../../pom.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</version>
+        <version>5.1</version>
     </parent>
 
     <properties>