debian/changelog

+maven-compiler-plugin (3.8.1-1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 31 Mar 2019 12:11:38 +0200
+
 maven-compiler-plugin (3.8.0-2) unstable; urgency=medium
 
   * Team upload.

debian/patches/01-fix-wrong-junit-path.patch

@@ -8,9 +8,9 @@ Description: Fix wrong junit patch in Compiler test.
 Author: Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>
 Last-Update: 2017-09-08
 
---- maven-compiler-plugin-3.6.2.orig/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
-+++ maven-compiler-plugin-3.6.2/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
-@@ -397,7 +397,7 @@ public class CompilerMojoTestCase
+--- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
++++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
+@@ -425,7 +425,7 @@
          String localRepository = System.getProperty( "localRepository" );
          if ( localRepository != null )
          {

pom.xml

@@ -25,12 +25,12 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>32</version>
+    <version>33</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
   <artifactId>maven-compiler-plugin</artifactId>
-  <version>3.8.0</version>
+  <version>3.8.1</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Compiler Plugin</name>
@@ -45,7 +45,7 @@ under the License.
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git</developerConnection>
     <url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
-    <tag>maven-compiler-plugin-3.8.0</tag>
+    <tag>maven-compiler-plugin-3.8.1</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -253,6 +253,7 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
+              <version>3.2.0</version>
               <executions>
                 <execution>
                   <id>integration-test</id>

src/it/MCOMPILER-157/annotation-user/pom.xml

@@ -52,8 +52,6 @@ under the License.
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
           <annotationProcessors>
             <annotationProcessor>org.issue.SimpleAnnotationProcessor</annotationProcessor>
           </annotationProcessors>

src/it/MCOMPILER-157/invoker.properties

@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.java.version = 1.6+
-invoker.goals=clean process-test-classes
+invoker.goals=process-test-classes

src/it/MCOMPILER-157/pom.xml

@@ -42,10 +42,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@project.version@</version>
-          <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
-          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml

@@ -50,8 +50,6 @@ under the License.
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
           <annotationProcessors>
             <annotationProcessor>org.issue.SimpleAnnotationProcessor</annotationProcessor>
           </annotationProcessors>

src/it/MCOMPILER-203-processorpath/invoker.properties

@@ -15,6 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.java.version = 1.6+
-invoker.goals=clean process-test-classes
+invoker.goals=process-test-classes
 invoker.goals.2=process-test-classes

src/it/MCOMPILER-203-processorpath/pom.xml

@@ -42,10 +42,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@project.version@</version>
-          <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
-          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

src/it/MCOMPILER-224/annotation-user/pom.xml

@@ -49,8 +49,6 @@ under the License.
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <showWarnings>true</showWarnings>
-          <source>1.6</source>
-          <target>1.6</target>
           <annotationProcessors>
             <annotationProcessor>org.issue.MCompiler224AnnotationProcessor</annotationProcessor>
           </annotationProcessors>

src/it/MCOMPILER-260_customArguments/pom.xml

@@ -40,8 +40,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>@project.version@</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
           <compilerArgs>
               <arg>-Xmaxwarns</arg>
               <arg>7</arg>

src/it/MCOMPILER-268_modulepath/verify.groovy

@@ -19,3 +19,7 @@
 def log = new File( basedir, 'build.log').text
 
 assert log.count( " --module-path" ) == 2
+
+def descriptor = java.lang.module.ModuleFinder.of(basedir.toPath().resolve("target/classes")).find( "M.N" ).get().descriptor()
+assert '1.0-SNAPSHOT' == descriptor.version().get() as String
+assert 'M.N@1.0-SNAPSHOT' == descriptor.toNameAndVersion()

src/it/MCOMPILER-270_release/pom.xml

@@ -48,7 +48,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>@project.version@</version>
         <configuration>
-          <release>6</release>
+          <release>${java.specification.version}</release>
         </configuration>
       </plugin>
     </plugins>

src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.java.version = 9+
+invoker.toolchain.jdk.version=9

src/it/MCOMPILER-275_separate-moduleinfo/pom.xml

@@ -69,8 +69,8 @@
                 <exclude>module-info.java</exclude>
               </excludes>
               <!-- ideally this would be 1.5, but with CI's it is hard to have a proper toolchains.xml in place -->
-              <source>1.6</source>
-              <target>1.6</target>
+              <source>8</source>
+              <target>8</target>
             </configuration>
           </execution>
         </executions>

src/it/MCOMPILER-349_dependencyChanged/dependent-module/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.plugins.compiler.it</groupId>
+    <artifactId>mcompiler349-test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>dependent-module</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.plugins.compiler.it</groupId>
+      <artifactId>service</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
+

src/it/MCOMPILER-349_dependencyChanged/dependent-module/src/main/java/Main.java

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class Main
+{
+    public static void main( String[] args )
+    {
+        TestService testService = new TestService();
+        testService.run();
+    }
+}
\ No newline at end of file

src/it/MCOMPILER-224/invoker.properties → src/it/MCOMPILER-349_dependencyChanged/invoker.properties

@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.java.version = 1.6+
-# message with JDK6 is prepended by unexpected prefix, so quick workaround is to ignore JDK6...
-#invoker.java.version = 1.7+
+invoker.goals = clean compile
+invoker.goals.2 = groovy:execute
+invoker.goals.3 = compile
+invoker.buildResult.3 = failure

src/it/MCOMPILER-349_dependencyChanged/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.compiler.it</groupId>
+  <artifactId>mcompiler349-test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <description>
+    IT test to verify that dependent-module recompile, when run 'mvn compile' without 'clean' if module dependency
+    changed.
+    The compilation should fail as dependent-module use method that is no longer exists (run() method of TestService
+    renamed to
+    newMethodName()).
+  </description>
+
+  <modules>
+    <module>dependent-module</module>
+    <module>service</module>
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>@project.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.gmaven</groupId>
+          <artifactId>groovy-maven-plugin</artifactId>
+          <version>2.0</version>
+          <configuration>
+            <source>
+              def fileToModify = new File(project.basedir, 'service/src/main/java/TestService.java')
+              processFileInplace(fileToModify) { text ->
+                text.replaceAll(/run/, 'newMethodName')
+              }
+
+              def processFileInplace(file, Closure processText) {
+                file.write(processText(file.text))
+              }
+            </source>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>
+
+

src/it/MCOMPILER-349_dependencyChanged/service/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.plugins.compiler.it</groupId>
+    <artifactId>mcompiler349-test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>service</artifactId>
+
+</project>
+
+