diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 60c3ce50..53153e21 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,7 +27,7 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 with: # maven-args: "-Dinvoker.parallelThreads=2" cannot do this as this generate some concurrent download issues - ff-maven: "4.0.0-beta-3" # Maven version for fail-fast-build + ff-maven: "4.0.0-beta-5" # Maven version for fail-fast-build jdk-distribution-matrix: '[ "temurin", "zulu", "microsoft", "adopt-openj9" ]' jdk-matrix: '[ "17", "21" ]' - maven-matrix: '[ "4.0.0-beta-3" ]' # Maven versions matrix for verify builds + maven-matrix: '[ "4.0.0-beta-5" ]' # Maven versions matrix for verify builds diff --git a/pom.xml b/pom.xml index 707b5305..9f1b7706 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 42 + 43 @@ -39,6 +39,20 @@ under the License. Jan Sievers + + Trygve Laugstøl + trygvis@inamo.no + + + Jason van Zyl + jason@maven.org + + + Andreas Gudian + + + Martin Desruisseaux + @@ -68,7 +82,7 @@ under the License. 17 - 4.0.0-beta-3 + 4.0.0-beta-5 9.7 2.4.21 @@ -78,33 +92,21 @@ under the License. 4.13.2 5.10.1 5.12.0 - 4.0.0-beta-2-SNAPSHOT + 4.0.0-beta-2 2.15.0 1.2.0 0.9.0.M2 - 2.0.13 3.2.1 3.7.0 3.13.1 - 4.0.0-beta-2-SNAPSHOT - 4.0.1 + 4.0.0-beta-1 org.apache.maven.plugins.compiler.its false - 2024-06-26T08:45:58Z + 2024-11-14T13:00:00Z - - - - com.google.guava - guava - 32.0.1-jre - - - - @@ -113,88 +115,11 @@ under the License. ${mavenVersion} provided - - org.apache.maven - maven-api-di - ${mavenVersion} - provided - - - org.apache.maven - maven-api-meta - ${mavenVersion} - provided - - - org.apache.maven - maven-api-model - ${mavenVersion} - provided - - - org.apache.maven - maven-api-xml - ${mavenVersion} - provided - - - org.codehaus.plexus - plexus-utils - - - org.eclipse.sisu - org.eclipse.sisu.plexus - ${sisuPlexusVersion} - - - org.codehaus.plexus - plexus-java - ${plexusJavaVersion} - org.ow2.asm asm ${asmVersion} - - org.slf4j - slf4j-api - ${slf4jVersion} - - - - org.codehaus.plexus - plexus-compiler-api - ${plexusCompilerVersion} - - - org.codehaus.plexus - plexus-component-api - - - - - org.codehaus.plexus - plexus-compiler-manager - ${plexusCompilerVersion} - - - org.codehaus.plexus - plexus-component-api - - - - - org.codehaus.plexus - plexus-compiler-javac - ${plexusCompilerVersion} - - - org.codehaus.plexus - plexus-component-api - - - org.apache.maven @@ -237,17 +162,18 @@ under the License. junit-jupiter-api test - - org.slf4j - slf4j-simple - ${slf4jVersion} - test - + + org.apache.maven.plugins + maven-compiler-plugin + + ${javaVersion} + + com.diffplug.spotless spotless-maven-plugin diff --git a/src/it/MCOMPILER-129/invoker.properties b/src/it/MCOMPILER-129/invoker.properties index 8314fcbb..df01a38b 100644 --- a/src/it/MCOMPILER-129/invoker.properties +++ b/src/it/MCOMPILER-129/invoker.properties @@ -1,18 +1,18 @@ -# 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. - -invoker.goals = clean compile \ No newline at end of file +# 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. + +invoker.goals = clean compile diff --git a/src/it/MCOMPILER-129/pom.xml b/src/it/MCOMPILER-129/pom.xml index 5349a289..1868847f 100644 --- a/src/it/MCOMPILER-129/pom.xml +++ b/src/it/MCOMPILER-129/pom.xml @@ -33,11 +33,6 @@ under the License. @project.version@ true - -J-Duser.language=en_us diff --git a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java index b95f3e22..1f0c739f 100644 --- a/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java +++ b/src/it/MCOMPILER-157/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java @@ -36,23 +36,19 @@ import java.io.Writer; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) @SupportedAnnotationTypes("org.issue.SimpleAnnotation") public class SimpleAnnotationProcessor extends AbstractProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { Filer filer = processingEnv.getFiler(); - Elements elementUtils = processingEnv.getElementUtils(); - Set elements = roundEnv.getElementsAnnotatedWith(SimpleAnnotation.class); for (Element element : elements) { Name name = element.getSimpleName(); - PackageElement packageElement = elementUtils.getPackageOf(element); - try { FileObject resource = filer.createResource( StandardLocation.SOURCE_OUTPUT, packageElement.getQualifiedName(), name + ".txt", element); @@ -64,7 +60,6 @@ public boolean process(Set annotations, RoundEnvironment throw new RuntimeException(e); } } - return !elements.isEmpty(); } } diff --git a/src/it/MCOMPILER-157/invoker.properties b/src/it/MCOMPILER-157/invoker.properties index 3533442e..a0a3964f 100644 --- a/src/it/MCOMPILER-157/invoker.properties +++ b/src/it/MCOMPILER-157/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-170/invoker.properties b/src/it/MCOMPILER-170/invoker.properties index 868a2586..f2ad4f46 100644 --- a/src/it/MCOMPILER-170/invoker.properties +++ b/src/it/MCOMPILER-170/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-190/invoker.properties b/src/it/MCOMPILER-190/invoker.properties index 98a8e954..965cfab6 100644 --- a/src/it/MCOMPILER-190/invoker.properties +++ b/src/it/MCOMPILER-190/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-190/pom.xml b/src/it/MCOMPILER-190/pom.xml index 5d82f612..33598bff 100644 --- a/src/it/MCOMPILER-190/pom.xml +++ b/src/it/MCOMPILER-190/pom.xml @@ -34,8 +34,6 @@ under the License. @pom.version@ eclipse - 1.5 - 1.5 diff --git a/src/it/MCOMPILER-192/invoker.properties b/src/it/MCOMPILER-192/invoker.properties index 3717c056..c50a1b31 100644 --- a/src/it/MCOMPILER-192/invoker.properties +++ b/src/it/MCOMPILER-192/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-192/verify.groovy b/src/it/MCOMPILER-192/verify.groovy index e7f065a4..a705918a 100644 --- a/src/it/MCOMPILER-192/verify.groovy +++ b/src/it/MCOMPILER-192/verify.groovy @@ -1,44 +1,37 @@ -/* - * 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. - */ -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() - -def content = logFile.getText('UTF-8') - -def causedByExpected = content.contains ( 'Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure' ) -def twoFilesBeingCompiled = content.contains ( '[INFO] Compiling 2 source files ' ) -def checkResult = content.contains ( '[INFO] BUILD FAILURE' ) -def compilationFailure1 = content.contains( '[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:') - -// This is the message on JDK 7 / Windows -// [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.7.1-SNAPSHOT:compile (default-compile) on project blah: Compilation failure -// This is the message on JKD 8 / Linux -// [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.7.1-SNAPSHOT:compile (default-compile) on project blah: Compilation failure -> [Help 1] - -def compilationFailure2 = content.contains( ':compile (default-compile) on project blah: Compilation failure') - -println "Jenkins: causedByExpected:${causedByExpected} twoFilesBeingCompiled:${twoFilesBeingCompiled} checkResult: ${checkResult} compilationFailure1: ${compilationFailure1} compilationFailure2: ${compilationFailure2}" - -// We need to combine different identification to handle differences between OS's and JDK's. -def finalResult = twoFilesBeingCompiled && checkResult && causedByExpected && compilationFailure1 && compilationFailure2 - -if ( !finalResult ) { - throw new RuntimeException( "log does not contain expected result to be failed but " + content + "") -} - +/* + * 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. + */ +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() + +def content = logFile.getText('UTF-8') + +def causedByExpected = content.contains ( 'Caused by: org.apache.maven.plugin.compiler.CompilationFailureException:' ) +def twoFilesBeingCompiled = content.contains ( 'Compiling 2 source files' ) +def checkResult = content.contains ( 'BUILD FAILURE' ) +def compilationFailure1 = content.contains( '[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:') +def compilationFailure2 = content.contains( ':compile (default-compile) on project blah: Cannot compile') + +println "Jenkins: causedByExpected:${causedByExpected} twoFilesBeingCompiled:${twoFilesBeingCompiled} checkResult: ${checkResult} compilationFailure1: ${compilationFailure1} compilationFailure2: ${compilationFailure2}" + +// We need to combine different identification to handle differences between OS's and JDK's. +def finalResult = twoFilesBeingCompiled && checkResult && causedByExpected && compilationFailure1 && compilationFailure2 + +if ( !finalResult ) { + throw new RuntimeException( "log does not contain expected result to be failed but " + content + "") +} diff --git a/src/it/MCOMPILER-197/pom.xml b/src/it/MCOMPILER-197/pom.xml deleted file mode 100644 index 2d534348..00000000 --- a/src/it/MCOMPILER-197/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - 4.0.0 - - org.issue - compiler-test - 1.0-SNAPSHOT - - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - @project.version@ - - - org.apache.openjpa - openjpa - 2.4.2 - - - - - generate-entity-metamodel - - compile - - generate-sources - - 1.6 - 1.6 - ${project.build.directory}/generated-sources - - true - - true - - - - - compile - - compile - - compile - - 1.6 - 1.6 - - - - - - - diff --git a/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java b/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java deleted file mode 100644 index d80a49b9..00000000 --- a/src/it/MCOMPILER-197/src/main/java/org/issue/Person.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - */ -package org.issue; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class Person { - @Id - @GeneratedValue - private long id; - - private String name; - - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/src/it/MCOMPILER-197/src/main/resources/META-INF/persistence.xml b/src/it/MCOMPILER-197/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 4e3d97c5..00000000 --- a/src/it/MCOMPILER-197/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - jdbc/ds - jdbc/ds-non-jta - org.issue.Person - true - - - - - diff --git a/src/it/MCOMPILER-197/verify.groovy b/src/it/MCOMPILER-197/verify.groovy deleted file mode 100644 index 237c80ff..00000000 --- a/src/it/MCOMPILER-197/verify.groovy +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -def sourceFile = new File( basedir, 'target/generated-sources/org/issue/Person_.java') -assert sourceFile.exists() - diff --git a/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java index b2dfd6ca..f8b7c46f 100644 --- a/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java +++ b/src/it/MCOMPILER-203-processorpath/annotation-processor/src/main/java/org/issue/SimpleAnnotationProcessor.java @@ -37,7 +37,7 @@ import java.io.Writer; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) @SupportedAnnotationTypes("org.issue.SimpleAnnotation") public class SimpleAnnotationProcessor extends AbstractProcessor { @@ -65,17 +65,13 @@ public boolean process(Set annotations, RoundEnvironment } Filer filer = processingEnv.getFiler(); - Elements elementUtils = processingEnv.getElementUtils(); - Set elements = roundEnv.getElementsAnnotatedWith(annotations.iterator().next()); for (Element element : elements) { Name name = element.getSimpleName(); - PackageElement packageElement = elementUtils.getPackageOf(element); - try { Name packageName = packageElement.getQualifiedName(); FileObject resource = @@ -99,7 +95,6 @@ public boolean process(Set annotations, RoundEnvironment throw new RuntimeException(e); } } - return !elements.isEmpty(); } } diff --git a/src/it/MCOMPILER-203-processorpath/invoker.properties b/src/it/MCOMPILER-203-processorpath/invoker.properties index 3a024336..8176ad48 100644 --- a/src/it/MCOMPILER-203-processorpath/invoker.properties +++ b/src/it/MCOMPILER-203-processorpath/invoker.properties @@ -1,19 +1,19 @@ -# 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. - -invoker.goals=process-test-classes -invoker.goals.2=process-test-classes +# 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. + +invoker.goals=process-test-classes +invoker.goals.2=process-test-classes diff --git a/src/it/MCOMPILER-205/invoker.properties b/src/it/MCOMPILER-205/invoker.properties index 8595721d..d8beb8a8 100644 --- a/src/it/MCOMPILER-205/invoker.properties +++ b/src/it/MCOMPILER-205/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-205/pom.xml b/src/it/MCOMPILER-205/pom.xml index b37eeeca..a0cb34c6 100644 --- a/src/it/MCOMPILER-205/pom.xml +++ b/src/it/MCOMPILER-205/pom.xml @@ -35,6 +35,9 @@ under the License. org.apache.maven.plugins maven-compiler-plugin @pom.version@ + + true + diff --git a/src/it/MCOMPILER-205/verify.groovy b/src/it/MCOMPILER-205/verify.groovy index 1041376b..fdf6f4fb 100644 --- a/src/it/MCOMPILER-205/verify.groovy +++ b/src/it/MCOMPILER-205/verify.groovy @@ -1,20 +1,20 @@ -/* - * 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. - */ -def packageInfoClassFile = new File( basedir, 'target/classes/dummy/package-info.class' ) -assert packageInfoClassFile.exists() +/* + * 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. + */ +def packageInfoClassFile = new File( basedir, 'target/classes/dummy/package-info.class' ) +assert packageInfoClassFile.exists() diff --git a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java index c7ded6bc..bc6afef9 100644 --- a/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java +++ b/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java @@ -32,26 +32,20 @@ /* @formatter:off */ @SupportedAnnotationTypes({"org.issue.MCompiler224"}) /* @formatter:on */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) public class MCompiler224AnnotationProcessor extends AbstractProcessor { @Override public boolean process(final Set elts, final RoundEnvironment env) { - if (elts.isEmpty()) { - return true; - } - - final Messager messager = this.processingEnv.getMessager(); - - for (final Kind kind : Kind.values()) { - if (Kind.ERROR == kind) { - continue; + if (!elts.isEmpty()) { + final Messager messager = processingEnv.getMessager(); + for (final Kind kind : Kind.values()) { + if (Kind.ERROR != kind) { + System.out.println("Testing message for: " + kind); + messager.printMessage(kind, kind + " Test message."); + } } - - System.out.println("Testing message for: " + kind); - messager.printMessage(kind, kind + " Test message."); } - return true; } } diff --git a/src/it/MCOMPILER-224/verify.groovy b/src/it/MCOMPILER-224/verify.groovy index 98cbd47d..8b573305 100644 --- a/src/it/MCOMPILER-224/verify.groovy +++ b/src/it/MCOMPILER-224/verify.groovy @@ -48,4 +48,3 @@ if ( !mandatoryWarningExists ){ if ( fail ){ throw new RuntimeException( messages ) } - diff --git a/src/it/MCOMPILER-228/invoker.properties b/src/it/MCOMPILER-228/invoker.properties deleted file mode 100644 index a813da9f..00000000 --- a/src/it/MCOMPILER-228/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -# https://bugs.openjdk.java.net/browse/JDK-8051958 -invoker.java.version = 1.8.0_40+ \ No newline at end of file diff --git a/src/it/MCOMPILER-228/pom.xml b/src/it/MCOMPILER-228/pom.xml index d5b7fb5f..09259208 100644 --- a/src/it/MCOMPILER-228/pom.xml +++ b/src/it/MCOMPILER-228/pom.xml @@ -32,10 +32,6 @@ under the License. org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 1.8 - 1.8 - diff --git a/src/it/MCOMPILER-268_modulepath/invoker.properties b/src/it/MCOMPILER-268_modulepath/invoker.properties deleted file mode 100644 index b70e6b33..00000000 --- a/src/it/MCOMPILER-268_modulepath/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -invoker.java.version = 1.9+ diff --git a/src/it/MCOMPILER-268_modulepath/pom.xml b/src/it/MCOMPILER-268_modulepath/pom.xml index 0d47c788..07371fb6 100644 --- a/src/it/MCOMPILER-268_modulepath/pom.xml +++ b/src/it/MCOMPILER-268_modulepath/pom.xml @@ -24,8 +24,6 @@ mcompiler270 1.0-SNAPSHOT - https://issues.apache.org/jira/browse/MCOMPILER-270 - UTF-8 @@ -50,10 +48,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 9 - 9 - diff --git a/src/it/MCOMPILER-268_modulepath/verify.groovy b/src/it/MCOMPILER-268_modulepath/verify.groovy index 59837128..4f152a04 100644 --- a/src/it/MCOMPILER-268_modulepath/verify.groovy +++ b/src/it/MCOMPILER-268_modulepath/verify.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -def log = new File( basedir, 'build.log').text - -assert log.count( " --module-path" ) == 2 +def cmd = new File(basedir, 'target/javac.args').text +assert cmd.count("--module-path") == 1 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 diff --git a/src/it/MCOMPILER-270_release/invoker.properties b/src/it/MCOMPILER-270_release/invoker.properties deleted file mode 100644 index b70e6b33..00000000 --- a/src/it/MCOMPILER-270_release/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -invoker.java.version = 1.9+ diff --git a/src/it/MCOMPILER-270_release/pom.xml b/src/it/MCOMPILER-270_release/pom.xml index 552b3c1f..0067c894 100644 --- a/src/it/MCOMPILER-270_release/pom.xml +++ b/src/it/MCOMPILER-270_release/pom.xml @@ -45,6 +45,9 @@ maven-compiler-plugin @project.version@ + + + ${java.specification.version} diff --git a/src/it/MCOMPILER-270_release/verify.groovy b/src/it/MCOMPILER-270_release/verify.groovy index 8db63f20..9900fd70 100644 --- a/src/it/MCOMPILER-270_release/verify.groovy +++ b/src/it/MCOMPILER-270_release/verify.groovy @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -def log = new File( basedir, 'build.log').text - -assert log.count( " --release" ) == 2 - -assert !( log =~ /\s-source\s/ ) -assert !( log =~ /\s-target\s/ ) +def cmd = new File(basedir, 'target/javac.args').text +assert cmd.count("--release") == 1 +assert !( cmd =~ /\s-source\s/ ) +assert !( cmd =~ /\s-target\s/ ) diff --git a/src/it/MCOMPILER-272/invoker.properties b/src/it/MCOMPILER-272/invoker.properties index 0659ac55..5f7653da 100644 --- a/src/it/MCOMPILER-272/invoker.properties +++ b/src/it/MCOMPILER-272/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-272/pom.xml b/src/it/MCOMPILER-272/pom.xml index c36888be..67b3547a 100644 --- a/src/it/MCOMPILER-272/pom.xml +++ b/src/it/MCOMPILER-272/pom.xml @@ -42,10 +42,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 8 - 8 - diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties index 028c62b2..ddb00e60 100644 --- a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties +++ b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.8+ invoker.toolchain.jdk.version=1.9 diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml index 509efb22..0b30d9ec 100644 --- a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml +++ b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml @@ -53,7 +53,10 @@ 1.9 - 9 + + + + 17 diff --git a/src/it/MCOMPILER-294/invoker.properties b/src/it/MCOMPILER-294/invoker.properties index 8d769866..f93557a0 100644 --- a/src/it/MCOMPILER-294/invoker.properties +++ b/src/it/MCOMPILER-294/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-294/pom.xml b/src/it/MCOMPILER-294/pom.xml index 5049cedb..7118ccaa 100644 --- a/src/it/MCOMPILER-294/pom.xml +++ b/src/it/MCOMPILER-294/pom.xml @@ -43,7 +43,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/MCOMPILER-298/invoker.properties b/src/it/MCOMPILER-298/invoker.properties index b1a04637..e08297d6 100644 --- a/src/it/MCOMPILER-298/invoker.properties +++ b/src/it/MCOMPILER-298/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-298/pom.xml b/src/it/MCOMPILER-298/pom.xml index 6ae3320f..319e5507 100644 --- a/src/it/MCOMPILER-298/pom.xml +++ b/src/it/MCOMPILER-298/pom.xml @@ -46,8 +46,6 @@ maven-compiler-plugin @project.version@ - 1.8 - 1.8 true diff --git a/src/it/MCOMPILER-321_pathexceptions/invoker.properties b/src/it/MCOMPILER-321_pathexceptions/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/MCOMPILER-321_pathexceptions/invoker.properties +++ b/src/it/MCOMPILER-321_pathexceptions/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-321_pathexceptions/pom.xml b/src/it/MCOMPILER-321_pathexceptions/pom.xml index a12fb3af..d4e53ab0 100644 --- a/src/it/MCOMPILER-321_pathexceptions/pom.xml +++ b/src/it/MCOMPILER-321_pathexceptions/pom.xml @@ -50,7 +50,22 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 + + + --add-reads + M.N=ALL-UNNAMED + diff --git a/src/it/MCOMPILER-321_pathexceptions/src/invoker.properties b/src/it/MCOMPILER-321_pathexceptions/src/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/MCOMPILER-321_pathexceptions/src/invoker.properties +++ b/src/it/MCOMPILER-321_pathexceptions/src/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java b/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java index c42edd69..4e4cb5d3 100644 --- a/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java +++ b/src/it/MCOMPILER-321_pathexceptions/src/test/java/test/MyTest.java @@ -18,4 +18,10 @@ */ package test; -public class MyTest {} +import org.jdom.CDATA; + +public class MyTest { + public static void main(String[] args) { + CDATA.class.getName(); + } +} diff --git a/src/it/MCOMPILER-321_pathexceptions/verify.groovy b/src/it/MCOMPILER-321_pathexceptions/verify.groovy index 685fbd84..1ef8142e 100644 --- a/src/it/MCOMPILER-321_pathexceptions/verify.groovy +++ b/src/it/MCOMPILER-321_pathexceptions/verify.groovy @@ -16,9 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -def log = new File( basedir, 'build.log').text -assert 2 == log.count( "[WARNING] Can't extract module name from geronimo-servlet_2.4_spec-1.1.1.jar: " - /* Invalid module name: '2' is not a Java identifier */ ) -assert 2 == log.count( "[WARNING] Can't extract module name from jdom-1.0.jar: " - /* JDOMAbout$Author.class found in top-level directory (unnamed package not allowed in module) */ ) +/* + * A previous version of this test was looking for the following warnings in the logs: + * + * - Can't extract module name from geronimo-servlet_2.4_spec-1.1.1.jar + * (because of invalid module name: '2' is not a Java identifier) + * + * - Can't extract module name from jdom-1.0.jar + * (because of JDOMAbout.class found in top-level directory while unnamed package not allowed in module) + * + * Those warnings do not happen anymore, even if above JARs are still invalid. However, it is nevertheless + * possible to build the project with the dependency on the classpath and an `--add-reads` option. + * We verify by ensuring that the test file, which use JDOM, has been compiled. + */ +def targetFile = new File( basedir, 'target/test-classes/test/MyTest.class') +assert targetFile.exists() diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/invoker.properties b/src/it/MCOMPILER-328_multiReleaseOutput/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/MCOMPILER-328_multiReleaseOutput/invoker.properties +++ b/src/it/MCOMPILER-328_multiReleaseOutput/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/pom.xml b/src/it/MCOMPILER-328_multiReleaseOutput/pom.xml index 0136d889..ee899c03 100644 --- a/src/it/MCOMPILER-328_multiReleaseOutput/pom.xml +++ b/src/it/MCOMPILER-328_multiReleaseOutput/pom.xml @@ -35,7 +35,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 true diff --git a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy index f3423da7..0c8323f0 100644 --- a/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy +++ b/src/it/MCOMPILER-328_multiReleaseOutput/verify.groovy @@ -18,5 +18,4 @@ */ assert !new File( basedir, 'target/classes/foo/MyClass.class').exists() - -assert new File( basedir, 'target/classes/META-INF/versions/9/foo/MyClass.class').exists() \ No newline at end of file +assert new File( basedir, 'target/classes/META-INF/versions/17/foo/MyClass.class').exists() diff --git a/src/it/MCOMPILER-336_incremental-modulepath/invoker.properties b/src/it/MCOMPILER-336_incremental-modulepath/invoker.properties index 98fca415..b5e8151d 100644 --- a/src/it/MCOMPILER-336_incremental-modulepath/invoker.properties +++ b/src/it/MCOMPILER-336_incremental-modulepath/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-336_incremental-modulepath/pom.xml b/src/it/MCOMPILER-336_incremental-modulepath/pom.xml index 4cdfaccb..13018ed5 100644 --- a/src/it/MCOMPILER-336_incremental-modulepath/pom.xml +++ b/src/it/MCOMPILER-336_incremental-modulepath/pom.xml @@ -37,7 +37,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 false diff --git a/src/it/MCOMPILER-346/invoker.properties b/src/it/MCOMPILER-346/invoker.properties index 727ec07c..588c127c 100644 --- a/src/it/MCOMPILER-346/invoker.properties +++ b/src/it/MCOMPILER-346/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-346/pom.xml b/src/it/MCOMPILER-346/pom.xml index 883bbafa..521940ab 100644 --- a/src/it/MCOMPILER-346/pom.xml +++ b/src/it/MCOMPILER-346/pom.xml @@ -53,7 +53,10 @@ maven-compiler-plugin @project.version@ - 11 + + + + 17 diff --git a/src/it/MCOMPILER-346/verify.groovy b/src/it/MCOMPILER-346/verify.groovy index 837bdd79..736d01da 100644 --- a/src/it/MCOMPILER-346/verify.groovy +++ b/src/it/MCOMPILER-346/verify.groovy @@ -17,9 +17,12 @@ * under the License. */ +/* + * Temporarily disabled, pending fix in Maven 4.0.0-beta-6. def logFile = new File( basedir, 'build.log' ) assert logFile.exists() content = logFile.text assert content.contains( 'package org.jenkinsci.test.acceptance.controller does not exist' ) assert content.contains( 'package org.jenkinsci.test.acceptance.log does not exist' ) +*/ diff --git a/src/it/MCOMPILER-349_dependencyChanged/invoker.properties b/src/it/MCOMPILER-349_dependencyChanged/invoker.properties index 572447af..edc45a08 100644 --- a/src/it/MCOMPILER-349_dependencyChanged/invoker.properties +++ b/src/it/MCOMPILER-349_dependencyChanged/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-349_dependencyChanged/pom.xml b/src/it/MCOMPILER-349_dependencyChanged/pom.xml index 694d84a5..d9cc7580 100644 --- a/src/it/MCOMPILER-349_dependencyChanged/pom.xml +++ b/src/it/MCOMPILER-349_dependencyChanged/pom.xml @@ -25,11 +25,10 @@ 1.0-SNAPSHOT pom - 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()). + IT test to verify that dependent-module is recompiled when + `mvn compile` is executed without `mvn clean` while a module dependency has changed. + The compilation should fail as dependent-module uses a method that no longer exists + (run() method of TestService renamed to newMethodName()). dependent-module diff --git a/src/it/MCOMPILER-349_dependencyChanged/verify.groovy b/src/it/MCOMPILER-349_dependencyChanged/verify.groovy index f09d28da..fad12ccb 100644 --- a/src/it/MCOMPILER-349_dependencyChanged/verify.groovy +++ b/src/it/MCOMPILER-349_dependencyChanged/verify.groovy @@ -20,6 +20,5 @@ def logFile = new File( basedir, 'build.log' ) assert logFile.exists() content = logFile.text -assert content.contains( 'COMPILATION ERROR :' ) - - +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. diff --git a/src/it/MCOMPILER-360/invoker.properties b/src/it/MCOMPILER-360/invoker.properties index 8d769866..f93557a0 100644 --- a/src/it/MCOMPILER-360/invoker.properties +++ b/src/it/MCOMPILER-360/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-360/pom.xml b/src/it/MCOMPILER-360/pom.xml index 2613124a..35e8e51f 100644 --- a/src/it/MCOMPILER-360/pom.xml +++ b/src/it/MCOMPILER-360/pom.xml @@ -43,7 +43,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/MCOMPILER-366/invoker.properties b/src/it/MCOMPILER-366/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/MCOMPILER-366/invoker.properties +++ b/src/it/MCOMPILER-366/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-366/pom.xml b/src/it/MCOMPILER-366/pom.xml index 5da51e9d..38aa9099 100644 --- a/src/it/MCOMPILER-366/pom.xml +++ b/src/it/MCOMPILER-366/pom.xml @@ -33,11 +33,15 @@ org.codehaus.plexus plexus-utils 3.0.24 + modular-jar + org.codehaus.plexus plexus-resources 1.1.0 + modular-jar + @@ -49,7 +53,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/MCOMPILER-366/verify.groovy b/src/it/MCOMPILER-366/verify.groovy index 19e525d3..a9afc615 100644 --- a/src/it/MCOMPILER-366/verify.groovy +++ b/src/it/MCOMPILER-366/verify.groovy @@ -6,9 +6,9 @@ * 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 @@ -19,4 +19,6 @@ buildLog = new File( basedir, 'build.log' ).text; -assert buildLog.contains("[WARNING] * Required filename-based automodules detected: [plexus-utils-3.0.24.jar, plexus-resources-1.1.0.jar]. Please don't publish this project to a public artifact repository! *"); +assert buildLog.contains("[WARNING] Filename-based automodules detected on the module-path:") +assert buildLog.contains(" - plexus-utils-3.0.24.jar") +assert buildLog.contains(" - plexus-resources-1.1.0.jar") diff --git a/src/it/MCOMPILER-373_mrjar/invoker.properties b/src/it/MCOMPILER-373_mrjar/invoker.properties index 1c24cc31..4b264128 100644 --- a/src/it/MCOMPILER-373_mrjar/invoker.properties +++ b/src/it/MCOMPILER-373_mrjar/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-373_mrjar/pom.xml b/src/it/MCOMPILER-373_mrjar/pom.xml index 0be702b1..ccf9d3b6 100644 --- a/src/it/MCOMPILER-373_mrjar/pom.xml +++ b/src/it/MCOMPILER-373_mrjar/pom.xml @@ -31,12 +31,14 @@ under the License. maven-compiler-plugin @project.version@ - 8 - 8 + + + + 15 - + java9 @@ -44,14 +46,14 @@ under the License. compile - 9 + 16 ${project.basedir}/src/main/java9 true - + java11 @@ -59,7 +61,7 @@ under the License. compile - 11 + 17 ${project.basedir}/src/main/java11 diff --git a/src/it/MCOMPILER-379/invoker.properties b/src/it/MCOMPILER-379/invoker.properties index 0659ac55..5f7653da 100644 --- a/src/it/MCOMPILER-379/invoker.properties +++ b/src/it/MCOMPILER-379/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-379/pom.xml b/src/it/MCOMPILER-379/pom.xml index 5bbb88e9..3ca21ffd 100644 --- a/src/it/MCOMPILER-379/pom.xml +++ b/src/it/MCOMPILER-379/pom.xml @@ -40,10 +40,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 8 - 8 - diff --git a/src/it/MCOMPILER-391-processorpath-dep-mgmt/annotation-processor/src/main/java/mcompiler391/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-391-processorpath-dep-mgmt/annotation-processor/src/main/java/mcompiler391/SimpleAnnotationProcessor.java index 9ff0f704..173b8018 100644 --- a/src/it/MCOMPILER-391-processorpath-dep-mgmt/annotation-processor/src/main/java/mcompiler391/SimpleAnnotationProcessor.java +++ b/src/it/MCOMPILER-391-processorpath-dep-mgmt/annotation-processor/src/main/java/mcompiler391/SimpleAnnotationProcessor.java @@ -36,7 +36,7 @@ import java.io.Writer; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) @SupportedAnnotationTypes("mcompiler391.SimpleAnnotation") public class SimpleAnnotationProcessor extends AbstractProcessor { @@ -47,9 +47,7 @@ public boolean process(Set annotations, RoundEnvironment } Filer filer = processingEnv.getFiler(); - Elements elementUtils = processingEnv.getElementUtils(); - Set elements = roundEnv.getElementsAnnotatedWith(annotations.iterator().next()); diff --git a/src/it/MCOMPILER-395-processorpath-exclude-deps/annotation-processor/src/main/java/mcompiler395/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-395-processorpath-exclude-deps/annotation-processor/src/main/java/mcompiler395/SimpleAnnotationProcessor.java index 9ee6229e..ffd1f56f 100644 --- a/src/it/MCOMPILER-395-processorpath-exclude-deps/annotation-processor/src/main/java/mcompiler395/SimpleAnnotationProcessor.java +++ b/src/it/MCOMPILER-395-processorpath-exclude-deps/annotation-processor/src/main/java/mcompiler395/SimpleAnnotationProcessor.java @@ -36,7 +36,7 @@ import java.io.Writer; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) @SupportedAnnotationTypes("mcompiler395.SimpleAnnotation") public class SimpleAnnotationProcessor extends AbstractProcessor { @@ -57,17 +57,13 @@ public boolean process(Set annotations, RoundEnvironment } Filer filer = processingEnv.getFiler(); - Elements elementUtils = processingEnv.getElementUtils(); - Set elements = roundEnv.getElementsAnnotatedWith(annotations.iterator().next()); for (Element element : elements) { Name name = element.getSimpleName(); - PackageElement packageElement = elementUtils.getPackageOf(element); - try { Name packageName = packageElement.getQualifiedName(); FileObject resource = diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/invoker.properties b/src/it/MCOMPILER-474_recompile-dependent-when-package/invoker.properties index f0faec3e..23b3b239 100644 --- a/src/it/MCOMPILER-474_recompile-dependent-when-package/invoker.properties +++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy b/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy index e32f7a63..fad12ccb 100644 --- a/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy +++ b/src/it/MCOMPILER-474_recompile-dependent-when-package/verify.groovy @@ -20,4 +20,5 @@ def logFile = new File( basedir, 'build.log' ) assert logFile.exists() content = logFile.text -assert content.contains( 'COMPILATION ERROR :' ) +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. diff --git a/src/it/MCOMPILER-481-requires-static-included/invoker.properties b/src/it/MCOMPILER-481-requires-static-included/invoker.properties index 7782ffbf..7ab2b439 100644 --- a/src/it/MCOMPILER-481-requires-static-included/invoker.properties +++ b/src/it/MCOMPILER-481-requires-static-included/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -invoker.goals = clean install +invoker.goals = clean install invoker.java.version = 11+ diff --git a/src/it/MCOMPILER-481-requires-static-included/pom.xml b/src/it/MCOMPILER-481-requires-static-included/pom.xml index a4c9ef7b..a635f28a 100644 --- a/src/it/MCOMPILER-481-requires-static-included/pom.xml +++ b/src/it/MCOMPILER-481-requires-static-included/pom.xml @@ -41,9 +41,11 @@ under the License. maven-compiler-plugin @project.version@ - 11 - 11 + + + 11 + diff --git a/src/it/MCOMPILER-485/invoker.properties b/src/it/MCOMPILER-485/invoker.properties index 8595721d..d8beb8a8 100644 --- a/src/it/MCOMPILER-485/invoker.properties +++ b/src/it/MCOMPILER-485/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-485/pom.xml b/src/it/MCOMPILER-485/pom.xml index b37eeeca..a0cb34c6 100644 --- a/src/it/MCOMPILER-485/pom.xml +++ b/src/it/MCOMPILER-485/pom.xml @@ -35,6 +35,9 @@ under the License. org.apache.maven.plugins maven-compiler-plugin @pom.version@ + + true + diff --git a/src/it/MCOMPILER-495/invoker.properties b/src/it/MCOMPILER-495/invoker.properties index 8595721d..d8beb8a8 100644 --- a/src/it/MCOMPILER-495/invoker.properties +++ b/src/it/MCOMPILER-495/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-495/pom.xml b/src/it/MCOMPILER-495/pom.xml index b37eeeca..a0cb34c6 100644 --- a/src/it/MCOMPILER-495/pom.xml +++ b/src/it/MCOMPILER-495/pom.xml @@ -35,6 +35,9 @@ under the License. org.apache.maven.plugins maven-compiler-plugin @pom.version@ + + true + diff --git a/src/it/MCOMPILER-500-package-info-incr/invoker.properties b/src/it/MCOMPILER-500-package-info-incr/invoker.properties index 367af02d..d8566c82 100644 --- a/src/it/MCOMPILER-500-package-info-incr/invoker.properties +++ b/src/it/MCOMPILER-500-package-info-incr/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -18,4 +18,4 @@ invoker.goals = clean compile invoker.buildResult = success invoker.goals.2 = compile -invoker.buildResult.2 = success \ No newline at end of file +invoker.buildResult.2 = success diff --git a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java index 74c44a4b..cc39dff5 100644 --- a/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java +++ b/src/it/MCOMPILER-503-processorpath-duplicated-deps/annotation-processor/src/main/java/mcompiler503/SimpleAnnotationProcessor.java @@ -37,7 +37,7 @@ import java.io.Writer; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) @SupportedAnnotationTypes("mcompiler503.SimpleAnnotation") public class SimpleAnnotationProcessor extends AbstractProcessor { @@ -68,17 +68,13 @@ public boolean process(Set annotations, RoundEnvironment } Filer filer = processingEnv.getFiler(); - Elements elementUtils = processingEnv.getElementUtils(); - Set elements = roundEnv.getElementsAnnotatedWith(annotations.iterator().next()); for (Element element : elements) { Name name = element.getSimpleName(); - PackageElement packageElement = elementUtils.getPackageOf(element); - try { Name packageName = packageElement.getQualifiedName(); FileObject resource = @@ -102,7 +98,6 @@ public boolean process(Set annotations, RoundEnvironment throw new RuntimeException(e); } } - return !elements.isEmpty(); } } diff --git a/src/it/MCOMPILER-512/invoker.properties b/src/it/MCOMPILER-512/invoker.properties index 9bcebc20..c2fbfcb0 100644 --- a/src/it/MCOMPILER-512/invoker.properties +++ b/src/it/MCOMPILER-512/invoker.properties @@ -17,4 +17,4 @@ invoker.goals = clean test invoker.buildResult = success -invoker.java.version = 9+ \ No newline at end of file +invoker.java.version = 9+ diff --git a/src/it/MCOMPILER-522-unresolvable-dependency/verify.groovy b/src/it/MCOMPILER-522-unresolvable-dependency/verify.groovy index 4b7f1334..2676a814 100644 --- a/src/it/MCOMPILER-522-unresolvable-dependency/verify.groovy +++ b/src/it/MCOMPILER-522-unresolvable-dependency/verify.groovy @@ -21,7 +21,6 @@ def logFile = new File( basedir, 'build.log' ) assert logFile.exists() def buildLog = logFile.getText('UTF-8') -assert buildLog.contains( "Caused by: org.apache.maven.api.plugin.MojoException: " + - "Resolution of annotationProcessorPath dependencies failed: " ) +assert buildLog.contains( "Resolution of annotationProcessorPath dependencies failed: " ) assert buildLog.contains( "The POM for org.apache.maven.plugins.compiler.it:annotation-processor-non-existing:jar:1.0-SNAPSHOT is missing, no dependency information available" ) diff --git a/src/it/MCOMPILER-542/invoker.properties b/src/it/MCOMPILER-542/invoker.properties index 1c24cc31..4b264128 100644 --- a/src/it/MCOMPILER-542/invoker.properties +++ b/src/it/MCOMPILER-542/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/MCOMPILER-542/pom.xml b/src/it/MCOMPILER-542/pom.xml index 303a92dd..c8150589 100644 --- a/src/it/MCOMPILER-542/pom.xml +++ b/src/it/MCOMPILER-542/pom.xml @@ -59,6 +59,9 @@ compile + + + ${java.specification.version} @@ -68,7 +71,10 @@ compile - 9 + + + + 17 ${project.build.outputDirectory}-9 @@ -78,8 +84,10 @@ compile - ${java.specification.version} - ${java.specification.version} + + + + ${java.specification.version} ${project.build.outputDirectory}-target diff --git a/src/it/MCOMPILER-542/verify.groovy b/src/it/MCOMPILER-542/verify.groovy index b51acea4..44cef447 100644 --- a/src/it/MCOMPILER-542/verify.groovy +++ b/src/it/MCOMPILER-542/verify.groovy @@ -6,9 +6,9 @@ * 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 diff --git a/src/it/automodules-application/invoker.properties b/src/it/automodules-application/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/automodules-application/invoker.properties +++ b/src/it/automodules-application/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/automodules-application/pom.xml b/src/it/automodules-application/pom.xml index 8d3c9104..6be0179d 100644 --- a/src/it/automodules-application/pom.xml +++ b/src/it/automodules-application/pom.xml @@ -33,6 +33,7 @@ org.codehaus.plexus plexus-utils 3.0.24 + modular-jar @@ -44,7 +45,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/automodules-application/verify.groovy b/src/it/automodules-application/verify.groovy index 4ef9be37..64aef812 100644 --- a/src/it/automodules-application/verify.groovy +++ b/src/it/automodules-application/verify.groovy @@ -1,22 +1,23 @@ -/* - * 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. - */ - -buildLog = new File( basedir, 'build.log' ).text; - -assert buildLog.contains("[INFO] Required filename-based automodules detected: [plexus-utils-3.0.24.jar]. Please don't publish this project to a public artifact repository!"); +/* + * 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. + */ + +buildLog = new File( basedir, 'build.log' ).text; + +assert buildLog.contains("[WARNING] Filename-based automodules detected on the module-path:") +assert buildLog.contains(" - plexus-utils-3.0.24.jar") diff --git a/src/it/automodules-library/invoker.properties b/src/it/automodules-library/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/automodules-library/invoker.properties +++ b/src/it/automodules-library/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/automodules-library/pom.xml b/src/it/automodules-library/pom.xml index 8d3c9104..6be0179d 100644 --- a/src/it/automodules-library/pom.xml +++ b/src/it/automodules-library/pom.xml @@ -33,6 +33,7 @@ org.codehaus.plexus plexus-utils 3.0.24 + modular-jar @@ -44,7 +45,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/automodules-library/verify.groovy b/src/it/automodules-library/verify.groovy index 44369625..64aef812 100644 --- a/src/it/automodules-library/verify.groovy +++ b/src/it/automodules-library/verify.groovy @@ -1,22 +1,23 @@ -/* - * 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. - */ - -buildLog = new File( basedir, 'build.log' ).text; - -assert buildLog.contains("[WARNING] * Required filename-based automodules detected: [plexus-utils-3.0.24.jar]. Please don't publish this project to a public artifact repository! *"); +/* + * 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. + */ + +buildLog = new File( basedir, 'build.log' ).text; + +assert buildLog.contains("[WARNING] Filename-based automodules detected on the module-path:") +assert buildLog.contains(" - plexus-utils-3.0.24.jar") diff --git a/src/it/automodules-manifest/invoker.properties b/src/it/automodules-manifest/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/automodules-manifest/invoker.properties +++ b/src/it/automodules-manifest/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/automodules-manifest/pom.xml b/src/it/automodules-manifest/pom.xml index fb30d2c1..9cd552f0 100644 --- a/src/it/automodules-manifest/pom.xml +++ b/src/it/automodules-manifest/pom.xml @@ -44,7 +44,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/automodules-manifest/verify.groovy b/src/it/automodules-manifest/verify.groovy index 51ff08ee..2c16519a 100644 --- a/src/it/automodules-manifest/verify.groovy +++ b/src/it/automodules-manifest/verify.groovy @@ -1,22 +1,22 @@ -/* - * 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. - */ - -buildLog = new File( basedir, 'build.log' ).text; - -assert !buildLog.contains("] Required automodules detected. Please don't publish this project to a public artifact repository!"); +/* + * 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. + */ + +buildLog = new File( basedir, 'build.log' ).text; + +assert !buildLog.contains("Filename-based automodules detected on the module-path") diff --git a/src/it/automodules-transitive-module/invoker.properties b/src/it/automodules-transitive-module/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/automodules-transitive-module/invoker.properties +++ b/src/it/automodules-transitive-module/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/automodules-transitive-module/pom.xml b/src/it/automodules-transitive-module/pom.xml index 8d3c9104..6be0179d 100644 --- a/src/it/automodules-transitive-module/pom.xml +++ b/src/it/automodules-transitive-module/pom.xml @@ -33,6 +33,7 @@ org.codehaus.plexus plexus-utils 3.0.24 + modular-jar @@ -44,7 +45,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/automodules-transitive-module/verify.groovy b/src/it/automodules-transitive-module/verify.groovy index 44369625..64aef812 100644 --- a/src/it/automodules-transitive-module/verify.groovy +++ b/src/it/automodules-transitive-module/verify.groovy @@ -1,22 +1,23 @@ -/* - * 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. - */ - -buildLog = new File( basedir, 'build.log' ).text; - -assert buildLog.contains("[WARNING] * Required filename-based automodules detected: [plexus-utils-3.0.24.jar]. Please don't publish this project to a public artifact repository! *"); +/* + * 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. + */ + +buildLog = new File( basedir, 'build.log' ).text; + +assert buildLog.contains("[WARNING] Filename-based automodules detected on the module-path:") +assert buildLog.contains(" - plexus-utils-3.0.24.jar") diff --git a/src/it/default-fork-windows/invoker.properties b/src/it/default-fork-windows/invoker.properties index b75cc35e..7bb3a76d 100644 --- a/src/it/default-fork-windows/invoker.properties +++ b/src/it/default-fork-windows/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/default-fork-windows/verify.groovy b/src/it/default-fork-windows/verify.groovy index 2d4a24c5..dc0b2a02 100644 --- a/src/it/default-fork-windows/verify.groovy +++ b/src/it/default-fork-windows/verify.groovy @@ -18,7 +18,6 @@ */ assert new File( basedir, 'target/classes/foo/MyClass.class').exists() - assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists() assert !new File( basedir, 'target/classes/javac.sh').exists() @@ -28,5 +27,3 @@ assert !new File( basedir, 'target/javac.sh').exists() assert !new File( basedir, 'target/javac-test.sh').exists() assert new File( basedir, 'target/javac.bat').exists() assert new File( basedir, 'target/javac-test.bat').exists() - - diff --git a/src/it/default-fork/invoker.properties b/src/it/default-fork/invoker.properties index 58909646..dbadd97c 100644 --- a/src/it/default-fork/invoker.properties +++ b/src/it/default-fork/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/default-fork/verify.groovy b/src/it/default-fork/verify.groovy index 6fb1fa1e..273bea84 100644 --- a/src/it/default-fork/verify.groovy +++ b/src/it/default-fork/verify.groovy @@ -18,7 +18,6 @@ */ assert new File( basedir, 'target/classes/foo/MyClass.class').exists() - assert new File( basedir, 'target/test-classes/foo/MyTest.class').exists() assert !new File( basedir, 'target/classes/javac.sh').exists() @@ -29,5 +28,3 @@ assert !new File( basedir, 'target/javac-test.bat').exists() assert new File( basedir, 'target/javac.sh').exists() assert new File( basedir, 'target/javac-test.sh').exists() - - diff --git a/src/it/default-incremental-disable/invoker.properties b/src/it/default-incremental-disable/invoker.properties index 5f1421e8..d55a5192 100644 --- a/src/it/default-incremental-disable/invoker.properties +++ b/src/it/default-incremental-disable/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/default-incremental-disable/verify.groovy b/src/it/default-incremental-disable/verify.groovy index 2f9fe2c6..c121b384 100644 --- a/src/it/default-incremental-disable/verify.groovy +++ b/src/it/default-incremental-disable/verify.groovy @@ -6,9 +6,9 @@ * 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 diff --git a/src/it/groovy-project-with-new-plexus-compiler/invoker.properties b/src/it/groovy-project-with-new-plexus-compiler/invoker.properties deleted file mode 100644 index 3f8fa043..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -invoker.java.version = 1.6, 1.7, 1.8 diff --git a/src/it/groovy-project-with-new-plexus-compiler/pom.xml b/src/it/groovy-project-with-new-plexus-compiler/pom.xml deleted file mode 100644 index 83a9a0aa..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - 4.0.0 - org.apache.maven.plugins.compiler.it - groovy-project-with-new-plexus-compiler - 1.0-SNAPSHOT - - - - org.codehaus.groovy - groovy-all - @groovyVersion@ - - - junit - junit - 4.13.1 - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - @project.version@ - - groovy-eclipse-compiler - true - - - - - - org.codehaus.groovy - groovy-eclipse-compiler - @groovyEclipseCompilerVersion@ - - - org.codehaus.groovy - groovy-eclipse-batch - @groovy-eclipse-batch@ - - - - - - org.codehaus.groovy - groovy-eclipse-compiler - @groovyEclipseCompilerVersion@ - true - - - org.codehaus.groovy - groovy-eclipse-batch - @groovy-eclipse-batch@ - - - - - - src/main/groovy - src/test/groovy - - diff --git a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy b/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy deleted file mode 100755 index 5bbb4d8e..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ - -class GroovyHello implements Helloable { - void sayHello() { - println("Hello World from Groovy!") - } -} diff --git a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy b/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy deleted file mode 100755 index 5c23be68..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ - -class GroovyMain { - static void main(String... args) { - new GroovyHello().sayHello() - } -} diff --git a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy b/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy deleted file mode 100755 index 7a83a234..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ - -interface Helloable { - void sayHello() -} diff --git a/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy b/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy deleted file mode 100755 index cf4e5386..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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. - */ - -import org.junit.Test -import org.junit.Assert - -class GroovyTest { - - @Test - void testMethod() { - GroovyMain.main null - Assert.assertTrue true - } -} diff --git a/src/it/groovy-project-with-new-plexus-compiler/verify.groovy b/src/it/groovy-project-with-new-plexus-compiler/verify.groovy deleted file mode 100644 index 4ea3c478..00000000 --- a/src/it/groovy-project-with-new-plexus-compiler/verify.groovy +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ - -assert new File(basedir,"target/classes/GroovyMain.class").exists() -assert new File(basedir,"target/test-classes/GroovyTest.class").exists() - -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() -//content = logFile.text - -//assert content.contains( 'Usage: javac ' ) - diff --git a/src/it/jdk16-annotation/pom.xml b/src/it/jdk16-annotation/pom.xml index ad396c50..fff3e23c 100644 --- a/src/it/jdk16-annotation/pom.xml +++ b/src/it/jdk16-annotation/pom.xml @@ -46,6 +46,15 @@ under the License. none + + default-testCompile + + testCompile + + + full + + diff --git a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java index f5777e90..bce654d2 100644 --- a/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java +++ b/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java @@ -20,6 +20,7 @@ import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; @@ -32,17 +33,11 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.util.Arrays; -import java.util.HashSet; import java.util.Set; -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_17) +@SupportedAnnotationTypes("com.mycompany.jdk16annotation.ServiceProvider") public class ServiceProviderProcessor extends AbstractProcessor { - - public @Override Set getSupportedAnnotationTypes() { - return new HashSet(Arrays.asList(ServiceProvider.class.getCanonicalName())); - } - /** public for ServiceLoader */ public ServiceProviderProcessor() {} @@ -64,24 +59,20 @@ private void writeServices() { FileObject out = processingEnv .getFiler() .createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/one", new Element[0]); - OutputStream os = out.openOutputStream(); - OutputStream os2 = processingEnv - .getFiler() - .createSourceFile("org.Milos", new Element[0]) - .openOutputStream(); - OutputStreamWriter osr = new OutputStreamWriter(os2); - try { - PrintWriter w = new PrintWriter(new OutputStreamWriter(os, "UTF-8")); - w.write("test"); - w.flush(); - String clazz = "package org;\n class Milos {}"; - osr.write(clazz.toCharArray()); - osr.flush(); - } finally { - osr.close(); - os.close(); + try (OutputStream os = out.openOutputStream()) { + OutputStream os2 = processingEnv + .getFiler() + .createSourceFile("org.Milos", new Element[0]) + .openOutputStream(); + try (OutputStreamWriter osr = new OutputStreamWriter(os2)) { + PrintWriter w = new PrintWriter(new OutputStreamWriter(os, "UTF-8")); + w.write("test"); + w.flush(); + String clazz = "package org;\n class Milos {}"; + osr.write(clazz.toCharArray()); + osr.flush(); + } } - } catch (IOException x) { processingEnv.getMessager().printMessage(Kind.ERROR, "Failed to write to one: " + x.toString()); } diff --git a/src/it/jdk9-exportsto/invoker.properties b/src/it/jdk9-exportsto/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/jdk9-exportsto/invoker.properties +++ b/src/it/jdk9-exportsto/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jdk9-exportsto/pom.xml b/src/it/jdk9-exportsto/pom.xml index 8f8db667..b71f7ed4 100644 --- a/src/it/jdk9-exportsto/pom.xml +++ b/src/it/jdk9-exportsto/pom.xml @@ -42,7 +42,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/jpms_add-exports/invoker.properties b/src/it/jpms_add-exports/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/jpms_add-exports/invoker.properties +++ b/src/it/jpms_add-exports/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jpms_add-exports/pom.xml b/src/it/jpms_add-exports/pom.xml index ada65678..645623ca 100644 --- a/src/it/jpms_add-exports/pom.xml +++ b/src/it/jpms_add-exports/pom.xml @@ -36,7 +36,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 --add-exports app/org.maven.test=ALL_UNNAMED diff --git a/src/it/jpms_add-exports/verify.groovy b/src/it/jpms_add-exports/verify.groovy index 0cddccf9..e1675fcf 100644 --- a/src/it/jpms_add-exports/verify.groovy +++ b/src/it/jpms_add-exports/verify.groovy @@ -1,23 +1,25 @@ -/* - * 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. - */ - -def jpmsArgs = new File( basedir, 'target/classes/META-INF/jpms.args' ); -def lines = jpmsArgs.readLines(); -assert lines[0] == "--add-exports" -assert lines[1] == "app/org.maven.test=ALL_UNNAMED" +/* + * 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. + */ + +def args = new File( basedir, 'target/javac.args' ).text; +assert args.contains( '--add-exports app/org.maven.test=ALL_UNNAMED' ) +/* + * A previous version of this file made more extensive checks of `jpms.args` file content. + * But the `jpms.args` file is no longer generated since Maven compiler plugin version 4. + */ diff --git a/src/it/jpms_compile-main-empty-test-bar/invoker.properties b/src/it/jpms_compile-main-empty-test-bar/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/jpms_compile-main-empty-test-bar/invoker.properties +++ b/src/it/jpms_compile-main-empty-test-bar/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jpms_compile-main-empty-test-bar/pom.xml b/src/it/jpms_compile-main-empty-test-bar/pom.xml index 6f8f1311..097a82dd 100644 --- a/src/it/jpms_compile-main-empty-test-bar/pom.xml +++ b/src/it/jpms_compile-main-empty-test-bar/pom.xml @@ -45,7 +45,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/jpms_compile-main-empty-test-bar/verify.groovy b/src/it/jpms_compile-main-empty-test-bar/verify.groovy index 7063280c..8d2a93ed 100644 --- a/src/it/jpms_compile-main-empty-test-bar/verify.groovy +++ b/src/it/jpms_compile-main-empty-test-bar/verify.groovy @@ -6,9 +6,9 @@ * 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 diff --git a/src/it/jpms_compile-main-foo-test-bar/invoker.properties b/src/it/jpms_compile-main-foo-test-bar/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/jpms_compile-main-foo-test-bar/invoker.properties +++ b/src/it/jpms_compile-main-foo-test-bar/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jpms_compile-main-foo-test-bar/pom.xml b/src/it/jpms_compile-main-foo-test-bar/pom.xml index 7b6522cb..1ee94b0a 100644 --- a/src/it/jpms_compile-main-foo-test-bar/pom.xml +++ b/src/it/jpms_compile-main-foo-test-bar/pom.xml @@ -50,7 +50,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/jpms_compile-main-foo-test-bar/verify.groovy b/src/it/jpms_compile-main-foo-test-bar/verify.groovy index d1171385..91695be5 100644 --- a/src/it/jpms_compile-main-foo-test-bar/verify.groovy +++ b/src/it/jpms_compile-main-foo-test-bar/verify.groovy @@ -6,9 +6,9 @@ * 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 diff --git a/src/it/jpms_compile-main-foo-test-foo/invoker.properties b/src/it/jpms_compile-main-foo-test-foo/invoker.properties index 95117185..10a36d0a 100644 --- a/src/it/jpms_compile-main-foo-test-foo/invoker.properties +++ b/src/it/jpms_compile-main-foo-test-foo/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jpms_compile-main-foo-test-foo/pom.xml b/src/it/jpms_compile-main-foo-test-foo/pom.xml index 7b6522cb..1ee94b0a 100644 --- a/src/it/jpms_compile-main-foo-test-foo/pom.xml +++ b/src/it/jpms_compile-main-foo-test-foo/pom.xml @@ -50,7 +50,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/jpms_compile-main-foo-test-foo/verify.groovy b/src/it/jpms_compile-main-foo-test-foo/verify.groovy index b52178b8..b7ff290a 100644 --- a/src/it/jpms_compile-main-foo-test-foo/verify.groovy +++ b/src/it/jpms_compile-main-foo-test-foo/verify.groovy @@ -6,9 +6,9 @@ * 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 @@ -17,15 +17,8 @@ * under the License. */ -def jpmsArgs = new File( basedir, 'target/test-classes/META-INF/jpms.args' ) -def lines = jpmsArgs.readLines() -assert lines[0] == "--patch-module" -assert lines[1].startsWith( "foo=" ) -assert lines[1].contains( java.nio.file.Paths.get ("src", "main", "java").toString() ) +assert new File( basedir, "target/classes/module-info.class").exists() +assert new File( basedir, "target/classes/foo/Foo.class").exists() -assert new File( basedir, "target/classes/module-info.class" ).exists() -assert new File( basedir, "target/classes/foo/Foo.class" ).exists() - -assert new File( basedir, "target/test-classes/module-info.class" ).exists() -assert new File( basedir, "target/test-classes/foo/Foo.class" ).exists() -assert new File( basedir, "target/test-classes/foo/FooTests.class" ).exists() +assert new File( basedir, "target/test-classes/module-info.class").exists() +assert new File( basedir, "target/test-classes/foo/FooTests.class").exists() diff --git a/src/it/jpms_patch-module/invoker.properties b/src/it/jpms_patch-module/invoker.properties index 416082cc..a1828aa4 100644 --- a/src/it/jpms_patch-module/invoker.properties +++ b/src/it/jpms_patch-module/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/jpms_patch-module/pom.xml b/src/it/jpms_patch-module/pom.xml index 5c2c3bd3..f6a6e965 100644 --- a/src/it/jpms_patch-module/pom.xml +++ b/src/it/jpms_patch-module/pom.xml @@ -36,7 +36,10 @@ maven-compiler-plugin @project.version@ - 9 + + + + 17 diff --git a/src/it/jpms_patch-module/verify.groovy b/src/it/jpms_patch-module/verify.groovy index 92e09722..e4a8d91e 100644 --- a/src/it/jpms_patch-module/verify.groovy +++ b/src/it/jpms_patch-module/verify.groovy @@ -1,25 +1,28 @@ -/* - * 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. - */ - -def jpmsArgs = new File( basedir, 'target/test-classes/META-INF/jpms.args' ); -def lines = jpmsArgs.readLines(); -assert lines[0] == "--patch-module" -assert lines[1] == "app=_" -assert lines[2] == "--add-reads" -assert lines[3] == "app=ALL-UNNAMED" +/* + * 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. + */ + +def args = new File( basedir, 'target/javac-test.args' ).text; +assert args.contains( '--patch-module' ) +/* + * A previous version of this file made more extensive checks of `jpms.args` file content. + * But the `jpms.args` file is no longer generated since Maven compiler plugin version 4. + */ + +assert new File( basedir, "./target/classes/module-info.class" ).exists() +assert new File( basedir, "target/test-classes/org/maven/test/MainTest.class" ).exists() diff --git a/src/it/mcompiler-106/invoker.properties b/src/it/mcompiler-106/invoker.properties index 4024c9bc..df01a38b 100644 --- a/src/it/mcompiler-106/invoker.properties +++ b/src/it/mcompiler-106/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-106/verify.groovy b/src/it/mcompiler-106/verify.groovy index 10e4db49..f2209364 100644 --- a/src/it/mcompiler-106/verify.groovy +++ b/src/it/mcompiler-106/verify.groovy @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -def logFile = new File( basedir, 'build.log' ) +def logFile = new File( basedir, 'target/javac.args' ) assert logFile.exists() content = logFile.text -assert content.contains( ' -Averbose=true' ) -assert content.contains( ' -Xlint' ) - +assert content.contains( '-Averbose=true' ) +assert content.contains( '-Xlint' ) diff --git a/src/it/mcompiler-120/invoker.properties b/src/it/mcompiler-120/invoker.properties index 98a8e954..965cfab6 100644 --- a/src/it/mcompiler-120/invoker.properties +++ b/src/it/mcompiler-120/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-120/verify.groovy b/src/it/mcompiler-120/verify.groovy index cd6ef26e..c540498e 100644 --- a/src/it/mcompiler-120/verify.groovy +++ b/src/it/mcompiler-120/verify.groovy @@ -1,26 +1,26 @@ -/* - * 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. - */ -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() -content = logFile.text - -assert content.contains( 'Compilation failure' ) -assert !content.contains( 'invalid flag' ) -assert content.contains( 'unchecked call to add(E) as a member of the raw type ' ) // List or java.util.List - +/* + * 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. + */ +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() +content = logFile.text + +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. +assert !content.contains( 'invalid flag' ) +assert content.contains( 'unchecked call to add(E) as a member of the raw type ' ) // List or java.util.List diff --git a/src/it/mcompiler-135/invoker.properties b/src/it/mcompiler-135/invoker.properties index 9bc47664..29d3dcf1 100644 --- a/src/it/mcompiler-135/invoker.properties +++ b/src/it/mcompiler-135/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-179/invoker.properties b/src/it/mcompiler-179/invoker.properties index a374f3ce..9e2dad8a 100644 --- a/src/it/mcompiler-179/invoker.properties +++ b/src/it/mcompiler-179/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-179/verify.groovy b/src/it/mcompiler-179/verify.groovy index ecb16d78..5f0672b1 100644 --- a/src/it/mcompiler-179/verify.groovy +++ b/src/it/mcompiler-179/verify.groovy @@ -21,7 +21,6 @@ def logFile = new File( basedir, 'build.log' ) assert logFile.exists() content = logFile.text -// messages differ per vendor -assert content.contains( '[WARNING] COMPILATION WARNING :' ) -assert content =~ /\d+ warnings?/ -assert content.contains( '1 error' ) +assert content.contains( '[WARNING] unchecked call' ) +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. diff --git a/src/it/mcompiler-182/invoker.properties b/src/it/mcompiler-182/invoker.properties index 8511bf01..50971216 100644 --- a/src/it/mcompiler-182/invoker.properties +++ b/src/it/mcompiler-182/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-182/pom.xml b/src/it/mcompiler-182/pom.xml index a81e2fc9..2e52e8ff 100644 --- a/src/it/mcompiler-182/pom.xml +++ b/src/it/mcompiler-182/pom.xml @@ -45,14 +45,14 @@ under the License. groovy-maven-plugin 2.1.1 - def beanAFile = new File( project.basedir, 'src/main/java/BeanA.java' ) - - new File( project.basedir, 'src/main/java/BEANa.java' ).withWriter { file -> + def beanAFile = new File( project.basedir, 'src/main/java/foo/BeanA.java' ) + + new File( project.basedir, 'src/main/java/foo/BEANa.java' ).withWriter { file -> beanAFile.eachLine { line -> file.writeLine( line.replace( 'BeanA', 'BEANa' ) ) } } - + beanAFile.delete() diff --git a/src/it/mcompiler-182/src/main/java/BeanA.java b/src/it/mcompiler-182/src/main/java/foo/BeanA.java similarity index 100% rename from src/it/mcompiler-182/src/main/java/BeanA.java rename to src/it/mcompiler-182/src/main/java/foo/BeanA.java diff --git a/src/it/mcompiler-182/src/main/java/BeanA2.java b/src/it/mcompiler-182/src/main/java/foo/BeanA2.java similarity index 100% rename from src/it/mcompiler-182/src/main/java/BeanA2.java rename to src/it/mcompiler-182/src/main/java/foo/BeanA2.java diff --git a/src/it/mcompiler-182/verify.groovy b/src/it/mcompiler-182/verify.groovy index 40cb317c..c4657a76 100644 --- a/src/it/mcompiler-182/verify.groovy +++ b/src/it/mcompiler-182/verify.groovy @@ -1,25 +1,26 @@ -/* - * 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. - */ -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() -content = logFile.text - -assert content.contains( 'COMPILATION ERROR :' ) - -assert !new File( basedir, 'target/classes/foo/BeanA.class' ).exists(); +/* + * 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. + */ +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() +content = logFile.text + +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. + +assert !new File( basedir, 'target/classes/foo/BeanA.class' ).exists(); diff --git a/src/it/mcompiler-21_class-remove/invoker.properties b/src/it/mcompiler-21_class-remove/invoker.properties index 8511bf01..50971216 100644 --- a/src/it/mcompiler-21_class-remove/invoker.properties +++ b/src/it/mcompiler-21_class-remove/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-21_class-remove/pom.xml b/src/it/mcompiler-21_class-remove/pom.xml index 012cca4a..277bf9df 100644 --- a/src/it/mcompiler-21_class-remove/pom.xml +++ b/src/it/mcompiler-21_class-remove/pom.xml @@ -46,7 +46,7 @@ under the License. 2.1.1 def beanAFile = new File( project.basedir, 'src/main/java/BeanA.java' ) - + beanAFile.delete() diff --git a/src/it/mcompiler-21_class-remove/verify.groovy b/src/it/mcompiler-21_class-remove/verify.groovy index 3e4f8d17..fad12ccb 100644 --- a/src/it/mcompiler-21_class-remove/verify.groovy +++ b/src/it/mcompiler-21_class-remove/verify.groovy @@ -1,23 +1,24 @@ -/* - * 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. - */ -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() -content = logFile.text - -assert content.contains( 'COMPILATION ERROR :' ) +/* + * 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. + */ +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() +content = logFile.text + +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. diff --git a/src/it/mcompiler-21_methodname-change/invoker.properties b/src/it/mcompiler-21_methodname-change/invoker.properties index 8511bf01..50971216 100644 --- a/src/it/mcompiler-21_methodname-change/invoker.properties +++ b/src/it/mcompiler-21_methodname-change/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/mcompiler-21_methodname-change/pom.xml b/src/it/mcompiler-21_methodname-change/pom.xml index 409823b8..8b507ca1 100644 --- a/src/it/mcompiler-21_methodname-change/pom.xml +++ b/src/it/mcompiler-21_methodname-change/pom.xml @@ -46,11 +46,11 @@ under the License. 2.1.1 def beanAFile = new File( project.basedir, 'src/main/java/BeanA.java' ) - - processFileInplace( beanAFile ) { text -> + + processFileInplace( beanAFile ) { text -> text.replaceAll( /getI/, 'getI_doesntexistanymore') } - + def processFileInplace(file, Closure processText) { def text = file.text file.write(processText(text)) diff --git a/src/it/mcompiler-21_methodname-change/verify.groovy b/src/it/mcompiler-21_methodname-change/verify.groovy index 3e4f8d17..fad12ccb 100644 --- a/src/it/mcompiler-21_methodname-change/verify.groovy +++ b/src/it/mcompiler-21_methodname-change/verify.groovy @@ -1,23 +1,24 @@ -/* - * 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. - */ -def logFile = new File( basedir, 'build.log' ) -assert logFile.exists() -content = logFile.text - -assert content.contains( 'COMPILATION ERROR :' ) +/* + * 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. + */ +def logFile = new File( basedir, 'build.log' ) +assert logFile.exists() +content = logFile.text + +assert content.contains( 'COMPILATION ERROR:' ) +assert content.contains( 'CompilationFailureException' ) // In debug level logs. diff --git a/src/it/multirelease-patterns/multimodule/invoker.properties b/src/it/multirelease-patterns/multimodule/invoker.properties index 152d6804..1992d544 100644 --- a/src/it/multirelease-patterns/multimodule/invoker.properties +++ b/src/it/multirelease-patterns/multimodule/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/multirelease-patterns/multimodule/pom.xml b/src/it/multirelease-patterns/multimodule/pom.xml index 4fa63698..b0170277 100644 --- a/src/it/multirelease-patterns/multimodule/pom.xml +++ b/src/it/multirelease-patterns/multimodule/pom.xml @@ -38,6 +38,11 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ + + + + + org.apache.maven.plugins diff --git a/src/it/multirelease-patterns/multiproject/invoker.properties b/src/it/multirelease-patterns/multiproject/invoker.properties index 6c1679bb..1bdc609d 100644 --- a/src/it/multirelease-patterns/multiproject/invoker.properties +++ b/src/it/multirelease-patterns/multiproject/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml index a3b1bbad..8407069e 100644 --- a/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml +++ b/src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml @@ -54,10 +54,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - diff --git a/src/it/multirelease-patterns/multiproject/multirelease-nine/pom.xml b/src/it/multirelease-patterns/multiproject/multirelease-nine/pom.xml index b4246b57..11ccd167 100644 --- a/src/it/multirelease-patterns/multiproject/multirelease-nine/pom.xml +++ b/src/it/multirelease-patterns/multiproject/multirelease-nine/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 9 + 17 diff --git a/src/it/multirelease-patterns/multiproject/pom.xml b/src/it/multirelease-patterns/multiproject/pom.xml index 726c2a28..00c834bb 100644 --- a/src/it/multirelease-patterns/multiproject/pom.xml +++ b/src/it/multirelease-patterns/multiproject/pom.xml @@ -32,6 +32,12 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ + + + + + 16 + org.apache.maven.plugins diff --git a/src/it/multirelease-patterns/multiproject/verify.groovy b/src/it/multirelease-patterns/multiproject/verify.groovy index 07bc887c..df508b58 100644 --- a/src/it/multirelease-patterns/multiproject/verify.groovy +++ b/src/it/multirelease-patterns/multiproject/verify.groovy @@ -24,19 +24,22 @@ assert 1 == log.text.count('[INFO] Building multirelease-parent 1.0.0-SNAPSHOT') assert 2 == log.text.count('[INFO] Building Base 1.0.0-SNAPSHOT') : 'base should be built twice' assert 1 == log.text.count('[INFO] Building multirelease-nine 1.0.0-SNAPSHOT') : 'nine should be built once' +def baseVersion = 60 // Java 16 +def nextVersion = 61; // Java 17 + def mrjar = new JarFile(new File(basedir,'multirelease-base/target/multirelease-1.0.0-SNAPSHOT.jar')) assert mrjar.manifest.mainAttributes.getValue('Multi-Release') == 'true' : 'Multi-Release attribute in manifest should be true' assert (je = mrjar.getEntry('base/Base.class')) != null : 'jar should contain base/Base.class' -assert 52 == getMajor(mrjar.getInputStream(je)) : 'base/Base.class should have 52 as major bytecode version' +assert baseVersion == getMajor(mrjar.getInputStream(je)) : 'base/Base.class has unexpected major bytecode version' assert (je = mrjar.getEntry('mr/A.class')) != null : 'jar should contain mr/A.class' -assert 52 == getMajor(mrjar.getInputStream(je)) : 'mr/A.class should have 52 as major bytecode version' +assert baseVersion == getMajor(mrjar.getInputStream(je)) : 'mr/A.class shas unexpected major bytecode version' assert (je = mrjar.getEntry('mr/I.class')) != null : 'jar should contain mr/I.class' -assert 52 == getMajor(mrjar.getInputStream(je)) : 'mr/I.class should have 52 as major bytecode version' +assert baseVersion == getMajor(mrjar.getInputStream(je)) : 'mr/I.class has unexpected major bytecode version' assert (je = mrjar.getEntry('META-INF/versions/9/mr/A.class')) != null : 'jar should contain META-INF/versions/9/mr/A.class' -assert 53 == getMajor(mrjar.getInputStream(je)) : 'META-INF/versions/9/mr/A.class should have 53 as major bytecode version' +assert nextVersion == getMajor(mrjar.getInputStream(je)) : 'META-INF/versions/9/mr/A.class has unexpected major bytecode version' /* base diff --git a/src/it/multirelease-patterns/packaging-plugin/invoker.properties b/src/it/multirelease-patterns/packaging-plugin/invoker.properties index 51852220..1992d544 100644 --- a/src/it/multirelease-patterns/packaging-plugin/invoker.properties +++ b/src/it/multirelease-patterns/packaging-plugin/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,4 +16,4 @@ # under the License. invoker.java.version = 9+ -invoker.goals = verify \ No newline at end of file +invoker.goals = verify diff --git a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties index a15f4d08..8e4e5bea 100644 --- a/src/it/multirelease-patterns/singleproject-runtime/invoker.properties +++ b/src/it/multirelease-patterns/singleproject-runtime/invoker.properties @@ -5,13 +5,13 @@ # 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. -invoker.goals = verify \ No newline at end of file +invoker.goals = verify diff --git a/src/it/multirelease-patterns/singleproject-runtime/pom.xml b/src/it/multirelease-patterns/singleproject-runtime/pom.xml index 70402133..072cd619 100644 --- a/src/it/multirelease-patterns/singleproject-runtime/pom.xml +++ b/src/it/multirelease-patterns/singleproject-runtime/pom.xml @@ -41,10 +41,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 1.8 - 1.8 - org.apache.maven.plugins @@ -68,6 +64,31 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + + 16 + + + + jdk9 + + compile + + + 17 + + ${project.basedir}/src/main/java9 + + true + + + + org.apache.maven.plugins @@ -98,25 +119,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - jdk9 - - compile - - - 9 - - ${project.basedir}/src/main/java9 - - true - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/src/it/multirelease-patterns/singleproject-runtime/verify.groovy b/src/it/multirelease-patterns/singleproject-runtime/verify.groovy index ba2cf827..06dc05b1 100644 --- a/src/it/multirelease-patterns/singleproject-runtime/verify.groovy +++ b/src/it/multirelease-patterns/singleproject-runtime/verify.groovy @@ -19,26 +19,24 @@ import java.util.jar.JarFile +def baseVersion = 60 // Java 16 +def nextVersion = 61; // Java 17 + def mrjar = new JarFile(new File(basedir,'target/multirelease-1.0.0-SNAPSHOT.jar')) assert (je = mrjar.getEntry('base/Base.class')) != null -assert 52 == getMajor(mrjar.getInputStream(je)) +assert baseVersion == getMajor(mrjar.getInputStream(je)) assert (je = mrjar.getEntry('mr/A.class')) != null -assert 52 == getMajor(mrjar.getInputStream(je)) +assert baseVersion == getMajor(mrjar.getInputStream(je)) assert (je = mrjar.getEntry('mr/I.class')) != null -assert 52 == getMajor(mrjar.getInputStream(je)) +assert baseVersion == getMajor(mrjar.getInputStream(je)) -def javaVersion = System.getProperty('java.specification.version') as Double +assert mrjar.manifest.mainAttributes.getValue('Multi-Release') == 'true' -System.out.println("javaVersion: ${javaVersion}") -if (javaVersion >= 9) { - assert mrjar.manifest.mainAttributes.getValue('Multi-Release') == 'true' - - assert (je = mrjar.getEntry('META-INF/versions/9/mr/A.class')) != null - assert 53 == getMajor(mrjar.getInputStream(je)) - assert (je = mrjar.getEntry('META-INF/versions/9/module-info.class')) != null - assert 53 == getMajor(mrjar.getInputStream(je)) -} +assert (je = mrjar.getEntry('META-INF/versions/17/mr/A.class')) != null +assert nextVersion == getMajor(mrjar.getInputStream(je)) +assert (je = mrjar.getEntry('META-INF/versions/17/module-info.class')) != null +assert nextVersion == getMajor(mrjar.getInputStream(je)) /* base @@ -59,12 +57,7 @@ if (javaVersion >= 9) { META-INF/maven/multirelease/multirelease/pom.xml META-INF/maven/multirelease/multirelease/pom.properties */ -if ( javaVersion >= 9 ) { - assert mrjar.entries().size() == 17 -} -else { - assert mrjar.entries().size() == 12 -} +assert mrjar.entries().size() == 17 int getMajor(InputStream is) { diff --git a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties index 193b2ad7..825272b8 100644 --- a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties +++ b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml index 459c8f3f..16fc92aa 100644 --- a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml +++ b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml @@ -74,8 +74,7 @@ maven-compiler-plugin @project.version@ - ${base.java.version} - ${base.java.version} + ${base.java.version} @@ -86,9 +85,12 @@ - 9 + + + + 17 - 1.9 + 17 ${project.basedir}/src/main/java9 diff --git a/src/it/non-english-warnings/invoker.properties b/src/it/non-english-warnings/invoker.properties index 541cb1a4..56cf6929 100644 --- a/src/it/non-english-warnings/invoker.properties +++ b/src/it/non-english-warnings/invoker.properties @@ -5,9 +5,9 @@ # 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 diff --git a/src/it/release-without-profile-fork/invoker.properties b/src/it/release-without-profile-fork/invoker.properties deleted file mode 100644 index 0659ac55..00000000 --- a/src/it/release-without-profile-fork/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -invoker.goals = compile diff --git a/src/it/release-without-profile-fork/pom.xml b/src/it/release-without-profile-fork/pom.xml deleted file mode 100644 index 16466c3f..00000000 --- a/src/it/release-without-profile-fork/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - org.apache.maven.plugins.compiler.it - release-without-profile-fork - 1.0-SNAPSHOT - - - - - org.apache.maven.plugins - maven-compiler-plugin - @project.version@ - - - 8 - 8 - 8 - true - - - - - - diff --git a/src/it/release-without-profile-fork/verify.groovy b/src/it/release-without-profile-fork/verify.groovy deleted file mode 100644 index e563b3d7..00000000 --- a/src/it/release-without-profile-fork/verify.groovy +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ -def logFile = new File(basedir, 'build.log') -assert logFile.exists() -content = logFile.text - -// for jdk 8 we will have target and source -def jdkTarget = content.contains(' -source 8') && content.contains(' -target 8') && !content.contains(' --release 8') - -// for jdk9+ we will have release only -def jdkRelease = !content.contains(' -source 8') && !content.contains(' -target 8') && content.contains(' --release 8') - -assert (jdkTarget && !jdkRelease) || (!jdkTarget && jdkRelease) diff --git a/src/it/release-without-profile/invoker.properties b/src/it/release-without-profile/invoker.properties deleted file mode 100644 index 0659ac55..00000000 --- a/src/it/release-without-profile/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -invoker.goals = compile diff --git a/src/it/release-without-profile/pom.xml b/src/it/release-without-profile/pom.xml deleted file mode 100644 index 7b1f3b66..00000000 --- a/src/it/release-without-profile/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - org.apache.maven.plugins.compiler.it - release-without-profile - 1.0-SNAPSHOT - - - - - org.apache.maven.plugins - maven-compiler-plugin - @project.version@ - - - 8 - 8 - 8 - - - - - - diff --git a/src/it/release-without-profile/src/main/java/MyClass.java b/src/it/release-without-profile/src/main/java/MyClass.java deleted file mode 100644 index d4132bb2..00000000 --- a/src/it/release-without-profile/src/main/java/MyClass.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -package foo; - -public class MyClass {} diff --git a/src/it/release-without-profile/verify.groovy b/src/it/release-without-profile/verify.groovy deleted file mode 100644 index e563b3d7..00000000 --- a/src/it/release-without-profile/verify.groovy +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ -def logFile = new File(basedir, 'build.log') -assert logFile.exists() -content = logFile.text - -// for jdk 8 we will have target and source -def jdkTarget = content.contains(' -source 8') && content.contains(' -target 8') && !content.contains(' --release 8') - -// for jdk9+ we will have release only -def jdkRelease = !content.contains(' -source 8') && !content.contains(' -target 8') && content.contains(' --release 8') - -assert (jdkTarget && !jdkRelease) || (!jdkTarget && jdkRelease) diff --git a/src/it/setup_jar_automodule/invoker.properties b/src/it/setup_jar_automodule/invoker.properties index 4b40d106..d5d6ca5d 100644 --- a/src/it/setup_jar_automodule/invoker.properties +++ b/src/it/setup_jar_automodule/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.9+ invoker.goals = install diff --git a/src/it/setup_jar_automodule/pom.xml b/src/it/setup_jar_automodule/pom.xml index 6c2e0500..2f25d2bf 100644 --- a/src/it/setup_jar_automodule/pom.xml +++ b/src/it/setup_jar_automodule/pom.xml @@ -34,9 +34,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 9 - org.apache.maven.plugins diff --git a/src/it/setup_jar_module/invoker.properties b/src/it/setup_jar_module/invoker.properties index 4b40d106..d5d6ca5d 100644 --- a/src/it/setup_jar_module/invoker.properties +++ b/src/it/setup_jar_module/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.9+ invoker.goals = install diff --git a/src/it/setup_jar_module/pom.xml b/src/it/setup_jar_module/pom.xml index 442df050..118c0c33 100644 --- a/src/it/setup_jar_module/pom.xml +++ b/src/it/setup_jar_module/pom.xml @@ -34,9 +34,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 9 - diff --git a/src/it/setup_x/invoker.properties b/src/it/setup_x/invoker.properties index 4b40d106..d5d6ca5d 100644 --- a/src/it/setup_x/invoker.properties +++ b/src/it/setup_x/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.9+ invoker.goals = install diff --git a/src/it/setup_x/setup_jar_classic/pom.xml b/src/it/setup_x/setup_jar_classic/pom.xml index a14548d4..8b3da5d8 100644 --- a/src/it/setup_x/setup_jar_classic/pom.xml +++ b/src/it/setup_x/setup_jar_classic/pom.xml @@ -34,9 +34,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 9 - diff --git a/src/it/setup_x/setup_module-transitive/pom.xml b/src/it/setup_x/setup_module-transitive/pom.xml index 930216e9..3f99eca3 100644 --- a/src/it/setup_x/setup_module-transitive/pom.xml +++ b/src/it/setup_x/setup_module-transitive/pom.xml @@ -42,9 +42,6 @@ org.apache.maven.plugins maven-compiler-plugin @project.version@ - - 9 - diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java index 83dd698b..997ba372 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java @@ -18,299 +18,271 @@ */ package org.apache.maven.plugin.compiler; -import java.io.File; +import javax.lang.model.SourceVersion; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; +import javax.tools.OptionChecker; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.Tool; +import javax.tools.ToolProvider; + +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.IOException; import java.io.InputStream; +import java.io.StreamTokenizer; +import java.io.StringWriter; +import java.io.UncheckedIOException; import java.nio.charset.Charset; +import java.nio.charset.UnsupportedCharsetException; +import java.nio.file.DirectoryNotEmptyException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; +import java.util.EnumSet; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; -import java.util.Objects; import java.util.Optional; -import java.util.Properties; +import java.util.ServiceLoader; import java.util.Set; -import java.util.stream.Collectors; - -import org.apache.maven.api.*; +import java.util.StringJoiner; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; + +import org.apache.maven.api.JavaPathType; +import org.apache.maven.api.PathScope; +import org.apache.maven.api.PathType; +import org.apache.maven.api.Project; +import org.apache.maven.api.ProjectScope; +import org.apache.maven.api.Session; +import org.apache.maven.api.Toolchain; +import org.apache.maven.api.Type; +import org.apache.maven.api.annotations.Nonnull; +import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.di.Inject; import org.apache.maven.api.plugin.Log; import org.apache.maven.api.plugin.Mojo; import org.apache.maven.api.plugin.MojoException; import org.apache.maven.api.plugin.annotations.Parameter; import org.apache.maven.api.services.ArtifactManager; -import org.apache.maven.api.services.DependencyCoordinateFactory; -import org.apache.maven.api.services.DependencyCoordinateFactoryRequest; import org.apache.maven.api.services.DependencyResolver; import org.apache.maven.api.services.DependencyResolverRequest; +import org.apache.maven.api.services.DependencyResolverResult; import org.apache.maven.api.services.MessageBuilder; import org.apache.maven.api.services.MessageBuilderFactory; import org.apache.maven.api.services.ProjectManager; import org.apache.maven.api.services.ToolchainManager; -import org.codehaus.plexus.compiler.Compiler; -import org.codehaus.plexus.compiler.CompilerConfiguration; -import org.codehaus.plexus.compiler.CompilerException; -import org.codehaus.plexus.compiler.CompilerMessage; -import org.codehaus.plexus.compiler.CompilerOutputStyle; -import org.codehaus.plexus.compiler.CompilerResult; -import org.codehaus.plexus.compiler.manager.CompilerManager; -import org.codehaus.plexus.compiler.manager.NoSuchCompilerException; -import org.codehaus.plexus.compiler.util.scan.InclusionScanException; -import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping; -import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping; -import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping; -import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor; -import org.codehaus.plexus.languages.java.version.JavaVersion; -import org.codehaus.plexus.logging.AbstractLogger; -import org.codehaus.plexus.logging.LogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.StringUtils; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Opcodes; + +import static org.apache.maven.plugin.compiler.SourceDirectory.CLASS_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.MODULE_INFO; /** - * TODO: At least one step could be optimized, currently the plugin will do two - * scans of all the source code if the compiler has to have the entire set of - * sources. This is currently the case for at least the C# compiler and most - * likely all the other .NET compilers too. + * Base class of Mojos compiling Java source code. + * This plugin uses the {@link JavaCompiler} interface from JDK 6+. + * Each instance shall be used only once, then discarded. * - * @author others - * @author Trygve Laugstøl + * @author Trygve Laugstøl + * @author Martin Desruisseaux * @since 2.0 */ public abstract class AbstractCompilerMojo implements Mojo { - protected static final String PS = File.pathSeparator; - - private static final String INPUT_FILES_LST_FILENAME = "inputFiles.lst"; - - static final String DEFAULT_SOURCE = "1.8"; - - static final String DEFAULT_TARGET = "1.8"; - - // Used to compare with older targets - static final String MODULE_INFO_TARGET = "1.9"; - - // ---------------------------------------------------------------------- - // Configurables - // ---------------------------------------------------------------------- - - /** - * Indicates whether the build will continue even if there are compilation errors. - * - * @since 2.0.2 - */ - @Parameter(property = "maven.compiler.failOnError", defaultValue = "true") - protected boolean failOnError = true; - /** - * Indicates whether the build will continue even if there are compilation warnings. - * - * @since 3.6 + * Whether to support legacy (and often deprecated) behavior. + * This is currently hard-coded to {@code true} for compatibility reason. + * TODO: consider making configurable. */ - @Parameter(property = "maven.compiler.failOnWarning", defaultValue = "false") - protected boolean failOnWarning; + static final boolean SUPPORT_LEGACY = true; /** - * Set to true to include debugging information in the compiled class files. - * @see javac -g - * @see #debuglevel + * The executable to use by default if nine is specified. */ - @Parameter(property = "maven.compiler.debug", defaultValue = "true") - protected boolean debug = true; + private static final String DEFAULT_EXECUTABLE = "javac"; /** - * Set to true to generate metadata for reflection on method parameters. - * @since 3.6.2 - * @see javac -parameters + * The locale for diagnostics, or {@code null} for the platform default. + * + * @see #encoding */ - @Parameter(property = "maven.compiler.parameters", defaultValue = "false") - protected boolean parameters; + private static final Locale LOCALE = null; - /** - * Set to true to enable preview language features of the java compiler - * @since 3.10.1 - * @see javac --enable-preview - */ - @Parameter(property = "maven.compiler.enablePreview", defaultValue = "false") - protected boolean enablePreview; + // ---------------------------------------------------------------------- + // Configurables + // ---------------------------------------------------------------------- /** - * Set to true to show messages about what the compiler is doing. + * The {@code --module-version} argument for the Java compiler. + * This is ignored if not applicable, e.g., in non-modular projects. * - * @see javac -verbose - */ - @Parameter(property = "maven.compiler.verbose", defaultValue = "false") - protected boolean verbose; - - /** - * Sets whether to show source locations where deprecated APIs are used. + * @see javac --module-version + * @since 4.0.0 */ - @Parameter(property = "maven.compiler.showDeprecation", defaultValue = "false") - protected boolean showDeprecation; + @Parameter(property = "moduleVersion", defaultValue = "${project.version}") + protected String moduleVersion; /** - * Set to true to optimize the compiled code using the compiler's optimization methods. - * @deprecated This property is a no-op in {@code javac}. + * The {@code -encoding} argument for the Java compiler. + * + * @see javac -encoding + * @since 2.1 */ - @Deprecated - @Parameter(property = "maven.compiler.optimize", defaultValue = "false") - protected boolean optimize; + @Parameter(property = "encoding", defaultValue = "${project.build.sourceEncoding}") + protected String encoding; /** - * Set to false to disable warnings during compilation. + * {@return the character set used for decoding bytes, or null for the platform default}. + * No warning is emitted in the latter case because as of Java 18, the default is UTF-8, + * i.e. the encoding is no longer platform-dependent. */ - @Parameter(property = "maven.compiler.showWarnings", defaultValue = "true") - protected boolean showWarnings; + private Charset charset() { + if (encoding != null) { + try { + return Charset.forName(encoding); + } catch (UnsupportedCharsetException e) { + throw new CompilationFailureException("Invalid 'encoding' option: " + encoding, e); + } + } + return null; + } /** - *

The {@code -source} argument for the Java compiler.

+ * The {@code --source} argument for the Java compiler. + *

Notes:

+ *
    + *
  • Since 3.8.0 the default value has changed from 1.5 to 1.6.
    • + *
  • Since 3.9.0 the default value has changed from 1.6 to 1.7.
    • + *
  • Since 3.11.0 the default value has changed from 1.7 to 1.8.
    • + *
  • Since 4.0.0-beta-2 the default value has been removed. + * As of Java 9, the {@link #release} parameter is preferred.
    • + *
* - *

NOTE:

- *

Since 3.8.0 the default value has changed from 1.5 to 1.6

- *

Since 3.9.0 the default value has changed from 1.6 to 1.7

- *

Since 3.11.0 the default value has changed from 1.7 to 1.8

- * @see javac -source + * @see javac --source */ - @Parameter(property = "maven.compiler.source", defaultValue = DEFAULT_SOURCE) + @Parameter(property = "maven.compiler.source") protected String source; /** - *

The {@code -target} argument for the Java compiler.

- * - *

NOTE:

- *

Since 3.8.0 the default value has changed from 1.5 to 1.6

- *

Since 3.9.0 the default value has changed from 1.6 to 1.7

- *

Since 3.11.0 the default value has changed from 1.7 to 1.8

+ * The {@code --target} argument for the Java compiler. + *

Notes:

+ *
    + *
  • Since 3.8.0 the default value has changed from 1.5 to 1.6.
    • + *
  • Since 3.9.0 the default value has changed from 1.6 to 1.7.
    • + *
  • Since 3.11.0 the default value has changed from 1.7 to 1.8.
    • + *
  • Since 4.0.0-beta-2 the default value has been removed. + * As of Java 9, the {@link #release} parameter is preferred.
    • + *
* - * @see javac -target + * @see javac --target */ - @Parameter(property = "maven.compiler.target", defaultValue = DEFAULT_TARGET) + @Parameter(property = "maven.compiler.target") protected String target; /** - * The {@code -release} argument for the Java compiler, supported since Java9 + * The {@code --release} argument for the Java compiler. + * If omitted, then the compiler will generate bytecodes for the Java version running the compiler. * + * @see javac --release * @since 3.6 - * @see javac -release */ @Parameter(property = "maven.compiler.release") protected String release; /** - * The {@code -encoding} argument for the Java compiler. + * Whether to enable preview language features of the java compiler. + * If {@code true}, then the {@code --enable-preview} option will be added to compiler arguments. * - * @since 2.1 - * @see javac -encoding - */ - @Parameter(property = "encoding", defaultValue = "${project.build.sourceEncoding}") - protected String encoding; - - /** - * Sets the granularity in milliseconds of the last modification - * date for testing whether a source needs recompilation. - */ - @Parameter(property = "lastModGranularityMs", defaultValue = "0") - protected int staleMillis; - - /** - * The compiler id of the compiler to use. See this - * guide for more information. - */ - @Parameter(property = "maven.compiler.compilerId", defaultValue = "javac") - protected String compilerId; - - /** - * Version of the compiler to use, ex. "1.3", "1.5", if {@link #fork} is set to true. - * @deprecated This parameter is no longer evaluated by the underlying compilers, instead the actual - * version of the {@code javac} binary is automatically retrieved. - */ - @Deprecated - @Parameter(property = "maven.compiler.compilerVersion") - protected String compilerVersion; - - /** - * Allows running the compiler in a separate process. - * If false it uses the built in compiler, while if true it will use an executable. + * @see javac --enable-preview + * @since 3.10.1 */ - @Parameter(property = "maven.compiler.fork", defaultValue = "false") - protected boolean fork; + @Parameter(property = "maven.compiler.enablePreview", defaultValue = "false") + protected boolean enablePreview; /** - * Initial size, in megabytes, of the memory allocation pool, ex. "64", "64m" - * if {@link #fork} is set to true. + * Additional arguments to be passed verbatim to the Java compiler. This parameter can be used when + * the Maven compiler plugin does not provide a parameter for a Java compiler option. It may happen, + * for example, for new or preview Java features which are not yet handled by this compiler plugin. * - * @since 2.0.1 - */ - @Parameter(property = "maven.compiler.meminitial") - protected String meminitial; - - /** - * Sets the maximum size, in megabytes, of the memory allocation pool, ex. "128", "128m" - * if {@link #fork} is set to true. + *

If an option has a value, the option and the value shall be specified in two separated {@code } + * elements. For example, the {@code -Xmaxerrs 1000} option (for setting the maximal number of errors to + * 1000) can be specified as below (together with other options):

* - * @since 2.0.1 + * 
{@code
+     * 
+     *   -Xlint
+     *   -Xmaxerrs
+     *   1000
+     *   J-Duser.language=en_us
+     * }
+ * + * Note that {@code -J} options should be specified only if {@link #fork} is set to {@code true}. + * Other options can be specified regardless the {@link #fork} value. + * The compiler plugin does not verify whether the arguments given through this parameter are valid. + * For this reason, the other parameters provided by the compiler plugin should be preferred when + * they exist, because the plugin checks whether the corresponding options are supported. + * + * @see javac -J + * @since 3.1 */ - @Parameter(property = "maven.compiler.maxmem") - protected String maxmem; + @Parameter + protected List compilerArgs; /** - * Sets the executable of the compiler to use when {@link #fork} is true. + * The single argument string to be passed to the compiler. To pass multiple arguments such as + * {@code -Xmaxerrs 1000} (which are actually two arguments), {@link #compilerArgs} is preferred. + * + *

Note that {@code -J} options should be specified only if {@link #fork} is set to {@code true}.

+ * + * @see javac -J + * + * @deprecated Use {@link #compilerArgs} instead. */ - @Parameter(property = "maven.compiler.executable") - protected String executable; + @Parameter + @Deprecated(since = "4.0.0") + protected String compilerArgument; /** - *

- * Sets whether annotation processing is performed or not. Only applies to JDK 1.6+ + * Whether annotation processing is performed or not. * If not set, both compilation and annotation processing are performed at the same time. - *

- *

Allowed values are:

+ * If set, the value will be appended to the {@code -proc:} compiler option. + * Standard values are: *
    - *
  • none - no annotation processing is performed.
    • - *
  • only - only annotation processing is done, no compilation.
    • - *
  • full - annotation processing and compilation.
    • + *
  • {@code none} – no annotation processing is performed.
    • + *
  • {@code only} – only annotation processing is done, no compilation.
    • + *
  • {@code full} – annotation processing and compilation are done.
    • *
* - * full is the default. Starting with JDK 21, this option must be set explicitly. + * Prior Java 21, {@code full} was the default. + * Starting with JDK 21, this option must be set explicitly. * - * @since 2.2 + * @see #annotationProcessors * @see javac -proc * @see javac Annotation Processing + * @since 2.2 */ @Parameter(property = "maven.compiler.proc") protected String proc; + // Reminder: if above list of legal values is modified, update also addComaSeparated("-proc", …) /** - *

- * Names of annotation processors to run. Only applies to JDK 1.6+ + * Class names of annotation processors to run. * If not set, the default annotation processors discovery process applies. - *

+ * If set, the value will be appended to the {@code -processor} compiler option. * + * @see #proc * @since 2.2 - * @see javac -processor - * @see javac Annotation Processing */ @Parameter protected String[] annotationProcessors; /** - *

* Classpath elements to supply as annotation processor path. If specified, the compiler will detect annotation * processors only in those classpath elements. If omitted, the default classpath is used to detect annotation - * processors. The detection itself depends on the configuration of {@code annotationProcessors}. - *

+ * processors. The detection itself depends on the configuration of {@link #annotationProcessors}. *

* Each classpath element is specified using their Maven coordinates (groupId, artifactId, version, classifier, * type). Transitive dependencies are added automatically. Exclusions are supported as well. Example: @@ -338,19 +310,20 @@ public abstract class AbstractCompilerMojo implements Mojo { * * Note: Exclusions are supported from version 3.11.0. * - * @since 3.5 * @see javac -processorpath * @see javac Annotation Processing + * @since 3.5 * + * @deprecated Replaced by ordinary dependencies with {@code } element + * set to {@code proc}, {@code classpath-proc} or {@code modular-proc}. */ @Parameter + @Deprecated(since = "4.0.0") protected List annotationProcessorPaths; /** - *

* Whether to use the Maven dependency management section when resolving transitive dependencies of annotation * processor paths. - *

*

* This flag does not enable / disable the ability to resolve the version of annotation processor paths * from dependency management section. It only influences the resolution of transitive dependencies of those @@ -363,1441 +336,1488 @@ public abstract class AbstractCompilerMojo implements Mojo { protected boolean annotationProcessorPathsUseDepMgmt; /** - *

- * Sets the arguments to be passed to the compiler. - *

- *

- * Note that {@code -J} options are only passed through if {@link #fork} is set to {@code true}. - *

- * Example: - * 
-     * <compilerArgs>
-     *   <arg>-Xmaxerrs</arg>
-     *   <arg>1000</arg>
-     *   <arg>-Xlint</arg>
-     *   <arg>-J-Duser.language=en_us</arg>
-     * </compilerArgs>
-     *
+ * Whether to generate {@code package-info.class} even when empty. + * By default, package info source files that only contain javadoc and no annotation + * on the package can lead to no class file being generated by the compiler. + * It may cause a file miss on build systems that check for file existence in order to decide what to recompile. * - * @since 3.1 - * @see javac -J - */ - @Parameter - protected List compilerArgs; - - /** - *

- * Sets the unformatted single argument string to be passed to the compiler. To pass multiple arguments such as - * -Xmaxerrs 1000 (which are actually two arguments) you have to use {@link #compilerArgs}. - *

- *

- * This is because the list of valid arguments passed to a Java compiler varies based on the compiler version. - *

- *

- * Note that {@code -J} options are only passed through if {@link #fork} is set to {@code true}. - *

- * @see javac -J - */ - @Parameter - protected String compilerArgument; - - /** - * Sets the name of the output file when compiling a set of - * sources to a single file. - *

- * expression="${project.build.finalName}" - */ - @Parameter - private String outputFileName; - - /** - * Keyword list to be appended to the -g command-line switch. Legal values are none or a - * comma-separated list of the following keywords: lines, vars, and source. - * If debug level is not specified, by default, nothing will be appended to -g. - * If {@link #debug} is not turned on, this attribute will be ignored. + *

If {@code true}, the {@code -Xpkginfo:always} compiler option is added if the compiler supports that + * extra option. If the extra option is not supported, then a warning is logged and no option is added to + * the compiler arguments.

* - * @since 2.1 - * @see javac -G:[lines,vars,source] + * @see #incrementalCompilation + * @since 3.10 */ - @Parameter(property = "maven.compiler.debuglevel") - private String debuglevel; + @Parameter(property = "maven.compiler.createMissingPackageInfoClass", defaultValue = "false") + protected boolean createMissingPackageInfoClass; /** - * Keyword to be appended to the -implicit: command-line switch. + * Whether to generate class files for implicitly referenced files. + * If set, the value will be appended to the {@code -implicit:} compiler option. + * Standard values are: + *
    + *
  • {@code class} – automatically generates class files.
    • + *
  • {@code none} – suppresses class file generation.
    • + *
* - * @since 3.10.2 * @see javac -implicit + * @since 3.10.2 */ @Parameter(property = "maven.compiler.implicit") protected String implicit; + // Reminder: if above list of legal values is modified, update also addComaSeparated("-implicit", …) /** - *

- * Specify the requirements for this jdk toolchain for using a different {@code javac} than the one of the JRE used - * by Maven. This overrules the toolchain selected by the - * maven-toolchain-plugin. - *

- * (see Guide to Toolchains for more - * info) - * - * 
-     * <configuration>
-     *   <jdkToolchain>
-     *     <version>11</version>
-     *   </jdkToolchain>
-     *   ...
-     * </configuration>
-     *
-     * <configuration>
-     *   <jdkToolchain>
-     *     <version>1.8</version>
-     *     <vendor>zulu</vendor>
-     *   </jdkToolchain>
-     *   ...
-     * </configuration>
-     *
- * note: requires at least Maven 3.3.1 + * Whether to generate metadata for reflection on method parameters. + * If {@code true}, the {@code -parameters} option will be added to compiler arguments. * - * @since 3.6 - */ - @Parameter - protected Map jdkToolchain; - - // ---------------------------------------------------------------------- - // Read-only parameters - // ---------------------------------------------------------------------- - - /** - * The directory to run the compiler from if fork is true. - */ - @Parameter(defaultValue = "${project.basedir}", required = true, readonly = true) - protected Path basedir; - - /** - * The target directory of the compiler if fork is true. + * @see javac -parameters + * @since 3.6.2 */ - @Parameter(defaultValue = "${project.build.directory}", required = true, readonly = true) - protected Path buildDirectory; + @Parameter(property = "maven.compiler.parameters", defaultValue = "false") + protected boolean parameters; /** - * Plexus compiler manager. + * Whether to include debugging information in the compiled class files. + * The amount of debugging information to include is specified by the {@link #debuglevel} parameter. + * If this {@code debug} flag is {@code true}, then the {@code -g} option may be added to compiler arguments + * with a value determined by the {@link #debuglevel} argument. If this {@code debug} flag is {@code false}, + * then the {@code -g:none} option will be added to the compiler arguments. + * + * @see #debuglevel + * @see javac -g */ - @Inject - protected CompilerManager compilerManager; + @Parameter(property = "maven.compiler.debug", defaultValue = "true") + protected boolean debug = true; /** - * The current build session instance. This is used for toolchain manager API calls. + * Keyword list to be appended to the {@code -g} command-line switch. + * Legal values are a comma-separated list of the following keywords: + * {@code lines}, {@code vars}, {@code source} and {@code all}. + * If debug level is not specified, then the {@code -g} option will not by added, + * which means that the default debugging information will be generated + * (typically {@code lines} and {@code source} but not {@code vars}). + * If {@link #debug} is turned off, this attribute will be ignored. + * + * @see #debug + * @see javac -G:[lines,vars,source] + * @since 2.1 */ - @Inject - protected Session session; + @Parameter(property = "maven.compiler.debuglevel") + protected String debuglevel; + // Reminder: if above list of legal values is modified, update also addComaSeparated("-g", …) /** - * The current project instance. This is used for propagating generated-sources paths as compile/testCompile source - * roots. + * Whether to optimize the compiled code using the compiler's optimization methods. + * @deprecated This property is ignored. */ - @Inject - protected Project project; + @Deprecated(forRemoval = true) + @Parameter(property = "maven.compiler.optimize") + protected Boolean optimize; /** - * Strategy to re use javacc class created: - *
    - *
  • reuseCreated (default): will reuse already created but in case of multi-threaded builds, each - * thread will have its own instance
    • - *
  • reuseSame: the same Javacc class will be used for each compilation even for multi-threaded build - *
    • - *
  • alwaysNew: a new Javacc class will be created for each compilation
    • - *
- * Note this parameter value depends on the os/jdk you are using, but the default value should work on most of env. + * Whether to show messages about what the compiler is doing. + * If {@code true}, then the {@code -verbose} option will be added to compiler arguments. * - * @since 2.5 + * @see javac -verbose */ - @Parameter(defaultValue = "${reuseCreated}", property = "maven.compiler.compilerReuseStrategy") - protected String compilerReuseStrategy = "reuseCreated"; + @Parameter(property = "maven.compiler.verbose", defaultValue = "false") + protected boolean verbose; /** - * @since 2.5 + * Whether to provide more details about why a module is rebuilt. + * This is used only if {@link #incrementalCompilation} is {@code "inputTreeChanges"}. + * + * @see #incrementalCompilation */ - @Parameter(defaultValue = "false", property = "maven.compiler.skipMultiThreadWarning") - protected boolean skipMultiThreadWarning; + @Parameter(property = "maven.compiler.showCompilationChanges", defaultValue = "false") + protected boolean showCompilationChanges; /** - * The underlying compiler now uses {@code javax.tools} API - * if available in your current JDK. - * Set this to {@code true} to always use the legacy - * {@code com.sun.tools.javac} API instead. - *

- * This only has an effect for {@link #compilerId} being {@code javac} and {@link #fork} being {@code false}. + * Whether to show source locations where deprecated APIs are used. + * If {@code true}, then the {@code -deprecation} option will be added to compiler arguments. + * That option is itself a shorthand for {@code -Xlint:deprecation}. * - * @since 3.13 + * @see #showWarnings + * @see #failOnWarning */ - @Parameter(defaultValue = "false", property = "maven.compiler.forceLegacyJavacApi") - protected boolean forceLegacyJavacApi; + @Parameter(property = "maven.compiler.showDeprecation", defaultValue = "false") + protected boolean showDeprecation; /** - * @since 3.0 needed for storing the status for the incremental build support. + * Whether to show compilation warnings. + * If {@code false}, then the {@code -nowarn} option will be added to compiler arguments. + * That option is itself a shorthand for {@code -Xlint:none}. + * + * @see #showDeprecation + * @see #failOnWarning */ - @Parameter(defaultValue = "maven-status/${mojo.plugin.descriptor.artifactId}/${mojo.goal}/${mojo.executionId}") - protected String mojoStatusPath; + @Parameter(property = "maven.compiler.showWarnings", defaultValue = "true") + protected boolean showWarnings = true; /** - * File extensions to check timestamp for incremental build. - * Default contains only class and jar. + * Whether the build will stop if there are compilation warnings. + * If {@code true}, then the {@code -Werror} option will be added to compiler arguments. * - * @since 3.1 + * @see #showWarnings + * @see #showDeprecation + * @since 3.6 */ - @Parameter - protected List fileExtensions; + @Parameter(property = "maven.compiler.failOnWarning", defaultValue = "false") + protected boolean failOnWarning; /** - *

to enable/disable incremental compilation feature.

- *

This leads to two different modes depending on the underlying compiler. The default javac compiler does the - * following:

- *
    - *
  • true (default) in this mode the compiler plugin determines whether any JAR files the - * current module depends on have changed in the current build run; or any source file was added, removed or - * changed since the last compilation. If this is the case, the compiler plugin recompiles all sources.
    • - *
  • false (not recommended) this only compiles source files which are newer than their - * corresponding class files, namely which have changed since the last compilation. This does not - * recompile other classes which use the changed class, potentially leaving them with references to methods that no - * longer exist, leading to errors at runtime.
    • - *
+ * Whether the build will stop if there are compilation errors. * - * @since 3.1 + * @see #failOnWarning + * @since 2.0.2 */ - @Parameter(defaultValue = "true", property = "maven.compiler.useIncrementalCompilation") - protected boolean useIncrementalCompilation = true; + @Parameter(property = "maven.compiler.failOnError", defaultValue = "true") + protected boolean failOnError = true; /** - * Package info source files that only contain javadoc and no annotation on the package - * can lead to no class file being generated by the compiler. This causes a file miss - * on the next compilations and forces an unnecessary recompilation. The default value - * of true causes an empty class file to be generated. This behavior can - * be changed by setting this parameter to false. + * Sets the name of the output file when compiling a set of sources to a single file. * - * @since 3.10 + *

expression="${project.build.finalName}"

+ * + * @deprecated Bundling many class files into a single file should be done by other plugins. */ - @Parameter(defaultValue = "true", property = "maven.compiler.createMissingPackageInfoClass") - protected boolean createMissingPackageInfoClass = true; - - @Parameter(defaultValue = "false", property = "maven.compiler.showCompilationChanges") - protected boolean showCompilationChanges = false; + @Parameter + @Deprecated(since = "4.0.0", forRemoval = true) + protected String outputFileName; /** - * Timestamp for reproducible output archive entries, either formatted as ISO 8601 - * yyyy-MM-dd'T'HH:mm:ssXXX or as an int representing seconds since the epoch (like + * Timestamp for reproducible output archive entries. It can be either formatted as ISO 8601 + * {@code yyyy-MM-dd'T'HH:mm:ssXXX} or as an int representing seconds since the epoch (like * SOURCE_DATE_EPOCH). + * * @since 3.12.0 + * + * @deprecated Not used by the compiler plugin since it does not generate archive. */ + @Deprecated(since = "4.0.0", forRemoval = true) @Parameter(defaultValue = "${project.build.outputTimestamp}") protected String outputTimestamp; - @Inject - protected ProjectManager projectManager; + /** + * The algorithm to use for selecting which files to compile. + * Values can be {@code dependencies}, {@code sources}, {@code classes}, {@code additions}, + * {@code modules} or {@code none}. + * + *

{@code options}: + * recompile all source files if the compiler options changed. + * Changes are detected on a best-effort basis only.

+ * + *

{@code dependencies}: + * recompile all source files if at least one dependency (JAR file) changed since the last build. + * This check is based on the last modification times of JAR files.

+ * + *

{@code sources}: + * recompile source files modified since the last build. + * In addition, if a source file has been deleted, then all source files are recompiled. + * This check is based on the modification times of source files + * rather than the modification times of the {@code *.class} files.

+ * + *

{@code classes}: + * recompile source files ({@code *.java}) associated to no output file ({@code *.class}) + * or associated to an output file older than the source. This algorithm does not check + * if a source file has been removed, potentially leaving non-recompiled classes with + * references to classes that no longer exist.

+ * + *

The {@code sources} and {@code classes} values are partially redundant, + * doing the same work in different ways. It is usually not necessary to specify those two values.

+ * + *

{@code additions}: + * recompile all source files when the addition of a new file is detected. + * This aspect should be used together with {@code sources} or {@code classes}. + * When used with {@code classes}, it provides a way to detect class renaming + * (this is not needed with {@code sources}).

+ * + *

{@code modules}: + * recompile modules and let the compiler decides which individual files to recompile. + * The compiler plugin does not enumerate the source files to recompile (actually, it does not scan at all the + * source directories). Instead, it only specifies the module to recompile using the {@code --module} option. + * The Java compiler will scan the source directories itself and compile only those source files that are newer + * than the corresponding files in the output directory.

+ * + *

{@code none}: + * the compiler plugin unconditionally specifies all sources to the Java compiler. + * This option is mutually exclusive with all other incremental compilation options.

+ * + *

Limitations

+ * In all cases, the current compiler-plugin does not detect structural changes other than file addition or removal. + * For example, the plugin does not detect whether a method has been removed in a class. + * + * @see #staleMillis + * @see #fileExtensions + * @see #showCompilationChanges + * @see #createMissingPackageInfoClass + * @since 4.0.0 + */ + @Parameter(defaultValue = "options,dependencies,sources") + protected String incrementalCompilation; - @Inject - protected ArtifactManager artifactManager; + /** + * Whether to enable/disable incremental compilation feature. + * + * @since 3.1 + * + * @deprecated Replaced by {@link #incrementalCompilation}. + * A value of {@code true} in this old property is equivalent to {@code "dependencies,sources,additions"} + * in the new property, and a value of {@code false} is equivalent to {@code "classes"}. + */ + @Deprecated(since = "4.0.0") + @Parameter(property = "maven.compiler.useIncrementalCompilation") + protected Boolean useIncrementalCompilation; - @Inject - protected ToolchainManager toolchainManager; + /** + * File extensions to check timestamp for incremental build. + * Default contains only {@code class} and {@code jar}. + * + * TODO: Rename with a name making clearer that this parameter is about incremental build. + * + * @see #incrementalCompilation + * @since 3.1 + */ + @Parameter + protected List fileExtensions; - @Inject - protected MessageBuilderFactory messageBuilderFactory; + /** + * The granularity in milliseconds of the last modification + * date for testing whether a source needs recompilation. + * + * @see #incrementalCompilation + */ + @Parameter(property = "lastModGranularityMs", defaultValue = "0") + protected int staleMillis; - @Inject - protected Log logger; + /** + * Allows running the compiler in a separate process. + * If {@code false}, the plugin uses the built-in compiler, while if {@code true} it will use an executable. + * + * @see #executable + * @see #compilerId + * @see #meminitial + * @see #maxmem + */ + @Parameter(property = "maven.compiler.fork", defaultValue = "false") + protected boolean fork; - protected abstract SourceInclusionScanner getSourceInclusionScanner(int staleMillis); + /** + * Requirements for this JDK toolchain for using a different {@code javac} than the one of the JDK used by Maven. + * This overrules the toolchain selected by the + * maven-toolchain-plugin. + * See Guide to Toolchains + * for more info. + * + * 
+     * <configuration>
+     *   <jdkToolchain>
+     *     <version>11</version>
+     *   </jdkToolchain>
+     *   ...
+     * </configuration>
+     *
+     * <configuration>
+     *   <jdkToolchain>
+     *     <version>1.8</version>
+     *     <vendor>zulu</vendor>
+     *   </jdkToolchain>
+     *   ...
+     * </configuration>
+     *
+ * + * @see #fork + * @see #executable + * @since 3.6 + */ + @Parameter + protected Map jdkToolchain; - protected abstract SourceInclusionScanner getSourceInclusionScanner(String inputFileEnding); + /** + * Identifier of the compiler to use. This identifier shall match the identifier of a compiler known + * to the {@linkplain #jdkToolchain JDK tool chain}, or the {@linkplain JavaCompiler#name() name} of + * a {@link JavaCompiler} instance registered as a service findable by {@link ServiceLoader}. + * See this guide for more information. + * If unspecified, then the {@linkplain ToolProvider#getSystemJavaCompiler() system Java compiler} is used. + * The identifier of the system Java compiler is usually {@code javac}. + * + * @see #fork + * @see #executable + * @see JavaCompiler#name() + */ + @Parameter(property = "maven.compiler.compilerId") + protected String compilerId; - protected abstract List getClasspathElements(); + /** + * Version of the compiler to use if {@link #fork} is set to {@code true}. + * Examples! "1.3", "1.5". + * + * @deprecated This parameter is no longer used by the underlying compilers. + * + * @see #fork + */ + @Deprecated(since = "4.0.0", forRemoval = true) + @Parameter(property = "maven.compiler.compilerVersion") + protected String compilerVersion; - protected abstract List getModulepathElements(); + /** + * Whether to use the legacy {@code com.sun.tools.javac} API instead of {@code javax.tools} API. + * + * @see New API + * @see Legacy API + * @since 3.13 + * + * @deprecated Ignored because the compiler plugin now always use the {@code javax.tools} API. + */ + @Deprecated(since = "4.0.0", forRemoval = true) + @Parameter(property = "maven.compiler.forceLegacyJavacApi") + protected Boolean forceLegacyJavacApi; - protected abstract Map getPathElements(); + /** + * Whether to use legacy compiler API. + * + * @since 3.0 + * + * @deprecated Ignored because {@code java.lang.Compiler} has been deprecated and removed from the JDK. + */ + @Deprecated(since = "4.0.0", forRemoval = true) + @Parameter(property = "maven.compiler.forceJavacCompilerUse") + protected Boolean forceJavacCompilerUse; - protected abstract List getCompileSourceRoots(); + /** + * Strategy to re use {@code javacc} class created. Legal values are: + *
    + *
  • {@code reuseCreated} (default) – will reuse already created but in case of multi-threaded builds, + * each thread will have its own instance.
    • + *
  • {@code reuseSame} – the same Javacc class will be used for each compilation even + * for multi-threaded build.
    • + *
  • {@code alwaysNew} – a new Javacc class will be created for each compilation.
    • + *
+ * Note this parameter value depends on the OS/JDK you are using, but the default value should work on most of env. + * + * @since 2.5 + * + * @deprecated Not supported anymore. The reuse of {@link JavaFileManager} instance is plugin implementation details. + */ + @Deprecated(since = "4.0.0", forRemoval = true) + @Parameter(property = "maven.compiler.compilerReuseStrategy") + protected String compilerReuseStrategy; - protected abstract void preparePaths(Set sourceFiles); + /** + * @since 2.5 + * + * @deprecated Deprecated as a consequence of {@link #compilerReuseStrategy} deprecation. + */ + @Deprecated(since = "4.0.0", forRemoval = true) + @Parameter(property = "maven.compiler.skipMultiThreadWarning") + protected Boolean skipMultiThreadWarning; - protected abstract Path getOutputDirectory(); + /** + * Executable of the compiler to use when {@link #fork} is {@code true}. + * If this parameter is specified, then the {@link #jdkToolchain} is ignored. + * + * @see #jdkToolchain + * @see #fork + * @see #compilerId + */ + @Parameter(property = "maven.compiler.executable") + protected String executable; - protected abstract String getSource(); + /** + * Initial size, in megabytes, of the memory allocation pool if {@link #fork} is set to {@code true}. + * Examples: "64", "64M". Suffixes "k" (for kilobytes) and "G" (for gigabytes) are also accepted. + * If no suffix is provided, "M" is assumed. + * + * @see #fork + * @since 2.0.1 + */ + @Parameter(property = "maven.compiler.meminitial") + protected String meminitial; - protected abstract String getTarget(); + /** + * Maximum size, in megabytes, of the memory allocation pool if {@link #fork} is set to {@code true}. + * Examples: "128", "128M". Suffixes "k" (for kilobytes) and "G" (for gigabytes) are also accepted. + * If no suffix is provided, "M" is assumed. + * + * @see #fork + * @since 2.0.1 + */ + @Parameter(property = "maven.compiler.maxmem") + protected String maxmem; - protected abstract String getRelease(); + // ---------------------------------------------------------------------- + // Read-only parameters + // ---------------------------------------------------------------------- - protected abstract String getCompilerArgument(); + /** + * The directory to run the compiler from if fork is true. + */ + @Parameter(defaultValue = "${project.basedir}", required = true, readonly = true) + protected Path basedir; - protected abstract Path getGeneratedSourcesDirectory(); + /** + * Path to a file where to cache information about the last incremental build. + * This is used when "incremental" builds are enabled for detecting additions + * or removals of source files, or changes in plugin configuration. + * This file should be in the output directory and can be deleted at any time + */ + @Parameter( + defaultValue = + "${project.build.directory}/maven-status/${mojo.plugin.descriptor.artifactId}/${mojo.executionId}.cache", + required = true, + readonly = true) + protected Path mojoStatusPath; - protected abstract String getDebugFileName(); + /** + * The current build session instance. + */ + @Inject + protected Session session; - protected final Project getProject() { - return project; - } + /** + * The current project instance. + */ + @Inject + protected Project project; - private boolean targetOrReleaseSet; + @Inject + protected ProjectManager projectManager; - @Override - public void execute() { - // ---------------------------------------------------------------------- - // Look up the compiler. This is done before other code than can - // cause the mojo to return before the lookup is done possibly resulting - // in misconfigured POMs still building. - // ---------------------------------------------------------------------- + @Inject + protected ArtifactManager artifactManager; - Compiler compiler; + @Inject + protected ToolchainManager toolchainManager; - getLog().debug("Using compiler '" + compilerId + "'."); + @Inject + protected MessageBuilderFactory messageBuilderFactory; - try { - compiler = compilerManager.getCompiler(compilerId); - if (compiler instanceof LogEnabled) { - ((LogEnabled) compiler).enableLogging(new MavenLogger()); - } - } catch (NoSuchCompilerException e) { - throw new MojoException("No such compiler '" + e.getCompilerId() + "'."); - } + /** + * The logger for reporting information or warnings to the user. + * Currently, this is also used for console output. + */ + @Inject + protected Log logger; - // -----------toolchains start here ---------------------------------- - // use the compilerId as identifier for toolchains as well. - Optional tc = getToolchain(); - if (tc.isPresent()) { - getLog().info("Toolchain in maven-compiler-plugin: " + tc.get()); - if (executable != null) { - getLog().warn("Toolchains are ignored, 'executable' parameter is set to " + executable); - } else { - fork = true; - // TODO somehow shaky dependency between compilerId and tool executable. - executable = tc.get().findTool(compilerId); - } - } - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- + /** + * Cached value for writing replacement proposal when a deprecated option is used. + * This is set to a non-null value when first needed. An empty string means that + * this information couldn't be fetched. + * + * @see #writePlugin(MessageBuilder, String, String) + */ + private String mavenCompilerPluginVersion; - List compileSourceRoots = removeEmptyCompileSourceRoots(getCompileSourceRoots()); + /** + * A tip about how to launch the Java compiler from the command-line. + * The command-line may have {@code -J} options before the argument file. + * This is non-null if the compilation failed or if Maven is executed in debug mode. + */ + private String tipForCommandLineCompilation; - if (compileSourceRoots.isEmpty()) { - getLog().info("No sources to compile"); - return; - } + /** + * {@code true} if this MOJO is for compiling tests, or {@code false} if compiling the main code. + */ + final boolean isTestCompile; - // Verify that target or release is set - if (!targetOrReleaseSet) { - MessageBuilder mb = messageBuilderFactory - .builder() - .a("No explicit value set for target or release! ") - .a("To ensure the same result even after upgrading this plugin, please add ") - .newline() - .newline(); + /** + * Creates a new MOJO. + * + * @param isTestCompile {@code true} for compiling tests, or {@code false} for compiling the main code + */ + protected AbstractCompilerMojo(boolean isTestCompile) { + this.isTestCompile = isTestCompile; + } - writePlugin(mb); + /** + * {@return the root directories of Java source files to compile}. If the sources are organized according the + * Module Source Hierarchy, then the list shall enumerate the root source directory for each module. + */ + @Nonnull + protected abstract List getCompileSourceRoots(); - getLog().warn(mb.build()); - } + /** + * {@return the inclusion filters for the compiler, or an empty list for all Java source files}. + * The filter patterns are described in {@link java.nio.file.FileSystem#getPathMatcher(String)}. + * If no syntax is specified, the default syntax is "glob". + */ + protected abstract Set getIncludes(); - // ---------------------------------------------------------------------- - // Create the compiler configuration - // ---------------------------------------------------------------------- + /** + * {@return the exclusion filters for the compiler, or an empty list if none}. + * The filter patterns are described in {@link java.nio.file.FileSystem#getPathMatcher(String)}. + * If no syntax is specified, the default syntax is "glob". + */ + protected abstract Set getExcludes(); - CompilerConfiguration compilerConfiguration = new CompilerConfiguration(); + /** + * {@return the exclusion filters for the incremental calculation}. + * Updated source files, if excluded by this filter, will not cause the project to be rebuilt. + * + * @see SourceFile#ignoreModification + */ + protected abstract Set getIncrementalExcludes(); - compilerConfiguration.setOutputLocation( - getOutputDirectory().toAbsolutePath().toString()); + /** + * {@return the destination directory (or class output directory) for class files}. + * This directory will be given to the {@code -d} Java compiler option. + */ + @Nonnull + protected abstract Path getOutputDirectory(); - compilerConfiguration.setOptimize(optimize); + /** + * {@return the {@code --source} argument for the Java compiler}. + * The default implementation returns the {@link #source} value. + */ + @Nullable + protected String getSource() { + return source; + } - compilerConfiguration.setDebug(debug); + /** + * {@return the {@code --target} argument for the Java compiler}. + * The default implementation returns the {@link #target} value. + */ + @Nullable + protected String getTarget() { + return target; + } - compilerConfiguration.setDebugFileName(getDebugFileName()); + /** + * {@return the {@code --release} argument for the Java compiler}. + * The default implementation returns the {@link #release} value. + */ + @Nullable + protected String getRelease() { + return release; + } - compilerConfiguration.setImplicitOption(implicit); + /** + * {@return the path where to place generated source files created by annotation processing}. + */ + @Nullable + protected abstract Path getGeneratedSourcesDirectory(); - if (debug && StringUtils.isNotEmpty(debuglevel)) { - String[] split = StringUtils.split(debuglevel, ","); - for (String aSplit : split) { - if (!(aSplit.equalsIgnoreCase("none") - || aSplit.equalsIgnoreCase("lines") - || aSplit.equalsIgnoreCase("vars") - || aSplit.equalsIgnoreCase("source"))) { - throw new IllegalArgumentException("The specified debug level: '" + aSplit + "' is unsupported. " - + "Legal values are 'none', 'lines', 'vars', and 'source'."); - } + /** + * {@return whether the sources contain at least one {@code module-info.java} file}. + * Note that the sources may contain more than one {@code module-info.java} file + * if compiling a project with Module Source Hierarchy. + * + *

The test compiler overrides this method for checking the existence of the + * the {@code module-info.class} file in the main output directory instead.

+ * + * @param roots root directories of the sources to compile + * @throws IOException if this method needed to read a module descriptor and failed + */ + boolean hasModuleDeclaration(final List roots) throws IOException { + for (SourceDirectory root : roots) { + if (root.getModuleInfo().isPresent()) { + return true; } - compilerConfiguration.setDebugLevel(debuglevel); } + return false; + } - compilerConfiguration.setParameters(parameters); - - compilerConfiguration.setEnablePreview(enablePreview); - - compilerConfiguration.setVerbose(verbose); - - compilerConfiguration.setShowWarnings(showWarnings); - - compilerConfiguration.setFailOnWarning(failOnWarning); - - compilerConfiguration.setShowDeprecation(showDeprecation); - - compilerConfiguration.setSourceVersion(getSource()); + /** + * Adds dependencies others than the ones declared in POM file. + * The typical case is the compilation of tests, which depends on the main compilation outputs. + * The default implementation does nothing. + * + * @param addTo where to add dependencies + * @param hasModuleDeclaration whether the main sources have or should have a {@code module-info} file + * @throws IOException if this method needs to walk through directories and that operation failed + */ + protected void addImplicitDependencies(Map> addTo, boolean hasModuleDeclaration) + throws IOException { + // Nothing to add in a standard build of main classes. + } - compilerConfiguration.setTargetVersion(getTarget()); + /** + * Adds options for declaring the source directories. The way to declare those directories depends on whether + * we are compiling the main classes (in which case the {@code --source-path} or {@code --module-source-path} + * options may be used) or the test classes (in which case the {@code --patch-module} option may be used). + * + * @param addTo the collection of source paths to augment + * @param compileSourceRoots the source paths to eventually adds to the {@code toAdd} map + * @throws IOException if this method needs to read a module descriptor and this operation failed + */ + void addSourceDirectories(Map> addTo, List compileSourceRoots) + throws IOException { + // No need to specify --source-path at this time, as it is for additional sources. + } - compilerConfiguration.setReleaseVersion(getRelease()); + /** + * Generates options for handling the given dependencies. + * This method should do nothing when compiling the main classes, because the {@code module-info.java} file + * should contain all the required configuration. However, this method may need to add some {@code -add-reads} + * options when compiling the test classes. + * + * @param dependencies the project dependencies + * @param addTo where to add the options + * @throws IOException if the module information of a dependency cannot be read + */ + protected void addModuleOptions(DependencyResolverResult dependencies, Options addTo) throws IOException {} - compilerConfiguration.setProc(proc); + /** + * {@return the file where to dump the command-line when debug logging is enabled or when the compilation failed}. + * For example, if the value is {@code "javac"}, then the Java compiler can be launched + * from the command-line by typing {@code javac @target/javac.args}. + * The debug file will contain the compiler options together with the list of source files to compile. + * + *

Note: debug logging should not be confused with the {@link #debug} flag.

+ */ + @Nullable + protected abstract String getDebugFileName(); - Path generatedSourcesDirectory = getGeneratedSourcesDirectory(); - compilerConfiguration.setGeneratedSourcesDirectory( - generatedSourcesDirectory != null - ? generatedSourcesDirectory.toFile().getAbsoluteFile() - : null); + /** + * {@return the debug file name with its path, or null if none}. + */ + final Path getDebugFilePath() { + String filename = getDebugFileName(); + if (filename == null || filename.isBlank()) { + return null; + } + // Do not use `this.getOutputDirectory()` because it may be deeper in `classes/META-INF/versions/`. + return Path.of(project.getBuild().getOutputDirectory()).resolveSibling(filename); + } - if (generatedSourcesDirectory != null) { - if (!Files.exists(generatedSourcesDirectory)) { - try { - Files.createDirectories(generatedSourcesDirectory); - } catch (IOException e) { - throw new MojoException("Unable to create directory: " + generatedSourcesDirectory, e); + /** + * Runs the Java compiler. + * + * @throws MojoException if the compiler cannot be run + */ + @Override + public void execute() throws MojoException { + JavaCompiler compiler = compiler(); + Options compilerConfiguration = acceptParameters(compiler); + try { + compile(compiler, compilerConfiguration); + } catch (RuntimeException e) { + String message = e.getLocalizedMessage(); + if (message == null) { + message = e.getClass().getSimpleName(); + } else if (e instanceof MojoException) { + int s = message.indexOf(System.lineSeparator()); + if (s >= 0) { + message = message.substring(0, s); // Log only the first line. } } - - Path generatedSourcesPath = generatedSourcesDirectory.toAbsolutePath(); - - compileSourceRoots.add(generatedSourcesPath); - - ProjectScope scope = isTestCompile() ? ProjectScope.TEST : ProjectScope.MAIN; - - getLog().debug("Adding " + generatedSourcesPath + " to " + scope.id() + "-compile source roots:\n " - + StringUtils.join( - projectManager.getCompileSourceRoots(project, scope).iterator(), "\n ")); - - projectManager.addCompileSourceRoot(project, scope, generatedSourcesPath); - - getLog().debug("New " + scope.id() + "-compile source roots:\n " - + StringUtils.join( - projectManager.getCompileSourceRoots(project, scope).iterator(), "\n ")); + MessageBuilder mb = messageBuilderFactory + .builder() + .strong("COMPILATION ERROR: ") + .a(message); + // Do not log stack trace for `CompilationFailureException` because they are not unexpected. + logger.error(mb.toString(), e instanceof CompilationFailureException ? null : e); + if (tipForCommandLineCompilation != null) { + logger.info(tipForCommandLineCompilation); + tipForCommandLineCompilation = null; + } + if (failOnError) { + throw e; + } + } catch (IOException e) { + logger.error("I/O error while compiling the project.", e); + throw new CompilationFailureException("I/O error while compiling the project.", e); } + } - compilerConfiguration.setSourceLocations( - compileSourceRoots.stream().map(Path::toString).collect(Collectors.toList())); - - compilerConfiguration.setAnnotationProcessors(annotationProcessors); - - compilerConfiguration.setProcessorPathEntries(resolveProcessorPathEntries()); - - compilerConfiguration.setSourceEncoding(encoding); - - compilerConfiguration.setFork(fork); - - if (fork) { - if (!StringUtils.isEmpty(meminitial)) { - String value = getMemoryValue(meminitial); - - if (value != null) { - compilerConfiguration.setMeminitial(value); - } else { - getLog().info("Invalid value for meminitial '" + meminitial + "'. Ignoring this option."); + /** + * {@return the compiler to use for compiling the code}. + * If {@link #fork} is {@code true}, the returned compiler will be a wrapper for the command line. + * Otherwise it will be the compiler identified by {@link #compilerId} if a value was supplied, + * or the standard compiler provided with the Java platform otherwise. + * + * @throws MojoException if no compiler was found + */ + private JavaCompiler compiler() throws MojoException { + /* + * Use the `compilerId` as identifier for toolchains. + * I.e, we assume that `compilerId` is also the name of the executable binary. + */ + getToolchain().ifPresent((tc) -> { + logger.info("Toolchain in maven-compiler-plugin is \"" + tc + "\"."); + if (executable != null) { + logger.warn( + "Toolchains are ignored because the 'executable' parameter is set to \"" + executable + "\"."); + } else { + fork = true; + if (compilerId == null) { + compilerId = DEFAULT_EXECUTABLE; } + // TODO somehow shaky dependency between compilerId and tool executable. + executable = tc.findTool(compilerId); } - - if (!StringUtils.isEmpty(maxmem)) { - String value = getMemoryValue(maxmem); - - if (value != null) { - compilerConfiguration.setMaxmem(value); - } else { - getLog().info("Invalid value for maxmem '" + maxmem + "'. Ignoring this option."); + }); + if (fork) { + if (executable == null) { + executable = DEFAULT_EXECUTABLE; + } + return new ForkedCompiler(this); + } + /* + * Search a `javax.tools.JavaCompiler` having a name matching the specified `compilerId`. + * This is done before other code that can cause the mojo to return before the lookup is + * done, possibly resulting in misconfigured POMs still building. If no `compilerId` was + * specified, then the Java compiler bundled with the JDK is used (it may be absent). + */ + if (logger.isDebugEnabled()) { + logger.debug( + "Using " + (compilerId != null ? ("compiler \"" + compilerId + '"') : "system compiler") + '.'); + } + if (compilerId == null) { + compilerId = DEFAULT_EXECUTABLE; + final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + if (compiler != null) { + return compiler; + } + } else { + for (JavaCompiler t : ServiceLoader.load(JavaCompiler.class)) { + if (compilerId.equals(t.name())) { + return t; } } } + throw new CompilationFailureException("No such \"" + compilerId + "\" compiler."); + } - compilerConfiguration.setExecutable(executable); - - compilerConfiguration.setWorkingDirectory(basedir.toFile()); - - compilerConfiguration.setCompilerVersion(compilerVersion); - - compilerConfiguration.setBuildDirectory(buildDirectory.toFile()); - - compilerConfiguration.setOutputFileName(outputFileName); - - if (CompilerConfiguration.CompilerReuseStrategy.AlwaysNew.getStrategy().equals(this.compilerReuseStrategy)) { - compilerConfiguration.setCompilerReuseStrategy(CompilerConfiguration.CompilerReuseStrategy.AlwaysNew); - } else if (CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy() - .equals(this.compilerReuseStrategy)) { - if (getRequestThreadCount() > 1) { - if (!skipMultiThreadWarning) { - getLog().warn("You are in a multi-thread build and compilerReuseStrategy is set to reuseSame." - + " This can cause issues in some environments (os/jdk)!" - + " Consider using reuseCreated strategy." - + System.lineSeparator() - + "If your env is fine with reuseSame, you can skip this warning with the " - + "configuration field skipMultiThreadWarning " - + "or -Dmaven.compiler.skipMultiThreadWarning=true"); - } + /** + * Parses the parameters declared in the MOJO. + * + * @param compiler the tools to use for verifying the validity of options + * @return the options after validation + */ + protected Options acceptParameters(final OptionChecker compiler) { + /* + * Options to provide to the compiler, excluding all kinds of path (source files, destination directory, + * class-path, module-path, etc.). Some options are validated by Maven in addition of being validated by + * the compiler. In those cases, the validation by the compiler is done before the validation by Maven. + * For example, Maven will check for illegal values in the "-g" option only if the compiler rejected + * the fully formatted option (e.g. "-g:vars,lines") that we provided to it. + */ + boolean targetOrReleaseSet; + final var compilerConfiguration = new Options(compiler, logger); + compilerConfiguration.addIfNonBlank("--source", getSource()); + targetOrReleaseSet = compilerConfiguration.addIfNonBlank("--target", getTarget()); + targetOrReleaseSet |= compilerConfiguration.addIfNonBlank("--release", getRelease()); + if (!targetOrReleaseSet && !isTestCompile) { + MessageBuilder mb = messageBuilderFactory + .builder() + .a("No explicit value set for --release or --target. " + + "To ensure the same result in different environments, please add") + .newline() + .newline(); + writePlugin(mb, "release", String.valueOf(Runtime.version().feature())); + logger.warn(mb.build()); + } + compilerConfiguration.addIfTrue("--enable-preview", enablePreview); + compilerConfiguration.addComaSeparated("-proc", proc, List.of("none", "only", "full"), null); + if (annotationProcessors != null) { + var list = new StringJoiner(","); + for (String p : annotationProcessors) { + list.add(p); } - compilerConfiguration.setCompilerReuseStrategy(CompilerConfiguration.CompilerReuseStrategy.ReuseSame); + compilerConfiguration.addIfNonBlank("-processor", list.toString()); + } + compilerConfiguration.addComaSeparated("-implicit", implicit, List.of("none", "class"), null); + compilerConfiguration.addIfTrue("-parameters", parameters); + compilerConfiguration.addIfTrue("-Xpkginfo:always", createMissingPackageInfoClass); + if (debug) { + compilerConfiguration.addComaSeparated( + "-g", + debuglevel, + List.of("lines", "vars", "source", "all", "none"), + (options) -> Arrays.asList(options).contains("all") ? new String[0] : options); } else { - - compilerConfiguration.setCompilerReuseStrategy(CompilerConfiguration.CompilerReuseStrategy.ReuseCreated); + compilerConfiguration.addIfTrue("-g:none", true); } + compilerConfiguration.addIfNonBlank("--module-version", moduleVersion); + compilerConfiguration.addIfTrue("-deprecation", showDeprecation); + compilerConfiguration.addIfTrue("-nowarn", !showWarnings); + compilerConfiguration.addIfTrue("-Werror", failOnWarning); + compilerConfiguration.addIfTrue("-verbose", verbose); + if (fork) { + compilerConfiguration.addMemoryValue("-J-Xms", "meminitial", meminitial, SUPPORT_LEGACY); + compilerConfiguration.addMemoryValue("-J-Xmx", "maxmem", maxmem, SUPPORT_LEGACY); + } + return compilerConfiguration; + } - getLog().debug("CompilerReuseStrategy: " - + compilerConfiguration.getCompilerReuseStrategy().getStrategy()); - - compilerConfiguration.setForceJavacCompilerUse(forceLegacyJavacApi); - - boolean canUpdateTarget; - - IncrementalBuildHelper incrementalBuildHelper = null; - - final Set sources; - - if (useIncrementalCompilation) { - getLog().debug("useIncrementalCompilation enabled"); - try { - canUpdateTarget = compiler.canUpdateTarget(compilerConfiguration); - - sources = getCompileSources(compiler, compilerConfiguration); - - preparePaths(sources); - - incrementalBuildHelper = - new IncrementalBuildHelper(mojoStatusPath, sources, buildDirectory, getOutputDirectory()); - - // Strategies used to detect modifications. - boolean cleanState = isCleanState(incrementalBuildHelper); - if (!cleanState) { - List added = new ArrayList<>(); - List removed = new ArrayList<>(); - boolean immutableOutputFile = compiler.getCompilerOutputStyle() - .equals(CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES) - && !canUpdateTarget; - boolean dependencyChanged = isDependencyChanged(); - boolean sourceChanged = isSourceChanged(compilerConfiguration, compiler); - boolean inputFileTreeChanged = incrementalBuildHelper.inputFileTreeChanged(added, removed); - // CHECKSTYLE_OFF: LineLength - if (immutableOutputFile || dependencyChanged || sourceChanged || inputFileTreeChanged) - // CHECKSTYLE_ON: LineLength - { - String cause = immutableOutputFile - ? "immutable single output file" - : (dependencyChanged - ? "changed dependency" - : (sourceChanged ? "changed source code" : "added or removed source files")); - getLog().info("Recompiling the module because of " + cause + "."); - if (showCompilationChanges) { - for (String fileAdded : added) { - getLog().info("\t+ " + fileAdded); - } - for (String fileRemoved : removed) { - getLog().info("\t- " + fileRemoved); - } - } - - compilerConfiguration.setSourceFiles( - sources.stream().map(Path::toFile).collect(Collectors.toSet())); - } else { - getLog().info("Nothing to compile - all classes are up to date."); + /** + * Subdivides a compilation unit into one or more compilation tasks. A compilation unit may, for example, + * compile the source files for a specific Java release in a multi-release project. Normally, such unit maps + * to exactly one compilation task. However, it is sometime useful to split a compilation unit into smaller tasks, + * usually as a workaround for deprecated practices such as overwriting the main {@code module-info} in the tests. + * In the latter case, we need to compile the test {@code module-info} separately, before the other test classes. + */ + CompilationTaskSources[] toCompilationTasks(final SourcesForRelease unit) { + return new CompilationTaskSources[] {new CompilationTaskSources(unit.files)}; + } - return; - } + /** + * Runs the compiler. + * + * @param compiler the compiler + * @param compilerConfiguration options to provide to the compiler + * @throws IOException if an input file cannot be read + * @throws MojoException if the compilation failed + */ + @SuppressWarnings({"checkstyle:MethodLength", "checkstyle:AvoidNestedBlocks"}) + private void compile(final JavaCompiler compiler, final Options compilerConfiguration) throws IOException { + final EnumSet incAspects; + if (useIncrementalCompilation != null) { + incAspects = useIncrementalCompilation + ? EnumSet.of( + IncrementalBuild.Aspect.SOURCES, + IncrementalBuild.Aspect.ADDITIONS, + IncrementalBuild.Aspect.DEPENDENCIES) + : EnumSet.of(IncrementalBuild.Aspect.CLASSES); + } else { + incAspects = IncrementalBuild.Aspect.parse(incrementalCompilation); + } + /* + * Get the root directories of the Java source files to compile, excluding empty directories. + * The list needs to be modifiable for allowing the addition of generated source directories. + * Then get the list of all source files to compile. + * + * Note that we perform this step after processing compiler arguments, because this block may + * skip the build if there is no source code to compile. We want arguments to be verified first + * in order to warn about possible configuration problems. + */ + List sourceFiles = List.of(); + final Path outputDirectory = Files.createDirectories(getOutputDirectory()); + final List compileSourceRoots = + SourceDirectory.fromPaths(getCompileSourceRoots(), outputDirectory); + final boolean hasModuleDeclaration; + if (incAspects.contains(IncrementalBuild.Aspect.MODULES)) { + for (SourceDirectory root : compileSourceRoots) { + if (root.moduleName == null) { + throw new CompilationFailureException("The value can be \"modules\" " + + "only if all source directories are Java modules."); } - } catch (CompilerException e) { - throw new MojoException("Error while computing stale sources.", e); } + if (!(getIncludes().isEmpty() + && getExcludes().isEmpty() + && getIncrementalExcludes().isEmpty())) { + throw new CompilationFailureException("Include and exclude filters cannot be specified " + + "when is set to \"modules\"."); + } + hasModuleDeclaration = true; } else { - getLog().debug("useIncrementalCompilation disabled"); - - Set staleSources; - try { - staleSources = - computeStaleSources(compilerConfiguration, compiler, getSourceInclusionScanner(staleMillis)); - - canUpdateTarget = compiler.canUpdateTarget(compilerConfiguration); - - if (compiler.getCompilerOutputStyle().equals(CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES) - && !canUpdateTarget) { - getLog().info("RESCANNING!"); - // TODO: This second scan for source files is sub-optimal - String inputFileEnding = compiler.getInputFileEnding(compilerConfiguration); - - staleSources = computeStaleSources( - compilerConfiguration, compiler, getSourceInclusionScanner(inputFileEnding)); + var filter = new PathFilter(getIncludes(), getExcludes(), getIncrementalExcludes()); + sourceFiles = filter.walkSourceFiles(compileSourceRoots); + if (sourceFiles.isEmpty()) { + String message = "No sources to compile."; + try { + Files.delete(outputDirectory); + } catch (DirectoryNotEmptyException e) { + message += " However, the output directory is not empty."; } - - } catch (CompilerException e) { - throw new MojoException("Error while computing stale sources.", e); - } - - if (staleSources.isEmpty()) { - getLog().info("Nothing to compile - all classes are up to date."); - + logger.info(message); return; } - - compilerConfiguration.setSourceFiles(staleSources); - - try { - // MCOMPILER-366: if sources contain the module-descriptor it must be used to define the modulepath - sources = getCompileSources(compiler, compilerConfiguration); - - if (getLog().isDebugEnabled()) { - getLog().debug("#sources: " + sources.size()); - for (Path file : sources) { - getLog().debug(file.toString()); - } - } - - preparePaths(sources); - } catch (CompilerException e) { - throw new MojoException("Error while computing stale sources.", e); + switch (project.getPackaging().type().id()) { + case Type.CLASSPATH_JAR: + hasModuleDeclaration = false; + break; + case Type.MODULAR_JAR: + hasModuleDeclaration = true; + break; + default: + hasModuleDeclaration = hasModuleDeclaration(compileSourceRoots); + break; } } - - // Dividing pathElements of classPath and modulePath is based on sourceFiles - compilerConfiguration.setClasspathEntries(getClasspathElements()); - - compilerConfiguration.setModulepathEntries(getModulepathElements()); - - compilerConfiguration.setIncludes(getIncludes()); - - compilerConfiguration.setExcludes(getExcludes()); - - String effectiveCompilerArgument = getCompilerArgument(); - - if ((effectiveCompilerArgument != null) || (compilerArgs != null)) { - if (!StringUtils.isEmpty(effectiveCompilerArgument)) { - compilerConfiguration.addCompilerCustomArgument(effectiveCompilerArgument, null); - } - if (compilerArgs != null) { - for (String arg : compilerArgs) { - compilerConfiguration.addCompilerCustomArgument(arg, null); + final Set generatedSourceDirectories = addGeneratedSourceDirectory(getGeneratedSourcesDirectory()); + /* + * Get the dependencies. If the module-path contains any file-based dependency + * and this MOJO is compiling the main code, then a warning will be logged. + * + * NOTE: this method assumes that the map and the list values are modifiable. + * This is true with org.apache.maven.internal.impl.DefaultDependencyResolverResult, + * but may not be true in the general case. To be safe, we should perform a deep copy. + * But it would be unnecessary copies in most cases. + */ + final Map> dependencies = resolveDependencies(compilerConfiguration, hasModuleDeclaration); + resolveProcessorPathEntries(dependencies); + addImplicitDependencies(dependencies, hasModuleDeclaration); + /* + * Verify if a dependency changed since the build started, or if a source file changed since the last build. + * If there is no change, we can skip the build. If a dependency or the source tree has changed, we may + * conservatively clean before rebuild. + */ + { // For reducing the scope of the Boolean flags. + final boolean checkSources = incAspects.contains(IncrementalBuild.Aspect.SOURCES); + final boolean checkClasses = incAspects.contains(IncrementalBuild.Aspect.CLASSES); + final boolean checkDepends = incAspects.contains(IncrementalBuild.Aspect.DEPENDENCIES); + final boolean checkOptions = incAspects.contains(IncrementalBuild.Aspect.OPTIONS); + final boolean rebuildOnAdd = incAspects.contains(IncrementalBuild.Aspect.ADDITIONS); + if (checkSources | checkClasses | checkDepends | checkOptions) { + final var incrementalBuild = new IncrementalBuild(this, sourceFiles); + String causeOfRebuild = null; + if (checkSources) { + // Should be first, because this method deletes output files of removed sources. + causeOfRebuild = incrementalBuild.inputFileTreeChanges(staleMillis, rebuildOnAdd); } - } - } - - // ---------------------------------------------------------------------- - // Dump configuration - // ---------------------------------------------------------------------- - if (getLog().isDebugEnabled()) { - getLog().debug("Classpath:"); - - for (String s : getClasspathElements()) { - getLog().debug(" " + s); - } - - if (!getModulepathElements().isEmpty()) { - getLog().debug("Modulepath:"); - for (String s : getModulepathElements()) { - getLog().debug(" " + s); + if (checkClasses && causeOfRebuild == null) { + causeOfRebuild = incrementalBuild.markNewOrModifiedSources(staleMillis, rebuildOnAdd); } - } - - getLog().debug("Source roots:"); - - for (Path root : getCompileSourceRoots()) { - getLog().debug(" " + root); - } - - try { - if (fork) { - if (compilerConfiguration.getExecutable() != null) { - getLog().debug("Executable: "); - getLog().debug(" " + compilerConfiguration.getExecutable()); + if (checkDepends && causeOfRebuild == null) { + if (fileExtensions == null || fileExtensions.isEmpty()) { + fileExtensions = List.of("class", "jar"); } + causeOfRebuild = incrementalBuild.dependencyChanges(dependencies.values(), fileExtensions); } - - String[] cl = compiler.createCommandLine(compilerConfiguration); - if (cl != null && cl.length > 0 && getLog().isDebugEnabled()) { - getLog().debug("Command line options:"); - getLog().debug(String.join(" ", cl)); - } - } catch (CompilerException ce) { - getLog().debug("Compilation error", ce); - } - } - - List jpmsLines = new ArrayList<>(); - - // See http://openjdk.java.net/jeps/261 - final List runtimeArgs = Arrays.asList( - "--upgrade-module-path", "--add-exports", "--add-reads", "--add-modules", "--limit-modules"); - - // Custom arguments are all added as keys to an ordered Map - Iterator> entryIter = - compilerConfiguration.getCustomCompilerArgumentsEntries().iterator(); - while (entryIter.hasNext()) { - Map.Entry entry = entryIter.next(); - - if (runtimeArgs.contains(entry.getKey())) { - jpmsLines.add(entry.getKey()); - - String value = entry.getValue(); - if (value == null) { - entry = entryIter.next(); - value = entry.getKey(); + int optionsHash = 0; // Hash code collision may happen, this is a "best effort" only. + if (checkOptions) { + optionsHash = compilerConfiguration.options.hashCode(); + if (causeOfRebuild == null) { + causeOfRebuild = incrementalBuild.optionChanges(optionsHash); + } } - jpmsLines.add(value); - } else if ("--patch-module".equals(entry.getKey())) { - String value = entry.getValue(); - if (value == null) { - entry = entryIter.next(); - value = entry.getKey(); + if (causeOfRebuild != null) { + logger.info(causeOfRebuild); + } else { + sourceFiles = incrementalBuild.getModifiedSources(); + if (IncrementalBuild.isEmptyOrIgnorable(sourceFiles)) { + logger.info("Nothing to compile - all classes are up to date."); + return; + } } - - String[] values = value.split("="); - - String patchModule = values[0] + "="; - - Set sourceRoots = new HashSet<>(getCompileSourceRoots()); - - String[] files = values[1].split(PS); - Set patchModules = new LinkedHashSet<>(files.length, 1); - - for (String file : files) { - Path filePath = Paths.get(file); - if (getOutputDirectory().equals(filePath)) { - patchModules.add("_"); // this jar - } else if (getOutputDirectory().startsWith(filePath)) { - // multirelease, can be ignored + if (checkSources | checkDepends | checkOptions) { + incrementalBuild.writeCache(optionsHash, checkSources); + } + } + } + if (logger.isDebugEnabled()) { + int n = sourceFiles.size(); + @SuppressWarnings("checkstyle:MagicNumber") + final var sb = + new StringBuilder(n * 40).append("Compiling ").append(n).append(" source files:"); + for (SourceFile file : sourceFiles) { + sb.append(System.lineSeparator()).append(" ").append(file); + } + logger.debug(sb); + } + /* + * If we are compiling the test classes of a modular project, add the `--patch-modules` options. + * Note that those options are handled like dependencies, because they will need to be set using + * the `javax.tools.StandardLocation` API. + */ + if (hasModuleDeclaration) { + addSourceDirectories(dependencies, compileSourceRoots); + } + /* + * Create a `JavaFileManager`, configure all paths (dependencies and sources), then run the compiler. + * The Java file manager has a cache, so it needs to be disposed after the compilation is completed. + * The same `JavaFileManager` may be reused for many compilation units (e.g. multi-releases) before + * disposal in order to reuse its cache. + */ + boolean success = true; + Exception failureCause = null; + final var unresolvedPaths = new ArrayList(); + final var compilerOutput = new StringWriter(); + final var listener = new DiagnosticLogger(logger, messageBuilderFactory, LOCALE); + try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(listener, LOCALE, charset())) { + /* + * Dispatch all dependencies on the kind of paths determined by `DependencyResolver`: + * class-path, module-path, annotation processor class-path/module-path, etc. + * This configuration will be unchanged for all compilation units. + */ + List patchedOptions = compilerConfiguration.options; // Workaround for JDK-TBD. + for (Map.Entry> entry : dependencies.entrySet()) { + List paths = entry.getValue(); + PathType key = entry.getKey(); // TODO: replace by pattern matching in Java 21. + if (key instanceof JavaPathType type) { + Optional location = type.location(); + if (location.isPresent()) { // Cannot use `Optional.ifPresent(…)` because of checked IOException. + fileManager.setLocationFromPaths(location.get(), paths); continue; - } else if (sourceRoots.contains(filePath)) { - patchModules.add("_"); // this jar - } else { - JavaModuleDescriptor descriptor = getPathElements().get(file); - - if (descriptor == null) { - if (Files.isDirectory(filePath)) { - patchModules.add(file); - } else { - getLog().warn("Can't locate " + file); + } + } else if (key instanceof JavaPathType.Modular type) { + Optional location = type.rawType().location(); + if (location.isPresent()) { + try { + fileManager.setLocationForModule(location.get(), type.moduleName(), paths); + } catch (UnsupportedOperationException e) { // Workaround forJDK-TBD. + if (patchedOptions == compilerConfiguration.options) { + patchedOptions = new ArrayList<>(patchedOptions); } - } else if (!values[0].equals(descriptor.name())) { - patchModules.add(descriptor.name()); + patchedOptions.addAll(Arrays.asList(type.option(paths))); } + continue; } } - - if (!patchModules.isEmpty()) { - jpmsLines.add("--patch-module"); - jpmsLines.add(patchModule + String.join(", ", patchModules)); + unresolvedPaths.addAll(paths); + } + if (!unresolvedPaths.isEmpty()) { + var sb = new StringBuilder("Cannot determine where to place the following artifacts:"); + for (Path p : unresolvedPaths) { + sb.append(System.lineSeparator()).append(" - ").append(p); } + logger.warn(sb); } - } - - if (!jpmsLines.isEmpty()) { - Path jpmsArgs = getOutputDirectory().toAbsolutePath().resolve("META-INF/jpms.args"); - try { - Files.createDirectories(jpmsArgs.getParent()); - - Files.write(jpmsArgs, jpmsLines, Charset.defaultCharset()); - } catch (IOException e) { - getLog().warn(e.getMessage()); + /* + * Configure all paths to source files. Each compilation unit has its own set of source. + * More than one compilation unit may exist in the case of a multi-releases project. + * Units are compiled in the order of the release version, with base compiled first. + */ + if (!generatedSourceDirectories.isEmpty()) { + fileManager.setLocationFromPaths(StandardLocation.SOURCE_OUTPUT, generatedSourceDirectories); } - } - - // ---------------------------------------------------------------------- - // Compile! - // ---------------------------------------------------------------------- - - if (StringUtils.isEmpty(compilerConfiguration.getSourceEncoding())) { - getLog().warn("File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING - + ", i.e. build is platform dependent!"); - } - - CompilerResult compilerResult; - - if (useIncrementalCompilation) { - incrementalBuildHelper.beforeRebuildExecution(); - getLog().debug("incrementalBuildHelper#beforeRebuildExecution"); - } - - try { - compilerResult = compiler.performCompile(compilerConfiguration); - } catch (Exception e) { - // TODO: don't catch Exception - throw new MojoException("Fatal error compiling", e); - } - - if (createMissingPackageInfoClass - && compilerResult.isSuccess() - && compiler.getCompilerOutputStyle() == CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE) { - try { - SourceMapping sourceMapping = getSourceMapping(compilerConfiguration, compiler); - createMissingPackageInfoClasses(compilerConfiguration, sourceMapping, sources); - } catch (Exception e) { - getLog().warn("Error creating missing package info classes", e); + compile: + for (SourcesForRelease unit : SourcesForRelease.groupByReleaseAndModule(sourceFiles)) { + for (Map.Entry> root : unit.roots.entrySet()) { + String moduleName = root.getKey(); + if (moduleName.isBlank()) { + fileManager.setLocationFromPaths(StandardLocation.SOURCE_PATH, root.getValue()); + } else { + fileManager.setLocationForModule( + StandardLocation.MODULE_SOURCE_PATH, moduleName, root.getValue()); + } + } + /* + * TODO: for all compilations after the base one, add the base to class-path or module-path. + * TODO: prepend META-INF/version/## to output directory if needed. + */ + fileManager.setLocationFromPaths(StandardLocation.CLASS_OUTPUT, Set.of(outputDirectory)); + /* + * Compile the source files now. The following loop should be executed exactly once. + * It may be executed twice when compiling test classes overwriting the `module-info`, + * in which case the `module-info` needs to be compiled separately from other classes. + * However, this is a deprecated practice. + */ + JavaCompiler.CompilationTask task; + for (CompilationTaskSources c : toCompilationTasks(unit)) { + Iterable sources = fileManager.getJavaFileObjectsFromPaths(c.files); + task = compiler.getTask(compilerOutput, fileManager, listener, patchedOptions, null, sources); + patchedOptions = compilerConfiguration.options; // Patched options shall be used only once. + success = c.compile(task); + if (!success) { + break compile; + } + } } - } - - if (outputTimestamp != null - && !outputTimestamp.isEmpty() - && (outputTimestamp.length() > 1 || Character.isDigit(outputTimestamp.charAt(0)))) { - // if Reproducible Builds mode, apply workaround - patchJdkModuleVersion(compilerResult, sources); - } - - if (useIncrementalCompilation) { - if (Files.exists(getOutputDirectory())) { - getLog().debug("incrementalBuildHelper#afterRebuildExecution"); - // now scan the same directory again and create a diff - incrementalBuildHelper.afterRebuildExecution(); + /* + * Post-compilation. + */ + listener.logSummary(); + } catch (UncheckedIOException e) { + success = false; + failureCause = e.getCause(); + } catch (Exception e) { + success = false; + failureCause = e; + } + /* + * The compilation errors or warnings should have already been reported by `DiagnosticLogger`. + * However, the compiler may have other messages not associated to a particular source file. + * For example, `ForkedCompiler` uses this writer if the compilation has been interrupted. + */ + String additionalMessage = compilerOutput.toString(); + if (!additionalMessage.isBlank()) { + if (success || failureCause != null) { // Keep the error level for the exception message. + logger.warn(additionalMessage); } else { - getLog().debug( - "skip incrementalBuildHelper#afterRebuildExecution as the output directory doesn't exist"); + logger.error(additionalMessage); } } - - List warnings = new ArrayList<>(); - List errors = new ArrayList<>(); - List others = new ArrayList<>(); - for (CompilerMessage message : compilerResult.getCompilerMessages()) { - if (message.getKind() == CompilerMessage.Kind.ERROR) { - errors.add(message); - } else if (message.getKind() == CompilerMessage.Kind.WARNING - || message.getKind() == CompilerMessage.Kind.MANDATORY_WARNING) { - warnings.add(message); + if (failureCause != null) { + String message = failureCause.getMessage(); + if (message != null) { + logger.error(message); } else { - others.add(message); + logger.error(failureCause); } } - - if (failOnError && !compilerResult.isSuccess()) { - for (CompilerMessage message : others) { - assert message.getKind() != CompilerMessage.Kind.ERROR - && message.getKind() != CompilerMessage.Kind.WARNING - && message.getKind() != CompilerMessage.Kind.MANDATORY_WARNING; - getLog().info(message.toString()); - } - if (!warnings.isEmpty()) { - getLog().info("-------------------------------------------------------------"); - getLog().warn("COMPILATION WARNING : "); - getLog().info("-------------------------------------------------------------"); - for (CompilerMessage warning : warnings) { - getLog().warn(warning.toString()); + /* + * In case of failure, or if debugging is enabled, dump the options to a file. + * By default, the file will have the ".args" extension. + */ + if (!success || logger.isDebugEnabled()) { + IOException suppressed = null; + try { + writeDebugFile(compilerConfiguration.options, dependencies, sourceFiles); + if (success && tipForCommandLineCompilation != null) { + logger.debug(tipForCommandLineCompilation); + tipForCommandLineCompilation = null; } - getLog().info(warnings.size() + ((warnings.size() > 1) ? " warnings " : " warning")); - getLog().info("-------------------------------------------------------------"); + } catch (IOException e) { + suppressed = e; } - - if (!errors.isEmpty()) { - getLog().info("-------------------------------------------------------------"); - getLog().error("COMPILATION ERROR : "); - getLog().info("-------------------------------------------------------------"); - for (CompilerMessage error : errors) { - getLog().error(error.toString()); + if (!success) { + var message = new StringBuilder(100) + .append("Cannot compile ") + .append(project.getId()) + .append(' ') + .append(isTestCompile ? "test" : "main") + .append(" classes."); + listener.firstError(failureCause).ifPresent((c) -> message.append(System.lineSeparator()) + .append("The first error is: ") + .append(c)); + var failure = new CompilationFailureException(message.toString(), failureCause); + if (suppressed != null) { + failure.addSuppressed(suppressed); } - getLog().info(errors.size() + ((errors.size() > 1) ? " errors " : " error")); - getLog().info("-------------------------------------------------------------"); - } - - if (!errors.isEmpty()) { - throw new CompilationFailureException(errors); - } else { - throw new CompilationFailureException(warnings); + throw failure; } - } else { - for (CompilerMessage message : compilerResult.getCompilerMessages()) { - switch (message.getKind()) { - case NOTE: - case OTHER: - getLog().info(message.toString()); - break; - - case ERROR: - getLog().error(message.toString()); - break; - - case MANDATORY_WARNING: - case WARNING: - default: - getLog().warn(message.toString()); - break; - } + if (suppressed != null) { + throw suppressed; } } - } - - private void createMissingPackageInfoClasses( - CompilerConfiguration compilerConfiguration, SourceMapping sourceMapping, Set sources) - throws InclusionScanException, IOException { - for (Path source : sources) { - String path = source.toString(); - if (path.endsWith(File.separator + "package-info.java")) { - for (Path rootPath : getCompileSourceRoots()) { - String root = rootPath.toString() + File.separator; - if (path.startsWith(root)) { - String rel = path.substring(root.length()); - Set files = sourceMapping.getTargetFiles( - getOutputDirectory().toFile(), rel); - for (File file : files) { - if (!file.exists()) { - File parentFile = file.getParentFile(); - - if (!parentFile.exists()) { - Files.createDirectories(parentFile.toPath()); - } - - byte[] bytes = generatePackage(compilerConfiguration, rel); - Files.write(file.toPath(), bytes); - } - } + /* + * Workaround for MCOMPILER-542, needed only if a modular project is compiled with a JDK older than Java 22. + * Note: a previous version used as an heuristic way to detect if Reproducible Build was enabled. This check + * has been removed because Reproducible Build are enabled by default in Maven now. + */ + if (!isVersionEqualOrNewer(compiler, "RELEASE_22")) { + Path moduleDescriptor = getOutputDirectory().resolve(MODULE_INFO + CLASS_FILE_SUFFIX); + if (Files.isRegularFile(moduleDescriptor)) { + try { + byte[] oridinal = Files.readAllBytes(moduleDescriptor); + byte[] modified = ByteCodeTransformer.patchJdkModuleVersion(oridinal, getRelease(), logger); + if (modified != null) { + Files.write(moduleDescriptor, modified); } + } catch (IOException ex) { + throw new MojoException("Error reading or writing " + MODULE_INFO + CLASS_FILE_SUFFIX, ex); } } } } - private byte[] generatePackage(CompilerConfiguration compilerConfiguration, String javaFile) { - int version = getOpcode(compilerConfiguration); - String internalPackageName = javaFile.substring(0, javaFile.length() - ".java".length()); - if (File.separatorChar != '/') { - internalPackageName = internalPackageName.replace(File.separatorChar, '/'); - } - ClassWriter cw = new ClassWriter(0); - cw.visit( - version, - Opcodes.ACC_SYNTHETIC | Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE, - internalPackageName, - null, - "java/lang/Object", - null); - cw.visitSource("package-info.java", null); - return cw.toByteArray(); - } - - private int getOpcode(CompilerConfiguration compilerConfiguration) { - String version = compilerConfiguration.getReleaseVersion(); - if (version == null) { - version = compilerConfiguration.getTargetVersion(); - if (version == null) { - version = "1.5"; - } - } - if (version.startsWith("1.")) { - version = version.substring(2); - } - int iVersion = Integer.parseInt(version); - if (iVersion < 2) { - throw new IllegalArgumentException("Unsupported java version '" + version + "'"); + /** + * Returns whether the given tool (usually the compiler) supports the given source version or newer versions. + * The specified source version shall be the name of one of the {@link SourceVersion} enumeration values. + * Note that a return value of {@code true} does not mean that the tool support that version, + * as it may be too old. This method is rather for checking whether a tool need to be patched. + */ + private static boolean isVersionEqualOrNewer(Tool tool, String sourceVersion) { + final SourceVersion requested; + try { + requested = SourceVersion.valueOf(sourceVersion); + } catch (IllegalArgumentException e) { + // The current tool is from a JDK older than the one for the requested source release. + return false; } - return iVersion - 2 + Opcodes.V1_2; - } - - protected boolean isTestCompile() { - return false; + return tool.getSourceVersions().stream().anyMatch((v) -> v.compareTo(requested) >= 0); } /** - * @return all source files for the compiler + * {@return the tool chain specified by the user in plugin parameters}. */ - private Set getCompileSources(Compiler compiler, CompilerConfiguration compilerConfiguration) - throws MojoException, CompilerException { - String inputFileEnding = compiler.getInputFileEnding(compilerConfiguration); - if (StringUtils.isEmpty(inputFileEnding)) { - // see MCOMPILER-199 GroovyEclipseCompiler doesn't set inputFileEnding - // so we can presume it's all files from the source directory - inputFileEnding = ".*"; - } - SourceInclusionScanner scanner = getSourceInclusionScanner(inputFileEnding); - - SourceMapping mapping = getSourceMapping(compilerConfiguration, compiler); - - scanner.addSourceMapping(mapping); - - Set compileSources = new HashSet<>(); - - for (Path sourceRoot : getCompileSourceRoots()) { - if (!Files.isDirectory(sourceRoot) - || sourceRoot.toFile().equals(compilerConfiguration.getGeneratedSourcesDirectory())) { - continue; - } - - try { - scanner.getIncludedSources(sourceRoot.toFile(), null).forEach(f -> compileSources.add(f.toPath())); - } catch (InclusionScanException e) { - throw new MojoException( - "Error scanning source root: '" + sourceRoot + "' for stale files to recompile.", e); + private Optional getToolchain() { + if (jdkToolchain != null) { + List tcs = toolchainManager.getToolchains(session, "jdk", jdkToolchain); + if (tcs != null && !tcs.isEmpty()) { + return Optional.of(tcs.get(0)); } } - - return compileSources; + return toolchainManager.getToolchainFromBuildContext(session, "jdk"); } - protected abstract Set getIncludes(); - - protected abstract Set getExcludes(); - /** - * @param compilerConfiguration - * @param compiler - * @return true if at least a single source file is newer than it's class file + * Returns the module name as declared in the given {@code module-info.java} source file. + * This approach is less reliable than reading the compiled {@code module-info.class} file, + * but is sometime needed when the compiled file is not yet available. + * + * @param source the source file to parse (may be null or not exist) + * @return the module name, or {@code null} if not found */ - private boolean isSourceChanged(CompilerConfiguration compilerConfiguration, Compiler compiler) - throws CompilerException, MojoException { - Set staleSources = - computeStaleSources(compilerConfiguration, compiler, getSourceInclusionScanner(staleMillis)); - - if (getLog().isDebugEnabled() || showCompilationChanges) { - for (File f : staleSources) { - if (showCompilationChanges) { - getLog().info("Stale source detected: " + f.getAbsolutePath()); - } else { - getLog().debug("Stale source detected: " + f.getAbsolutePath()); + final String parseModuleInfoName(Path source) throws IOException { + if (source != null && Files.exists(source)) { + Charset charset = charset(); + try (BufferedReader in = + (charset != null) ? Files.newBufferedReader(source, charset) : Files.newBufferedReader(source)) { + var tokenizer = new StreamTokenizer(in); + tokenizer.slashSlashComments(true); + tokenizer.slashStarComments(true); + int t; + while ((t = tokenizer.nextToken()) != StreamTokenizer.TT_EOF) { + if (t == StreamTokenizer.TT_WORD && "module".equals(tokenizer.sval)) { + do { + t = tokenizer.nextToken(); + } while (t == StreamTokenizer.TT_EOL); + if (t == StreamTokenizer.TT_WORD) { + return tokenizer.sval; + } + break; // Found a "module" keyword followed by something that we didn't recognized. + } } } } - return !staleSources.isEmpty(); + return null; } /** - * try to get thread count if a Maven 3 build, using reflection as the plugin must not be maven3 api dependent + * {@return all dependencies organized by the path types where to place them}. If the module-path contains + * any file-based dependency and this MOJO is compiling the main code, then a warning will be logged. * - * @return number of thread for this build or 1 if not multi-thread build + * @param compilerConfiguration where to add {@code --add-reads} options when compiling test classes + * @param hasModuleDeclaration whether to allow placement of dependencies on the module-path. */ - protected int getRequestThreadCount() { - return session.getDegreeOfConcurrency(); - } - - protected Instant getBuildStartTime() { - return session.getStartTime(); - } - - private String getMemoryValue(String setting) { - String value = null; - - // Allow '128' or '128m' - if (isDigits(setting)) { - value = setting + "m"; - } else if ((isDigits(setting.substring(0, setting.length() - 1))) - && (setting.toLowerCase().endsWith("m"))) { - value = setting; - } - return value; - } - - protected final Optional getToolchain() { - if (jdkToolchain != null) { - List tcs = toolchainManager.getToolchains(session, "jdk", jdkToolchain); - if (tcs != null && !tcs.isEmpty()) { - return Optional.of(tcs.get(0)); + private Map> resolveDependencies(Options compilerConfiguration, boolean hasModuleDeclaration) + throws IOException { + DependencyResolver resolver = session.getService(DependencyResolver.class); + if (resolver == null) { // Null value happen during tests, depending on the mock used. + return new LinkedHashMap<>(); // The caller needs a modifiable map. + } + var allowedTypes = EnumSet.of(JavaPathType.CLASSES, JavaPathType.PROCESSOR_CLASSES); + if (hasModuleDeclaration) { + allowedTypes.add(JavaPathType.MODULES); + allowedTypes.add(JavaPathType.PROCESSOR_MODULES); + } + DependencyResolverResult dependencies = resolver.resolve(DependencyResolverRequest.builder() + .session(session) + .project(project) + .requestType(DependencyResolverRequest.RequestType.RESOLVE) + .pathScope(isTestCompile ? PathScope.TEST_COMPILE : PathScope.MAIN_COMPILE) + .pathTypeFilter(allowedTypes) + .build()); + /* + * Report errors or warnings. If possible, we rethrow the first exception directly without + * wrapping in a `MojoException` for making the stack-trace a little bit easier to analyze. + */ + Exception exception = null; + for (Exception cause : dependencies.getExceptions()) { + if (exception != null) { + exception.addSuppressed(cause); + } else if (cause instanceof UncheckedIOException e) { + exception = e.getCause(); + } else if (cause instanceof RuntimeException || cause instanceof IOException) { + exception = cause; + } else { + exception = new CompilationFailureException("Cannot collect the compile-time dependencies.", cause); } } - return toolchainManager.getToolchainFromBuildContext(session, "jdk"); - } - - private boolean isDigits(String string) { - for (int i = 0; i < string.length(); i++) { - if (!Character.isDigit(string.charAt(i))) { - return false; + if (exception != null) { + if (exception instanceof IOException e) { + throw e; + } else { + throw (RuntimeException) exception; // A ClassCastException here would be a bug in above loop. } } - return true; - } - - private Set computeStaleSources( - CompilerConfiguration compilerConfiguration, Compiler compiler, SourceInclusionScanner scanner) - throws MojoException, CompilerException { - SourceMapping mapping = getSourceMapping(compilerConfiguration, compiler); - - Path outputDirectory; - CompilerOutputStyle outputStyle = compiler.getCompilerOutputStyle(); - if (outputStyle == CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES) { - outputDirectory = buildDirectory; - } else { - outputDirectory = getOutputDirectory(); - } - - scanner.addSourceMapping(mapping); - - Set staleSources = new HashSet<>(); - - for (Path sourceRoot : getCompileSourceRoots()) { - if (!Files.isDirectory(sourceRoot)) { - continue; - } - - try { - staleSources.addAll(scanner.getIncludedSources(sourceRoot.toFile(), outputDirectory.toFile())); - } catch (InclusionScanException e) { - throw new MojoException( - "Error scanning source root: \'" + sourceRoot + "\' for stale files to recompile.", e); + if (!isTestCompile) { + String warning = dependencies.warningForFilenameBasedAutomodules().orElse(null); + if (warning != null) { // Do not use Optional.ifPresent(…) for avoiding confusing source class name. + logger.warn(warning); } } - - return staleSources; - } - - private SourceMapping getSourceMapping(CompilerConfiguration compilerConfiguration, Compiler compiler) - throws CompilerException, MojoException { - CompilerOutputStyle outputStyle = compiler.getCompilerOutputStyle(); - - SourceMapping mapping; - if (outputStyle == CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE) { - mapping = new SuffixMapping( - compiler.getInputFileEnding(compilerConfiguration), - compiler.getOutputFileEnding(compilerConfiguration)); - } else if (outputStyle == CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES) { - mapping = new SingleTargetSourceMapping( - compiler.getInputFileEnding(compilerConfiguration), compiler.getOutputFile(compilerConfiguration)); - - } else { - throw new MojoException("Unknown compiler output style: '" + outputStyle + "'."); + /* + * Add `--add-reads` options when compiling the test classes. + * Nothing should be changed when compiling the main classes. + */ + if (hasModuleDeclaration) { + addModuleOptions(dependencies, compilerConfiguration); } - return mapping; + // TODO: to be safe, we should perform a deep clone here. + return dependencies.getDispatchedPaths(); } /** - * @todo also in ant plugin. This should be resolved at some point so that it does not need to - * be calculated continuously - or should the plugins accept empty source roots as is? + * Adds paths to the annotation processor dependencies. Paths are added to the list associated + * to the {@link JavaPathType#PROCESSOR_CLASSES} entry of given map, which should be modifiable. + * + *

Implementation note

+ * We rely on the fact that {@link org.apache.maven.internal.impl.DefaultDependencyResolverResult} creates + * modifiable instances of map and lists. This is a fragile assumption, but this method is deprecated anyway + * and may be removed in a future version. + * + * @param addTo the modifiable map and lists where to append more paths to annotation processor dependencies + * @throws MojoException if an error occurred while resolving the dependencies + * + * @deprecated Replaced by ordinary dependencies with {@code } element + * set to {@code proc}, {@code classpath-proc} or {@code modular-proc}. */ - private static List removeEmptyCompileSourceRoots(List compileSourceRootsList) { - if (compileSourceRootsList != null) { - return compileSourceRootsList.stream().filter(Files::exists).collect(Collectors.toList()); - } else { - return new ArrayList<>(); + @Deprecated(since = "4.0.0") + private void resolveProcessorPathEntries(Map> addTo) throws MojoException { + List dependencies = annotationProcessorPaths; + if (dependencies != null && !dependencies.isEmpty()) { + try { + List coords = dependencies.stream() + .map((coord) -> coord.toCoordinate(project, session)) + .toList(); + Session sessionWithRepo = + session.withRemoteRepositories(projectManager.getRemoteProjectRepositories(project)); + addTo.merge( + JavaPathType.PROCESSOR_CLASSES, + sessionWithRepo + .getService(DependencyResolver.class) + .resolve(DependencyResolverRequest.builder() + .session(sessionWithRepo) + .dependencies(coords) + .managedDependencies(project.getManagedDependencies()) + .requestType(DependencyResolverRequest.RequestType.RESOLVE) + .pathScope(PathScope.MAIN_RUNTIME) + .build()) + .getPaths(), + (oldPaths, newPaths) -> { + oldPaths.addAll(newPaths); + return oldPaths; + }); + } catch (MojoException e) { + throw e; + } catch (Exception e) { + throw new CompilationFailureException( + "Resolution of annotationProcessorPath dependencies failed: " + e.getMessage(), e); + } } } /** + * Ensures that the directory for generated sources exists, and adds it to the list of source directories + * known to the project manager. This is used for adding the output of annotation processor. + * The given directory should be the result of {@link #getGeneratedSourcesDirectory()}. * + * @param generatedSourcesDirectory the directory to add, or {@code null} if none + * @return the added directory in a singleton set, or an empty set if none + * @throws IOException if the directory cannot be created */ - protected boolean isCleanState(IncrementalBuildHelper ibh) { - Path mojoConfigBase; - try { - mojoConfigBase = ibh.getMojoStatusDirectory(); - } catch (MojoException e) { - // we cannot get the mojo status dir, so don't do anything beside logging - getLog().warn("Error reading mojo status directory."); - return false; + private Set addGeneratedSourceDirectory(Path generatedSourcesDirectory) throws IOException { + if (generatedSourcesDirectory == null) { + return Set.of(); + } + /* + * Do not create an empty directory if this plugin is not going to generate new source files. + * However, if a directory already exists, use it because maybe its content was generated by + * another plugin executed before the compiler plugin. + * + * TODO: "none" become the default starting with Java 23. + */ + if ("none".equalsIgnoreCase(proc) && Files.notExists(generatedSourcesDirectory)) { + return Set.of(); + } else { + // `createDirectories(Path)` does nothing if the directory already exists. + generatedSourcesDirectory = Files.createDirectories(generatedSourcesDirectory); + } + ProjectScope scope = isTestCompile ? ProjectScope.TEST : ProjectScope.MAIN; + projectManager.addCompileSourceRoot(project, scope, generatedSourcesDirectory.toAbsolutePath()); + if (logger.isDebugEnabled()) { + var sb = new StringBuilder("Adding \"") + .append(generatedSourcesDirectory) + .append("\" to ") + .append(scope.id()) + .append("-compile source roots. New roots are:"); + for (Path p : projectManager.getCompileSourceRoots(project, scope)) { + sb.append(System.lineSeparator()).append(" ").append(p); + } + logger.debug(sb.toString()); } - Path mojoConfigFile = mojoConfigBase.resolve(INPUT_FILES_LST_FILENAME); - return !Files.exists(mojoConfigFile); + return Set.of(generatedSourcesDirectory); } /** - * We just compare the timestamps of all local dependency files (inter-module dependency classpath) and the own - * generated classes and if we got a file which is >= the build-started timestamp, then we caught a file which - * got changed during this build. + * Formats the {@code } block of code for configuring this plugin with the given option. * - * @return true if at least one single dependency has changed. + * @param mb the message builder where to format the block of code + * @param option name of the XML sub-element of {@code } for the option + * @param value the option value, or {@code null} if none */ - protected boolean isDependencyChanged() { - if (session == null) { - // we just cannot determine it, so don't do anything beside logging - getLog().info("Cannot determine build start date, skipping incremental build detection."); - return false; - } - - if (fileExtensions == null || fileExtensions.isEmpty()) { - fileExtensions = Collections.unmodifiableList(Arrays.asList("class", "jar")); - } - - Instant buildStartTime = getBuildStartTime(); - - List pathElements = new ArrayList<>(); - pathElements.addAll(getClasspathElements()); - pathElements.addAll(getModulepathElements()); - - for (String pathElement : pathElements) { - File artifactPath = new File(pathElement); - if (artifactPath.isDirectory() || artifactPath.isFile()) { - if (hasNewFile(artifactPath, buildStartTime)) { - if (showCompilationChanges) { - getLog().info("New dependency detected: " + artifactPath.getAbsolutePath()); - } else { - getLog().debug("New dependency detected: " + artifactPath.getAbsolutePath()); - } - return true; + private void writePlugin(MessageBuilder mb, String option, String value) { + if (mavenCompilerPluginVersion == null) { + try (InputStream is = AbstractCompilerMojo.class.getResourceAsStream("/" + JarFile.MANIFEST_NAME)) { + if (is != null) { + mavenCompilerPluginVersion = + new Manifest(is).getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION); } + } catch (IOException e) { + // noop } - } - - // obviously there was no new file detected. - return false; - } - - /** - * @param classPathEntry entry to check - * @param buildStartTime time build start - * @return if any changes occurred - */ - private boolean hasNewFile(File classPathEntry, Instant buildStartTime) { - // TODO: rewrite with NIO api - if (!classPathEntry.exists()) { - return false; - } - - if (classPathEntry.isFile()) { - return classPathEntry.lastModified() >= buildStartTime.toEpochMilli() - && fileExtensions.contains(FileUtils.getExtension(classPathEntry.getName())); - } - - File[] children = classPathEntry.listFiles(); - - for (File child : children) { - if (hasNewFile(child, buildStartTime)) { - return true; + if (mavenCompilerPluginVersion == null) { + mavenCompilerPluginVersion = ""; } } - - return false; - } - - private List resolveProcessorPathEntries() throws MojoException { - if (annotationProcessorPaths == null || annotationProcessorPaths.isEmpty()) { - return null; - } - - try { - Session session = this.session.withRemoteRepositories(projectManager.getRemoteProjectRepositories(project)); - List coords = - annotationProcessorPaths.stream().map(this::toCoordinate).collect(Collectors.toList()); - return session - .getService(DependencyResolver.class) - .resolve(DependencyResolverRequest.builder() - .session(session) - .dependencies(coords) - .managedDependencies(project.getManagedDependencies()) - .pathScope(PathScope.MAIN_RUNTIME) - .build()) - .getPaths() - .stream() - .map(Path::toString) - .collect(Collectors.toList()); - } catch (Exception e) { - throw new MojoException("Resolution of annotationProcessorPath dependencies failed: " + e.getMessage(), e); - } - } - - private org.apache.maven.api.DependencyCoordinate toCoordinate(DependencyCoordinate coord) { - return session.getService(DependencyCoordinateFactory.class) - .create(DependencyCoordinateFactoryRequest.builder() - .session(session) - .groupId(coord.getGroupId()) - .artifactId(coord.getArtifactId()) - .classifier(coord.getClassifier()) - .type(coord.getType()) - .version(getAnnotationProcessorPathVersion(coord)) - .exclusions(toExclusions(coord.getExclusions())) - .build()); - } - - private Collection toExclusions(Set exclusions) { - if (exclusions == null || exclusions.isEmpty()) { - return List.of(); - } - return exclusions.stream() - .map(e -> (Exclusion) new Exclusion() { - @Override - public String getGroupId() { - return e.getGroupId(); - } - - @Override - public String getArtifactId() { - return e.getArtifactId(); - } - }) - .toList(); - } - - private String getAnnotationProcessorPathVersion(DependencyCoordinate annotationProcessorPath) - throws MojoException { - String configuredVersion = annotationProcessorPath.getVersion(); - if (configuredVersion != null) { - return configuredVersion; - } else { - List managedDependencies = project.getManagedDependencies(); - return findManagedVersion(annotationProcessorPath, managedDependencies) - .orElseThrow(() -> new MojoException(String.format( - "Cannot find version for annotation processor path '%s'. The version needs to be either" - + " provided directly in the plugin configuration or via dependency management.", - annotationProcessorPath))); - } - } - - private Optional findManagedVersion( - DependencyCoordinate dependencyCoordinate, - List managedDependencies) { - return managedDependencies.stream() - .filter(dep -> Objects.equals(dep.getGroupId(), dependencyCoordinate.getGroupId()) - && Objects.equals(dep.getArtifactId(), dependencyCoordinate.getArtifactId()) - && Objects.equals(dep.getClassifier(), dependencyCoordinate.getClassifier()) - && Objects.equals(dep.getType().id(), dependencyCoordinate.getType())) - .findAny() - .map(d -> d.getVersion().asString()); - } - - private void writePlugin(MessageBuilder mb) { mb.a(" ").newline(); mb.a(" org.apache.maven.plugins").newline(); mb.a(" maven-compiler-plugin").newline(); - - String version = getMavenCompilerPluginVersion(); - if (version != null) { - mb.a(" ").a(version).a("").newline(); + if (mavenCompilerPluginVersion != null && !mavenCompilerPluginVersion.isBlank()) { + mb.a(" ") + .a(mavenCompilerPluginVersion) + .a("") + .newline(); } - writeConfig(mb); - - mb.a(" ").newline(); - } - - private void writeConfig(MessageBuilder mb) { mb.a(" ").newline(); - - if (release != null && !release.isEmpty()) { - mb.a(" ").a(release).a("").newline(); - } else if (JavaVersion.JAVA_VERSION.isAtLeast("9")) { - String rls = target.replaceAll(".\\.", ""); - // when using Java9+, motivate to use release instead of source/target - mb.a(" ").a(rls).a("").newline(); - } else { - mb.a(" ").a(source).a("").newline(); - mb.a(" ").a(target).a("").newline(); - } + mb.a(" <").a(option).a('>').a(value).a("').newline(); mb.a(" ").newline(); - } - - private String getMavenCompilerPluginVersion() { - Properties pomProperties = new Properties(); - - try (InputStream is = AbstractCompilerMojo.class.getResourceAsStream( - "/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/pom.properties")) { - if (is != null) { - pomProperties.load(is); - } - } catch (IOException e) { - // noop - } - - return pomProperties.getProperty("version"); - } - - public void setTarget(String target) { - this.target = target; - targetOrReleaseSet = true; - } - - public void setRelease(String release) { - this.release = release; - targetOrReleaseSet = true; - } - - final String getImplicit() { - return implicit; + mb.a(" ").newline(); } /** - * JDK-8318913 workaround: Patch module-info.class to set the java release version for java/jdk modules. + * Dumps the compiler options together with the list of source files into a debug file. + * This is invoked in case of compilation failure, or if debug is enabled. * - * @param compilerResult should succeed. - * @param sources the list of the source files to check for the "module-info.java" + *

Syntax

+ * The arguments within a file can be separated by spaces or new line characters. + * If a file name contains embedded spaces, then the whole file name must be between double quotation marks. + * The -J options are not supported. * - * @see MCOMPILER-542 - * @see JDK-8318913 + * @param options the compiler options + * @param dependencies the dependencies + * @param sourceFiles all files to compile + * @throws IOException if an error occurred while writing the debug file */ - private void patchJdkModuleVersion(CompilerResult compilerResult, Set sources) throws MojoException { - if (compilerResult.isSuccess() && getModuleDeclaration(sources).isPresent()) { - Path moduleDescriptor = getOutputDirectory().resolve("module-info.class"); - if (Files.isRegularFile(moduleDescriptor)) { - try { - final byte[] descriptorOriginal = Files.readAllBytes(moduleDescriptor); - final byte[] descriptorMod = - ModuleInfoTransformer.transform(descriptorOriginal, getRelease(), getLog()); - if (descriptorMod != null) { - Files.write(moduleDescriptor, descriptorMod); + private void writeDebugFile( + List options, Map> dependencies, List sourceFiles) + throws IOException { + final Path path = getDebugFilePath(); + if (path == null) { + logger.warn("The parameter should not be empty."); + return; + } + final var commandLine = new StringBuilder("For trying to compile from the command-line, use:") + .append(System.lineSeparator()) + .append(" ") + .append(executable != null ? executable : compilerId); + boolean hasOptions = false; + try (BufferedWriter out = Files.newBufferedWriter(path)) { + for (String option : options) { + if (option.isBlank()) { + continue; + } + if (option.startsWith("-J")) { + commandLine.append(' ').append(option); + continue; + } + if (hasOptions) { + if (option.charAt(0) == '-') { + out.newLine(); + } else { + out.write(' '); } - } catch (IOException ex) { - throw new MojoException("Error reading or writing module-info.class", ex); } + boolean needsQuote = option.indexOf(' ') >= 0; + if (needsQuote) { + out.write('"'); + } + out.write(option); + if (needsQuote) { + out.write('"'); + } + hasOptions = true; } - } - } - - protected final Optional getModuleDeclaration(final Set sourceFiles) { - for (Path sourceFile : sourceFiles) { - if ("module-info.java".equals(sourceFile.getFileName().toString())) { - return Optional.of(sourceFile); + if (hasOptions) { + out.newLine(); + } + for (Map.Entry> entry : dependencies.entrySet()) { + String separator = ""; + for (String element : entry.getKey().option(entry.getValue())) { + out.write(separator); + out.write(element); + separator = " "; + } + out.newLine(); + } + out.write("-d \""); + out.write(getOutputDirectory().toString()); + out.write('"'); + out.newLine(); + for (SourceFile sf : sourceFiles) { + out.write('"'); + out.write(sf.file.toString()); + out.write('"'); + out.newLine(); } } - return Optional.empty(); - } - - protected Log getLog() { - return logger; - } - - class MavenLogger extends AbstractLogger { - MavenLogger() { - super(0, AbstractCompilerMojo.this.getClass().getName()); - } - - @Override - public void debug(String message, Throwable throwable) { - logger.debug(message, throwable); - } - - @Override - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - @Override - public void info(String message, Throwable throwable) { - logger.info(message, throwable); - } - - @Override - public boolean isInfoEnabled() { - return logger.isInfoEnabled(); - } - - @Override - public void warn(String message, Throwable throwable) { - logger.warn(message, throwable); - } - - @Override - public boolean isWarnEnabled() { - return logger.isWarnEnabled(); - } - - @Override - public void error(String message, Throwable throwable) { - logger.error(message, throwable); - } - - @Override - public boolean isErrorEnabled() { - return logger.isErrorEnabled(); - } - - @Override - public void fatalError(String message, Throwable throwable) { - logger.error(message, throwable); - } - - @Override - public boolean isFatalErrorEnabled() { - return isFatalErrorEnabled(); - } - - @Override - public Logger getChildLogger(String name) { - return this; - } - } - - protected static Set add(Set t1, Set t2) { - Set s = new HashSet<>(); - s.addAll(t1); - s.addAll(t2); - return s; + tipForCommandLineCompilation = commandLine.append(" @").append(path).toString(); } } diff --git a/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoTransformer.java b/src/main/java/org/apache/maven/plugin/compiler/ByteCodeTransformer.java similarity index 59% rename from src/main/java/org/apache/maven/plugin/compiler/ModuleInfoTransformer.java rename to src/main/java/org/apache/maven/plugin/compiler/ByteCodeTransformer.java index 79607a3b..74981318 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoTransformer.java +++ b/src/main/java/org/apache/maven/plugin/compiler/ByteCodeTransformer.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.HashSet; -import java.util.List; -import java.util.Set; import org.apache.maven.api.plugin.Log; import org.objectweb.asm.ClassReader; @@ -31,21 +29,42 @@ import org.objectweb.asm.Opcodes; /** - * {@code module-info.class} bytecode transformer for - * MCOMPILER-542: - * drops detailed JDK version. + * This class is the central place where all byte code transformations are applied. + * Using a separated class reduces the risk of loading the {@code org.objectweb.asm} + * classes when not needed. The transformations can be: + * + *
    + *
  • Generating {@code package-info.class} class if the {@code -Xpkginfo:always} option is not supported.
    • + *
  • Dropping detailed JDK version from the {@code module-info.class} file (workaround for + * MCOMPILER-542).
    • + *
+ * + * Note: {@code package-info.class} generation has been removed because it is not needed anymore for + * incremental build. If nevertheless desired, it can be done with the {@code -Xpkginfo:always} option with + * compilers derived from OpenJDK. + * + * @see JDK-8318913 */ -final class ModuleInfoTransformer { - - private ModuleInfoTransformer() {} +final class ByteCodeTransformer { + private ByteCodeTransformer() {} - static byte[] transform(byte[] originalBytecode, String javaVersion, Log log) { - List modulesModified = new ArrayList<>(); - Set foundVersions = new HashSet<>(); - ClassReader reader = new ClassReader(originalBytecode); - ClassWriter writer = new ClassWriter(0); - - ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM9, writer) { + /** + * JDK-8318913 workaround: Patch module-info.class to set the java release version for java/jdk modules. + * This patch is needed only for Java versions older than 22. + * + * @param originalBytecode the byte code to patch + * @return the patched byte code, or {@code null} if no change is needed + * + * @see MCOMPILER-542 + * @see JDK-8318913 + * @see #MODULE_VERSION_FIX + */ + static byte[] patchJdkModuleVersion(byte[] originalBytecode, String javaVersion, Log log) { + var modulesModified = new ArrayList(); + var foundVersions = new HashSet(); + var reader = new ClassReader(originalBytecode); + var writer = new ClassWriter(0); + var classVisitor = new ClassVisitor(Opcodes.ASM9, writer) { @Override public ModuleVisitor visitModule(String name, int access, String version) { ModuleVisitor originalModuleVisitor = super.visitModule(name, access, version); @@ -67,13 +86,10 @@ public void visitRequire(String module, int access, String version) { }; } }; - reader.accept(classVisitor, 0); - if (modulesModified.isEmpty()) { return null; } - log.info(String.format( "JDK-8318913 workaround: patched module-info.class requires version from %s to [%s] on %d JDK modules %s", foundVersions, javaVersion, modulesModified.size(), modulesModified)); diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java b/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java index 53bbfa57..5011b02f 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java +++ b/src/main/java/org/apache/maven/plugin/compiler/CompilationFailureException.java @@ -18,60 +18,32 @@ */ package org.apache.maven.plugin.compiler; -import java.util.List; - import org.apache.maven.api.plugin.MojoException; -import org.codehaus.plexus.compiler.CompilerMessage; /** + * Thrown when the Maven compiler plugin cannot complete the project compilation. + * * @author Jason van Zyl * @since 2.0 */ @SuppressWarnings("serial") public class CompilationFailureException extends MojoException { - private static final String LS = System.lineSeparator(); - - /** - * Wrap error messages from the compiler - * - * @param messages the messages, not null - * @since 2.0 - */ - public CompilationFailureException(List messages) { - super(null, shortMessage(messages), longMessage(messages)); - } - /** - * Long message will have all messages, one per line + * Creates a new exception with the given message. * - * @param messages the messages, not null - * @return the long error message - * @since 2.0 + * @param message the short message */ - public static String longMessage(List messages) { - StringBuilder sb = new StringBuilder(); - - for (CompilerMessage compilerError : messages) { - sb.append(compilerError).append(LS); - } - - return sb.toString(); + public CompilationFailureException(String message) { + super(message); } /** - * Short message will have the error message if there's only one, useful for errors forking the compiler + * Creates a new exception with the given message and cause. * - * @param messages the messages, not null - * @return the short error message - * @since 2.0.2 + * @param message the short message + * @param cause the cause of the failure, or {@code null} if none */ - public static String shortMessage(List messages) { - StringBuilder sb = new StringBuilder("Compilation failure"); - - if (messages.size() == 1) { - sb.append(LS).append(messages.get(0)).append(LS); - } - - return sb.toString(); + public CompilationFailureException(String message, Throwable cause) { + super(message, cause); } } diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilationTaskSources.java b/src/main/java/org/apache/maven/plugin/compiler/CompilationTaskSources.java new file mode 100644 index 00000000..69146a76 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/CompilationTaskSources.java @@ -0,0 +1,57 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.tools.JavaCompiler; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; + +/** + * Source files to compile in a single compilation task. + * This is simply a list of files, together with an optional task to execute before and after compilation. + */ +class CompilationTaskSources { + /** + * All source files to compile; + */ + final List files; + + /** + * Creates a new compilation task. + * + * @param files the files to compile. + */ + CompilationTaskSources(List files) { + this.files = files; + } + + /** + * Executes the compilation task. Subclasses can override this method is they need to perform + * pre-compilation or post-compilation tasks. + * + * @param task the compilation task + * @return whether the compilation was successful. + * @throws IOException if an initialization or cleaner task was required and failed. + */ + boolean compile(JavaCompiler.CompilationTask task) throws IOException { + return task.call(); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java index 2273d6b2..d89a6a9f 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java @@ -18,412 +18,307 @@ */ package org.apache.maven.plugin.compiler; -import java.io.File; +import javax.tools.OptionChecker; + import java.io.IOException; +import java.io.InputStream; +import java.lang.module.ModuleDescriptor; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.maven.api.*; +import java.util.TreeMap; + +import org.apache.maven.api.JavaPathType; +import org.apache.maven.api.PathType; +import org.apache.maven.api.ProducedArtifact; +import org.apache.maven.api.ProjectScope; +import org.apache.maven.api.annotations.Nonnull; +import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.plugin.MojoException; import org.apache.maven.api.plugin.annotations.Mojo; import org.apache.maven.api.plugin.annotations.Parameter; -import org.apache.maven.api.services.MessageBuilderFactory; -import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner; -import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor; -import org.codehaus.plexus.languages.java.jpms.LocationManager; -import org.codehaus.plexus.languages.java.jpms.ModuleNameSource; -import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest; -import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult; -import org.codehaus.plexus.util.StringUtils; + +import static org.apache.maven.plugin.compiler.SourceDirectory.CLASS_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.JAVA_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.MODULE_INFO; /** * Compiles application sources. - * By default uses the javac compiler - * of the JDK used to execute Maven. This can be overwritten through Toolchains - * or parameter {@link AbstractCompilerMojo#compilerId}. + * Each instance shall be used only once, then discarded. * - * @author Jason van Zyl - * @since 2.0 + * @author Jason van Zyl + * @author Martin Desruisseaux * @see javac Command + * @since 2.0 */ @Mojo(name = "compile", defaultPhase = "compile") public class CompilerMojo extends AbstractCompilerMojo { /** - * The source directories containing the sources to be compiled. + * Set this to {@code true} to bypass compilation of main sources. + * Its use is not recommended, but quite convenient on occasion. */ - @Parameter - protected List compileSourceRoots; + @Parameter(property = "maven.main.skip") + protected boolean skipMain; /** - * Projects main artifact. + * The source directories containing the sources to be compiled. + * If {@code null} or empty, the directory will be obtained from the project manager. */ - @Parameter(defaultValue = "${project.mainArtifact}", readonly = true, required = true) - protected Artifact projectArtifact; + @Parameter + protected List compileSourceRoots; /** - * The directory for compiled classes. + * Specify where to place generated source files created by annotation processing. + * + * @since 2.2 */ - @Parameter(defaultValue = "${project.build.outputDirectory}", required = true, readonly = true) - protected Path outputDirectory; + @Parameter(defaultValue = "${project.build.directory}/generated-sources/annotations") + protected Path generatedSourcesDirectory; /** - * A list of inclusion filters for the compiler. + * A set of inclusion filters for the compiler. */ @Parameter - protected Set includes = new HashSet<>(); + protected Set includes; /** - * A list of exclusion filters for the compiler. + * A set of exclusion filters for the compiler. */ @Parameter - protected Set excludes = new HashSet<>(); + protected Set excludes; /** - * A list of exclusion filters for the incremental calculation. + * A set of exclusion filters for the incremental calculation. + * Updated source files, if excluded by this filter, will not cause the project to be rebuilt. + * + *

Limitation

+ * In the current implementation, those exclusion filters are applied for added or removed files, + * but not yet for removed files. + * * @since 3.11 */ @Parameter - protected Set incrementalExcludes = new HashSet<>(); + protected Set incrementalExcludes; /** - *

- * Specify where to place generated source files created by annotation processing. Only applies to JDK 1.6+ - *

- * - * @since 2.2 + * The directory for compiled classes. */ - @Parameter(defaultValue = "${project.build.directory}/generated-sources/annotations") - protected Path generatedSourcesDirectory; + @Parameter(defaultValue = "${project.build.outputDirectory}", required = true, readonly = true) + protected Path outputDirectory; /** - * Set this to {@code true} to bypass compilation of main sources. Its use is NOT RECOMMENDED, but quite convenient on - * occasion. + * Projects main artifact. */ - @Parameter(property = "maven.main.skip") - protected boolean skipMain; - - @Parameter - protected List compilePath; + @Parameter(defaultValue = "${project.mainArtifact}", readonly = true, required = true) + protected ProducedArtifact projectArtifact; /** + * When set to {@code true}, the classes will be placed in {@code META-INF/versions/${release}}. *

- * When set to {@code true}, the classes will be placed in META-INF/versions/${release} The release - * value must be set, otherwise the plugin will fail. - *

- * Note: A jar is only a multirelease jar if META-INF/MANIFEST.MF contains - * Multi-Release: true. You need to set this by configuring the Note: A jar is only a multi-release jar if {@code META-INF/MANIFEST.MF} contains + * {@code Multi-Release: true}. You need to set this by configuring the maven-jar-plugin. - * This implies that you cannot test a multirelease jar using the outputDirectory. + * This implies that you cannot test a multi-release jar using the {@link #outputDirectory}. + *

* * @since 3.7.1 + * + * @deprecated Replaced by specifying the release version together with the source directory. */ @Parameter + @Deprecated(since = "4.0.0") protected boolean multiReleaseOutput; /** - * When both {@link AbstractCompilerMojo#fork} and {@link AbstractCompilerMojo#debug} are enabled the commandline arguments used - * will be dumped to this file. + * The file where to dump the command-line when debug is activated or when the compilation failed. + * For example, if the value is {@code "javac"}, then the Java compiler can be launched from the + * command-line by typing {@code javac @target/javac.args}. + * The debug file will contain the compiler options together with the list of source files to compile. + * * @since 3.10.0 */ - @Parameter(defaultValue = "javac") + @Parameter(defaultValue = "javac.args") protected String debugFileName; - final LocationManager locationManager = new LocationManager(); - - private List classpathElements; - - private List modulepathElements; - - private Map pathElements; - - protected List getCompileSourceRoots() { - if (compileSourceRoots == null || compileSourceRoots.isEmpty()) { - return projectManager.getCompileSourceRoots(getProject(), ProjectScope.MAIN); - } else { - return compileSourceRoots.stream().map(Paths::get).collect(Collectors.toList()); - } - } - - @Override - protected List getClasspathElements() { - return classpathElements; - } - - @Override - protected List getModulepathElements() { - return modulepathElements; + /** + * Creates a new compiler MOJO. + */ + public CompilerMojo() { + super(false); } + /** + * Runs the Java compiler on the main source code. + * + * @throws MojoException if the compiler cannot be run. + */ @Override - protected Map getPathElements() { - return pathElements; - } - - protected Path getOutputDirectory() { - Path dir; - if (!multiReleaseOutput) { - dir = outputDirectory; - } else { - dir = outputDirectory.resolve("META-INF/versions/" + release); - } - return dir; - } - public void execute() throws MojoException { if (skipMain) { - getLog().info("Not compiling main sources"); + logger.info("Not compiling main sources"); return; } - - if (multiReleaseOutput && release == null) { - throw new MojoException("When using 'multiReleaseOutput' the release must be set"); - } - super.execute(); - + @SuppressWarnings("LocalVariableHidesMemberVariable") + Path outputDirectory = getOutputDirectory(); if (Files.isDirectory(outputDirectory) && projectArtifact != null) { artifactManager.setPath(projectArtifact, outputDirectory); } } + /** + * Parses the parameters declared in the MOJO. + * + * @param compiler the tools to use for verifying the validity of options + * @return the options after validation + */ @Override - protected Set getIncludes() { - return includes; - } - - @Override - protected Set getExcludes() { - return excludes; + @SuppressWarnings("deprecation") + protected Options acceptParameters(final OptionChecker compiler) { + Options compilerConfiguration = super.acceptParameters(compiler); + compilerConfiguration.addUnchecked(compilerArgs); + compilerConfiguration.addUnchecked(compilerArgument); + return compilerConfiguration; } + /** + * {@return the root directories of Java source files to compile}. + * It can be a parameter specified to the compiler plugin, + * or otherwise the value provided by the project manager. + */ + @Nonnull @Override - protected void preparePaths(Set sourceFiles) { - // assert compilePath != null; - List compilePath = this.compilePath; - if (compilePath == null) { - Stream s1 = Stream.of(getOutputDirectory().toString()); - Stream s2 = session.resolveDependencies(getProject(), PathScope.MAIN_COMPILE).stream() - .map(Path::toString); - compilePath = Stream.concat(s1, s2).toList(); - } - - Path moduleDescriptorPath = null; - - boolean hasModuleDescriptor = false; - for (Path sourceFile : sourceFiles) { - if ("module-info.java".equals(sourceFile.getFileName().toString())) { - moduleDescriptorPath = sourceFile; - hasModuleDescriptor = true; - break; - } - } - - if (hasModuleDescriptor) { - // For now only allow named modules. Once we can create a graph with ASM we can specify exactly the modules - // and we can detect if auto modules are used. In that case, MavenProject.setFile() should not be used, so - // you cannot depend on this project and so it won't be distributed. - - modulepathElements = new ArrayList<>(compilePath.size()); - classpathElements = new ArrayList<>(compilePath.size()); - pathElements = new LinkedHashMap<>(compilePath.size()); - - ResolvePathsResult resolvePathsResult; - try { - Collection dependencyArtifacts = getCompileClasspathElements(getProject()).stream() - .map(Path::toFile) - .collect(Collectors.toList()); - - ResolvePathsRequest request = ResolvePathsRequest.ofFiles(dependencyArtifacts) - .setIncludeStatic(true) - .setMainModuleDescriptor(moduleDescriptorPath.toFile()); - - Optional toolchain = getToolchain(); - if (toolchain.isPresent() && toolchain.get() instanceof JavaToolchain) { - request.setJdkHome(new File(((JavaToolchain) toolchain.get()).getJavaHome())); - } - - resolvePathsResult = locationManager.resolvePaths(request); - - for (Entry pathException : - resolvePathsResult.getPathExceptions().entrySet()) { - Throwable cause = pathException.getValue(); - while (cause.getCause() != null) { - cause = cause.getCause(); - } - String fileName = pathException.getKey().getName(); - getLog().warn("Can't extract module name from " + fileName + ": " + cause.getMessage()); - } - - JavaModuleDescriptor moduleDescriptor = resolvePathsResult.getMainModuleDescriptor(); - - detectFilenameBasedAutomodules(resolvePathsResult, moduleDescriptor); - - for (Map.Entry entry : - resolvePathsResult.getPathElements().entrySet()) { - pathElements.put(entry.getKey().getPath(), entry.getValue()); - } - - if (compilerArgs == null) { - compilerArgs = new ArrayList<>(); - } - - for (File file : resolvePathsResult.getClasspathElements()) { - classpathElements.add(file.getPath()); - - if (multiReleaseOutput) { - if (getOutputDirectory().startsWith(file.getPath())) { - compilerArgs.add("--patch-module"); - compilerArgs.add(String.format("%s=%s", moduleDescriptor.name(), file.getPath())); - } - } - } - - for (File file : resolvePathsResult.getModulepathElements().keySet()) { - modulepathElements.add(file.getPath()); - } - - compilerArgs.add("--module-version"); - compilerArgs.add(getProject().getVersion()); - - } catch (IOException e) { - getLog().warn(e.getMessage()); - } + protected List getCompileSourceRoots() { + List sources; + if (compileSourceRoots == null || compileSourceRoots.isEmpty()) { + sources = projectManager.getCompileSourceRoots(project, ProjectScope.MAIN); } else { - classpathElements = new ArrayList<>(); - for (Path element : getCompileClasspathElements(getProject())) { - classpathElements.add(element.toString()); - } - modulepathElements = Collections.emptyList(); - } - } - - private void detectFilenameBasedAutomodules( - final ResolvePathsResult resolvePathsResult, final JavaModuleDescriptor moduleDescriptor) { - List automodulesDetected = new ArrayList<>(); - for (Entry entry : - resolvePathsResult.getModulepathElements().entrySet()) { - if (ModuleNameSource.FILENAME.equals(entry.getValue())) { - automodulesDetected.add(entry.getKey().getName()); - } - } - - if (!automodulesDetected.isEmpty()) { - final String message = "Required filename-based automodules detected: " - + automodulesDetected + ". " - + "Please don't publish this project to a public artifact repository!"; - - if (moduleDescriptor.exports().isEmpty()) { - // application - getLog().info(message); - } else { - // library - writeBoxedWarning(message); - } + sources = compileSourceRoots.stream().map(Paths::get).toList(); } + return sources; } - private List getCompileClasspathElements(Project project) { - List artifacts = session.resolveDependencies(project, PathScope.MAIN_COMPILE); - - // 3 is outputFolder + 2 preserved for multirelease - List list = new ArrayList<>(artifacts.size() + 3); - - if (multiReleaseOutput) { - Path versionsFolder = outputDirectory.resolve("META-INF/versions"); - - // in reverse order - for (int version = Integer.parseInt(getRelease()) - 1; version >= 9; version--) { - Path versionSubFolder = versionsFolder.resolve(String.valueOf(version)); - if (Files.exists(versionSubFolder)) { - list.add(versionSubFolder); - } - } - } - - list.add(outputDirectory); - - list.addAll(artifacts); - - return list; - } - - protected SourceInclusionScanner getSourceInclusionScanner(int staleMillis) { - if (includes.isEmpty() && excludes.isEmpty() && incrementalExcludes.isEmpty()) { - return new StaleSourceScanner(staleMillis); - } - - if (includes.isEmpty()) { - includes.add("**/*.java"); - } - - return new StaleSourceScanner(staleMillis, includes, add(excludes, incrementalExcludes)); - } - - protected SourceInclusionScanner getSourceInclusionScanner(String inputFileEnding) { - // it's not defined if we get the ending with or without the dot '.' - String defaultIncludePattern = "**/*" + (inputFileEnding.startsWith(".") ? "" : ".") + inputFileEnding; - - if (includes.isEmpty()) { - includes.add(defaultIncludePattern); - } - return new SimpleSourceInclusionScanner(includes, add(excludes, incrementalExcludes)); - } - + /** + * {@return the path where to place generated source files created by annotation processing on the main classes}. + */ + @Nullable @Override - protected String getSource() { - return source; + protected Path getGeneratedSourcesDirectory() { + return generatedSourcesDirectory; } + /** + * {@return the inclusion filters for the compiler, or an empty set for all Java source files}. + */ @Override - protected String getTarget() { - return target; + protected Set getIncludes() { + return (includes != null) ? includes : Set.of(); } + /** + * {@return the exclusion filters for the compiler, or an empty set if none}. + */ @Override - protected String getRelease() { - return release; + protected Set getExcludes() { + return (excludes != null) ? excludes : Set.of(); } + /** + * {@return the exclusion filters for the incremental calculation, or an empty set if none}. + */ @Override - protected String getCompilerArgument() { - return compilerArgument; + protected Set getIncrementalExcludes() { + return (incrementalExcludes != null) ? incrementalExcludes : Set.of(); } - protected Path getGeneratedSourcesDirectory() { - return generatedSourcesDirectory; + /** + * {@return the destination directory for main class files}. + * If {@link #multiReleaseOutput} is true (deprecated), + * the output will be in a {@code META-INF/versions} subdirectory. + */ + @Nonnull + @Override + protected Path getOutputDirectory() { + if (SUPPORT_LEGACY && multiReleaseOutput && release != null) { + return outputDirectory.resolve(Path.of("META-INF", "versions", release)); + } + return outputDirectory; } + /** + * {@return the file where to dump the command-line when debug is activated or when the compilation failed}. + */ + @Nullable @Override protected String getDebugFileName() { return debugFileName; } - private void writeBoxedWarning(String message) { - String line = StringUtils.repeat("*", message.length() + 4); - getLog().warn(line); - getLog().warn("* " + strong(message) + " *"); - getLog().warn(line); - } - - private String strong(String message) { - return session.getService(MessageBuilderFactory.class) - .builder() - .strong(message) - .build(); + /** + * If compiling a multi-release JAR in the old deprecated way, add the previous versions to the path. + * + * @param addTo where to add dependencies + * @param hasModuleDeclaration whether the main sources have or should have a {@code module-info} file + * @throws IOException if this method needs to walk through directories and that operation failed + * + * @deprecated For compatibility with the previous way to build multi-releases JAR file. + */ + @Override + @Deprecated(since = "4.0.0") + protected void addImplicitDependencies(Map> addTo, boolean hasModuleDeclaration) + throws IOException { + if (SUPPORT_LEGACY && multiReleaseOutput) { + var paths = new TreeMap(); + Path root = outputDirectory.resolve(Path.of("META-INF", "versions")); + Files.walk(root, 1).forEach((path) -> { + int version; + if (path.equals(root)) { + path = outputDirectory; + version = 0; + } else { + try { + version = Integer.parseInt(path.getFileName().toString()); + } catch (NumberFormatException e) { + throw new CompilationFailureException("Invalid version number for " + path, e); + } + } + if (paths.put(version, path) != null) { + throw new CompilationFailureException("Duplicated version number for " + path); + } + }); + /* + * Find the module name. If many module-info classes are found, + * the most basic one (with lowest Java release number) is taken. + */ + String moduleName = null; + for (Path path : paths.values()) { + path = path.resolve(MODULE_INFO + CLASS_FILE_SUFFIX); + if (Files.exists(path)) { + try (InputStream in = Files.newInputStream(path)) { + moduleName = ModuleDescriptor.read(in).name(); + } + break; + } + } + /* + * If no module name was found in the classes compiled for previous Java releases, + * search in the source files for the Java release of the current compilation unit. + */ + if (moduleName == null) { + for (Path path : getCompileSourceRoots()) { + moduleName = parseModuleInfoName(path.resolve(MODULE_INFO + JAVA_FILE_SUFFIX)); + if (moduleName != null) { + break; + } + } + } + var pathType = (moduleName != null) ? JavaPathType.patchModule(moduleName) : JavaPathType.CLASSES; + addTo.computeIfAbsent(pathType, (key) -> new ArrayList<>()) + .addAll(paths.descendingMap().values()); + } } } diff --git a/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java b/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java index 19609499..dfeef0b0 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java +++ b/src/main/java/org/apache/maven/plugin/compiler/DependencyCoordinate.java @@ -18,16 +18,29 @@ */ package org.apache.maven.plugin.compiler; +import java.util.Collection; +import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; +import org.apache.maven.api.Exclusion; +import org.apache.maven.api.Project; +import org.apache.maven.api.Session; +import org.apache.maven.api.plugin.MojoException; +import org.apache.maven.api.services.DependencyCoordinatesFactory; +import org.apache.maven.api.services.DependencyCoordinatesFactoryRequest; + /** * Simple representation of Maven-coordinates of a dependency. * * @author Andreas Gudian * @since 3.4 + * + * @deprecated Used for {@link AbstractCompilerMojo#annotationProcessorPaths}, which is deprecated. */ -public class DependencyCoordinate { +@Deprecated(since = "4.0.0") +public final class DependencyCoordinate { private String groupId; private String artifactId; @@ -40,54 +53,6 @@ public class DependencyCoordinate { private Set exclusions; - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getArtifactId() { - return artifactId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getClassifier() { - return classifier; - } - - public void setClassifier(String classifier) { - this.classifier = classifier; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Set getExclusions() { - return exclusions; - } - - public void setExclusions(Set exclusions) { - this.exclusions = exclusions; - } - @Override public int hashCode() { return Objects.hash(groupId, artifactId, version, classifier, type, exclusions); @@ -98,14 +63,8 @@ public boolean equals(Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - DependencyCoordinate other = (DependencyCoordinate) obj; - return Objects.equals(groupId, other.groupId) + return obj instanceof DependencyCoordinate other + && Objects.equals(groupId, other.groupId) && Objects.equals(artifactId, other.artifactId) && Objects.equals(version, other.version) && Objects.equals(classifier, other.classifier) @@ -118,4 +77,70 @@ public String toString() { return groupId + ":" + artifactId + (version != null ? ":" + version : "") + (classifier != null ? ":" + classifier : "") + (type != null ? "." + type : ""); } + + /** + * Converts this coordinate to the Maven API. + * + * @param project the current project + * @param session the current build session instance + * @return this coordinate as Maven API + */ + org.apache.maven.api.DependencyCoordinates toCoordinate(Project project, Session session) { + return session.getService(DependencyCoordinatesFactory.class) + .create(DependencyCoordinatesFactoryRequest.builder() + .session(session) + .groupId(groupId) + .artifactId(artifactId) + .classifier(classifier) + .type(type) + .version(version) + .version(getAnnotationProcessorPathVersion(project)) + .exclusions(toExclusions(exclusions)) + .build()); + } + + private String getAnnotationProcessorPathVersion(Project project) throws MojoException { + if (version != null) { + return version; + } else { + if (classifier == null) { + classifier = ""; // Needed for comparison with dep.getClassifier() because of method contract. + } + List managedDependencies = project.getManagedDependencies(); + return findManagedVersion(managedDependencies) + .orElseThrow(() -> new CompilationFailureException(String.format( + "Cannot find version for annotation processor path '%s'.%nThe version needs to be either" + + " provided directly in the plugin configuration or via dependency management.", + this))); + } + } + + private Optional findManagedVersion(List managedDependencies) { + return managedDependencies.stream() + .filter(dep -> Objects.equals(dep.getGroupId(), groupId) + && Objects.equals(dep.getArtifactId(), artifactId) + && Objects.equals(dep.getClassifier(), classifier) + && Objects.equals(dep.getType().id(), type)) + .findAny() + .map(d -> d.getVersionConstraint().asString()); + } + + private static Collection toExclusions(Set exclusions) { + if (exclusions == null || exclusions.isEmpty()) { + return List.of(); + } + return exclusions.stream() + .map(e -> (Exclusion) new Exclusion() { + @Override + public String getGroupId() { + return e.groupId; + } + + @Override + public String getArtifactId() { + return e.artifactId; + } + }) + .toList(); + } } diff --git a/src/main/java/org/apache/maven/plugin/compiler/DependencyExclusion.java b/src/main/java/org/apache/maven/plugin/compiler/DependencyExclusion.java index 352f0e89..6a321f13 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/DependencyExclusion.java +++ b/src/main/java/org/apache/maven/plugin/compiler/DependencyExclusion.java @@ -22,58 +22,26 @@ /** * Simple representation of a Maven dependency exclusion. + * + * @deprecated Used for {@link AbstractCompilerMojo#annotationProcessorPaths}, which is deprecated. */ -public class DependencyExclusion { - private String groupId; +@Deprecated(since = "4.0.0") +public final class DependencyExclusion { + String groupId; - private String artifactId; + String artifactId; private String classifier; private String extension = "jar"; - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getArtifactId() { - return artifactId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public String getClassifier() { - return classifier; - } - - public void setClassifier(String classifier) { - this.classifier = classifier; - } - - public String getExtension() { - return extension; - } - - public void setExtension(String extension) { - this.extension = extension; - } - @Override public boolean equals(Object obj) { if (this == obj) { return true; } - if (obj == null || getClass() != obj.getClass()) { - return false; - } - DependencyExclusion other = (DependencyExclusion) obj; - return Objects.equals(groupId, other.groupId) + return obj instanceof DependencyExclusion other + && Objects.equals(groupId, other.groupId) && Objects.equals(artifactId, other.artifactId) && Objects.equals(classifier, other.classifier) && Objects.equals(extension, other.extension); diff --git a/src/main/java/org/apache/maven/plugin/compiler/DiagnosticLogger.java b/src/main/java/org/apache/maven/plugin/compiler/DiagnosticLogger.java new file mode 100644 index 00000000..2c720a08 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/DiagnosticLogger.java @@ -0,0 +1,209 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.tools.Diagnostic; +import javax.tools.DiagnosticListener; +import javax.tools.JavaFileObject; + +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; + +import org.apache.maven.api.plugin.Log; +import org.apache.maven.api.services.MessageBuilder; +import org.apache.maven.api.services.MessageBuilderFactory; + +/** + * A Java compiler diagnostic listener which send the messages to the Maven logger. + * + * @author Martin Desruisseaux + */ +final class DiagnosticLogger implements DiagnosticListener { + /** + * The logger where to send diagnostics. + */ + private final Log logger; + + /** + * The factory for creating message builders. + */ + private final MessageBuilderFactory messageBuilderFactory; + + /** + * The locale for compiler message. + */ + private final Locale locale; + + /** + * Number of errors or warnings. + */ + private int numErrors, numWarnings; + + /** + * Number of messages received for each code. + */ + private final Map codeCount; + + /** + * The first error, or {@code null} if none. + */ + private String firstError; + + /** + * Creates a listener which will send the diagnostics to the given logger. + * + * @param logger the logger where to send diagnostics + * @param messageBuilderFactory the factory for creating message builders + * @param locale the locale for compiler message + */ + DiagnosticLogger(Log logger, MessageBuilderFactory messageBuilderFactory, Locale locale) { + this.logger = logger; + this.messageBuilderFactory = messageBuilderFactory; + this.locale = locale; + codeCount = new LinkedHashMap<>(); + } + + /** + * Invoked when the compiler emitted a warning. + * + * @param diagnostic the warning emitted by the Java compiler + */ + @Override + public void report(Diagnostic diagnostic) { + MessageBuilder record = messageBuilderFactory.builder(); + String message = diagnostic.getMessage(locale); + record.a(message); + Diagnostic.Kind kind = diagnostic.getKind(); + String style; + switch (kind) { + case ERROR: + style = ".error:-bold,f:red"; + break; + case MANDATORY_WARNING: + case WARNING: + style = ".warning:-bold,f:yellow"; + break; + default: + style = ".info:-bold,f:blue"; + break; + } + JavaFileObject source = diagnostic.getSource(); + if (source != null) { + record.newline().a(" at ").a(source.getName()); + long line = diagnostic.getLineNumber(); + long column = diagnostic.getColumnNumber(); + if (line != Diagnostic.NOPOS || column != Diagnostic.NOPOS) { + record.style(style).a('['); + if (line != Diagnostic.NOPOS) { + record.a(line); + } + if (column != Diagnostic.NOPOS) { + record.a(',').a(column); + } + record.a(']').resetStyle(); + } + } + String log = record.toString(); + switch (kind) { + case ERROR: + if (firstError == null) { + firstError = message; + } + logger.error(log); + numErrors++; + break; + case MANDATORY_WARNING: + case WARNING: + logger.warn(log); + numWarnings++; + break; + default: + logger.info(log); + break; + } + // Statistics + String code = diagnostic.getCode(); + if (code != null) { + codeCount.merge(code, 1, (old, initial) -> old + 1); + } + } + + /** + * Returns the first error, if any. + * + * @param cause if compilation failed with an exception, the cause + */ + Optional firstError(Exception cause) { + return Optional.ofNullable(cause != null && firstError == null ? cause.getMessage() : firstError); + } + + /** + * Reports summary after the compilation finished. + */ + void logSummary() { + MessageBuilder message = messageBuilderFactory.builder(); + final String patternForCount; + if (!codeCount.isEmpty()) { + @SuppressWarnings("unchecked") + Map.Entry[] entries = codeCount.entrySet().toArray(Map.Entry[]::new); + Arrays.sort(entries, (a, b) -> Integer.compare(b.getValue(), a.getValue())); + patternForCount = patternForCount(Math.max(entries[0].getValue(), Math.max(numWarnings, numErrors))); + message.strong("Summary of compiler messages:").newline(); + for (Map.Entry entry : entries) { + int count = entry.getValue(); + message.format(patternForCount, count, entry.getKey()).newline(); + } + } else { + patternForCount = patternForCount(Math.max(numWarnings, numErrors)); + } + if ((numWarnings | numErrors) != 0) { + message.strong("Total:").newline(); + } + if (numWarnings != 0) { + writeCount(message, patternForCount, numWarnings, "warning"); + } + if (numErrors != 0) { + writeCount(message, patternForCount, numErrors, "error"); + } + logger.info(message.toString()); + } + + /** + * {@return the pattern for formatting the specified number followed by a label}. + * The given number should be the widest number to format. + * A margin of 4 spaces is added at the beginning of the line. + */ + private static String patternForCount(int n) { + return " %" + Integer.toString(n).length() + "d %s"; + } + + /** + * Appends the count of warnings or errors, making them plural if needed. + */ + private static void writeCount(MessageBuilder message, String patternForCount, int count, String name) { + message.format(patternForCount, count, name); + if (count > 1) { + message.append('s'); + } + message.newline(); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/ForkedCompiler.java b/src/main/java/org/apache/maven/plugin/compiler/ForkedCompiler.java new file mode 100644 index 00000000..07b2d2c9 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/ForkedCompiler.java @@ -0,0 +1,103 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.annotation.processing.Processor; +import javax.tools.DiagnosticListener; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.io.Writer; +import java.util.Locale; + +/** + * A compiler which is executed by invoking a command-line tool. + * + * @author Martin Desruisseaux + */ +final class ForkedCompiler extends ForkedTool implements JavaCompiler { + /** + * Creates a new forked compiler. + * + * @param mojo the MOJO from which to get the configuration + */ + ForkedCompiler(final AbstractCompilerMojo mojo) { + super(mojo); + } + + /** + * Creates a task for launching the compilation. + * + * @param out where to send additional compiler output + * @param fileManager the {@link ForkedToolSources} instance created by {@link #getStandardFileManager} + * @param diagnosticListener currently ignored + * @param options compiler options (should be {@link Options#options}) + * @param classes names of classes to be processed by annotation processing (currently ignored) + * @param compilationUnits the source files to compile + * @return the compilation task to run + */ + @Override + public CompilationTask getTask( + Writer out, + JavaFileManager fileManager, + DiagnosticListener diagnosticListener, + Iterable options, + Iterable classes, + Iterable compilationUnits) { + return new CompilationTask() { + /** + * Adds root modules to be taken into account during module resolution. + * Currently ignored, caller should use compiler options instead. + */ + @Override + public void addModules(Iterable moduleNames) {} + + /** + * Sets processors for annotation processing, bypassing the normal discovery mechanism. + * Ignored because we cannot pass an instance of a Java object to a command-line. + */ + @Override + public void setProcessors(Iterable processors) {} + + /** + * Sets the locale to be applied when formatting diagnostics and other localized data. + * Currently ignored. + */ + @Override + public void setLocale(Locale locale) {} + + /** + * Performs this compilation task. + * + * @return true if all the files compiled without errors + */ + @Override + public Boolean call() { + try { + return run(out, (ForkedToolSources) fileManager, options, compilationUnits); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + }; + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/ForkedTool.java b/src/main/java/org/apache/maven/plugin/compiler/ForkedTool.java new file mode 100644 index 00000000..a9cc44c1 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/ForkedTool.java @@ -0,0 +1,227 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.lang.model.SourceVersion; +import javax.tools.DiagnosticListener; +import javax.tools.JavaFileObject; +import javax.tools.OptionChecker; +import javax.tools.StandardJavaFileManager; +import javax.tools.Tool; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UncheckedIOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.Set; + +/** + * Base class of tool executed by invoking a command-line tool. + * + * @author Martin Desruisseaux + */ +class ForkedTool implements Tool, OptionChecker { + /** + * The directory to run the compiler from, or {@code null} if none. + */ + private final Path basedir; + + /** + * The executable of the compiler to use. + */ + private final String executable; + + /** + * The file where to dump the command line, or {@code null} if none. + */ + private final Path debugFilePath; + + /** + * Creates a new forked compiler. + * + * @param mojo the MOJO from which to get the configuration + */ + ForkedTool(final AbstractCompilerMojo mojo) { + basedir = mojo.basedir; + executable = Objects.requireNonNull(mojo.executable); + debugFilePath = mojo.getDebugFilePath(); + } + + /** + * Returns the name of this tool. + */ + @Override + public String name() { + return executable; + } + + /** + * Unconditionally returns -1, meaning that the given option is unsupported. + * This implementation actually knows nothing about which options are supported. + * Callers should ignore the return value. + * + * @param option ignored + * @return -1 + */ + @Override + public int isSupportedOption(String option) { + return -1; + } + + /** + * Returns the source versions of the Java programming language supported by this tool. + * This implementation arbitrarily returns the latest supported version of current JVM. + * Actually, this method does not know the supported versions. + */ + @Override + public Set getSourceVersions() { + return Set.of(SourceVersion.latestSupported()); + } + + /** + * Returns a new instance of the object holding a collection of files to compile. + */ + public StandardJavaFileManager getStandardFileManager( + DiagnosticListener diagnosticListener, Locale locale, Charset encoding) { + return new ForkedToolSources(encoding); + } + + /** + * Creates a process builder without starting the process. + * Callers can complete the builder configuration, then start the process. + */ + private ProcessBuilder builder() { + var builder = new ProcessBuilder(executable); + if (basedir != null) { + builder.directory(basedir.toFile()); + } + return builder; + } + + /** + * Executes the command and waits for its completion. + * + * @param out where to send additional compiler output + * @param fileManager the dependencies (JAR files) + * @param options the tool options + * @param compilationUnits the source files to process + * @return whether the operation succeeded + * @throws IOException if an I/O error occurred when starting the process + */ + final boolean run( + Writer out, + ForkedToolSources fileManager, + Iterable options, + Iterable compilationUnits) + throws IOException { + ProcessBuilder builder = builder(); + List command = builder.command(); + for (String option : options) { + command.add(option); + } + fileManager.addAllLocations(command); + for (JavaFileObject source : compilationUnits) { + Path path = fileManager.asPath(source); + if (basedir != null) { + try { + path = basedir.relativize(path); + } catch (IllegalArgumentException e) { + // Ignore, keep the absolute path. + } + } + command.add(path.toString()); + } + File output = File.createTempFile("javac", null); + try { + var dest = ProcessBuilder.Redirect.appendTo(output); + builder.redirectError(dest); + builder.redirectOutput(dest); + return start(builder, out) == 0; + } finally { + out.append(Files.readString(output.toPath())); + output.delete(); + } + } + + /** + * Runs the tool with the given arguments. + * This method is implemented as a matter of principle but should not be invoked. + */ + @Override + public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { + ProcessBuilder builder = builder(); + builder.command().addAll(Arrays.asList(arguments)); + try { + return start(builder, System.err); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + /** + * Starts the process and wait for its completion. + * If a debug file has been specified, writes in that file the command which is about to be executed. + * + * @param builder builder of the process to start + * @param out where to send additional compiler output + */ + private int start(ProcessBuilder builder, Appendable out) throws IOException { + if (debugFilePath != null) { + // Use the path separator as a way to identify the operating system. + final boolean windows = File.separatorChar == '\\'; + String filename = debugFilePath.getFileName().toString(); + filename = filename.substring(0, filename.lastIndexOf('.') + 1); + filename += windows ? "bat" : "sh"; + boolean more = false; + try (BufferedWriter debugFile = Files.newBufferedWriter(debugFilePath.resolveSibling(filename))) { + if (basedir != null) { + debugFile.write(windows ? "chdir " : "cd "); + debugFile.write(basedir.toString()); + debugFile.newLine(); + } + for (String cmd : builder.command()) { + if (more) { + debugFile.append(' '); + } + debugFile.append(cmd); + more = true; + } + debugFile.newLine(); + } + } + Process process = builder.start(); + try { + return process.waitFor(); + } catch (InterruptedException e) { + out.append("Compilation has been interrupted by " + e).append(System.lineSeparator()); + process.destroy(); + return 1; + } + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/ForkedToolSources.java b/src/main/java/org/apache/maven/plugin/compiler/ForkedToolSources.java new file mode 100644 index 00000000..88d41b2c --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/ForkedToolSources.java @@ -0,0 +1,533 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.lang.model.element.Modifier; +import javax.lang.model.element.NestingKind; +import javax.tools.FileObject; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.io.UncheckedIOException; +import java.io.Writer; +import java.net.URI; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.StringJoiner; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; + +import org.apache.maven.api.JavaPathType; +import org.apache.maven.api.PathType; + +/** + * Source files for a call to {@code javac} or {@code javadoc} command to be executed as a separated process. + * + * @author Martin Desruisseaux + * + * @see ForkedCompiler + */ +final class ForkedToolSources implements StandardJavaFileManager { + /** + * Option for source files. These options are not declared in + * {@link JavaPathType} because they are not about dependencies. + */ + private enum SourcePathType implements PathType { + /** + * The option for the directory of source files. + */ + SOURCES("--source-path"), + + /** + * The option for the directory of generated sources. + */ + GENERATED_SOURCES("-s"), + + /** + * The option for the directory of compiled class files. + */ + OUTPUT("-d"); + + /** + * The Java option for this enumeration value. + */ + private final String option; + + SourcePathType(String option) { + this.option = option; + } + + @Override + public String id() { + return name(); + } + + @Override + public Optional option() { + return Optional.of(option); + } + + @Override + public String[] option(Iterable paths) { + var builder = new StringJoiner(File.pathSeparator); + paths.forEach((path) -> builder.add(path.toString())); + return new String[] {option, builder.toString()}; + } + }; + + /** + * Search paths associated to locations. + * This map only stores verbatim the collections provided by callers. + * + * @see #setLocationFromPaths(Location, Collection) + * @see #getLocationAsPaths(Location) + */ + private final Map> locations; + + /** + * The encoding of the files to read. + */ + final Charset encoding; + + /** + * Creates an initially empty collection of files. + */ + ForkedToolSources(Charset encoding) { + if (encoding == null) { + encoding = Charset.defaultCharset(); + } + this.encoding = encoding; + locations = new HashMap<>(); + } + + /** + * Unconditionally returns -1, meaning that the given option is unsupported. + * Required by the interface, but not used by the Maven plugin. + */ + @Override + public int isSupportedOption(String option) { + return -1; + } + + /** + * Nevers handle the given option. + */ + @Override + public boolean handleOption(String current, Iterator remaining) { + return false; + } + + /** + * Returns the path to the source file represented by the given object. + */ + @Override + public Path asPath(FileObject file) { + return (file instanceof Item) ? ((Item) file).path : Path.of(file.toUri()); + } + + /** + * Checks if the given objects represents the same canonical file. + * Required by the interface, but not used by the Maven plugin. + */ + @Override + public boolean isSameFile(FileObject a, FileObject b) { + return asPath(a).equals(asPath(b)); + } + + /** + * Returns {@code JavaFileObject} instances representing the given filenames. + */ + @Override + public Iterable getJavaFileObjects(String... names) { + return fromNames(Arrays.stream(names)); + } + + /** + * Returns {@code JavaFileObject} instances representing the given {@code File} instances. + */ + @Override + public Iterable getJavaFileObjects(File... files) { + return fromFiles(Arrays.stream(files)); + } + + /** + * Returns {@code JavaFileObject} instances representing the given filenames. + */ + @Override + public Iterable getJavaFileObjectsFromStrings(Iterable names) { + return fromNames(StreamSupport.stream(names.spliterator(), false)); + } + + /** + * Returns {@code JavaFileObject} instances representing the given {@code File} instances. + */ + @Override + public Iterable getJavaFileObjectsFromFiles(Iterable files) { + return fromFiles(StreamSupport.stream(files.spliterator(), false)); + } + + /** + * Returns {@code JavaFileObject} instances representing the given {@code Path} instances. + */ + @Override + public Iterable getJavaFileObjectsFromPaths(Collection paths) { + return paths.stream().map(Item::new).toList(); + } + + /** + * Helper method for the construction of {@code JavaFileObject} instances from {@code File} instances. + */ + private Iterable fromFiles(Stream files) { + return files.map((file) -> new Item(file.toPath())).toList(); + } + + /** + * Helper method for the construction of {@code JavaFileObject} instances from filenames. + */ + private Iterable fromNames(Stream names) { + return names.map((name) -> new Item(Path.of(name))).toList(); + } + + /** + * A simple implementation of Java file as a wrapper around a path. This class implements some methods + * as a matter of principle, but those methods should not be invoked because the file will not be opened + * in this Java Virtual Machine. We only need a container for a {@link Path} instance. + */ + private final class Item implements JavaFileObject { + /** + * Path to the source file. + */ + final Path path; + + /** + * Creates a new object for the given path to a Java source file. + */ + Item(Path path) { + this.path = path; + } + + /** + * Returns the path to the source file. + */ + @Override + public String getName() { + return path.toString(); + } + + /** + * Returns the path to the source file. + */ + @Override + public String toString() { + return getName(); + } + + /** + * Returns the path as an URI. + */ + @Override + public URI toUri() { + return path.toUri(); + } + + /** + * Returns whether the file is a source, a class or other kind of object. + */ + @Override + public Kind getKind() { + String filename = path.getFileName().toString(); + for (Kind k : Kind.values()) { + if (filename.endsWith(k.extension)) { + return k; + } + } + return Kind.OTHER; + } + + /** + * Returns whether this object is compatible with the given non-qualified name and the given type. + */ + @Override + public boolean isNameCompatible(String simpleName, Kind kind) { + return path.getFileName().toString().equals(simpleName.concat(kind.extension)); + } + + /** + * Returns {@code null}, meaning that this object as no information about nesting kind. + */ + @Override + public NestingKind getNestingKind() { + return null; + } + + /** + * Returns {@code null}, meaning that this object as no information about access level. + */ + @Override + public Modifier getAccessLevel() { + return null; + } + + /** + * Returns the time this file object was last modified. + */ + @Override + public long getLastModified() { + try { + return Files.getLastModifiedTime(path).toMillis(); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + /** + * Deletes the source file if it exists. + */ + @Override + public boolean delete() { + try { + return Files.deleteIfExists(path); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + /** + * Opens the file an an input stream. + * Implemented as a matter of principle, but should not be invoked. + */ + @Override + public InputStream openInputStream() throws IOException { + return Files.newInputStream(path); + } + + /** + * Opens the file an an output stream. + * Implemented as a matter of principle, but should not be invoked. + */ + @Override + public OutputStream openOutputStream() throws IOException { + return Files.newOutputStream(path); + } + + /** + * Opens the file a character reader. + * Implemented as a matter of principle, but should not be invoked. + */ + @Override + public Reader openReader(boolean ignoreEncodingErrors) throws IOException { + return Files.newBufferedReader(path, encoding); + } + + /** + * Returns the file content. + * Implemented as a matter of principle, but should not be invoked. + */ + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + return Files.readString(path, encoding); + } + + /** + * Opens the file a character writer. + * Implemented as a matter of principle, but should not be invoked. + */ + @Override + public Writer openWriter() throws IOException { + return Files.newBufferedWriter(path, encoding); + } + } + + /** + * Converts the {@code File} instances to {@code Path} instances and delegate. + * This is defined as a matter of principle but is not used by the Maven compiler plugin. + * + * @see #setLocationFromPaths(Location, Collection) + */ + @Override + public void setLocation(Location location, Iterable files) { + List paths = null; + if (files != null) { + paths = StreamSupport.stream(files.spliterator(), false) + .map(File::toPath) + .toList(); + } + setLocationFromPaths(location, paths); + } + + /** + * Converts the {@code Path} instances to {@code file} instances for the given location. + * This is defined as a matter of principle but is not used by the Maven compiler plugin. + * + * @see #setLocationFromPaths(Location, Collection) + */ + @Override + public Iterable getLocation(Location location) { + var paths = getLocationAsPaths(location); + if (paths != null) { + return paths.stream().map(Path::toFile).toList(); + } + return null; + } + + /** + * Associates the given search paths with the given location. + * The location may identify the class-path, module-path, doclet-path, etc. + * Any previous value will be discarded. + */ + @Override + public void setLocationFromPaths(Location location, Collection paths) { + PathType type = JavaPathType.valueOf(location).orElse(null); + if (type == null) { + if (location == StandardLocation.SOURCE_OUTPUT) { + type = SourcePathType.GENERATED_SOURCES; + } else if (location == StandardLocation.SOURCE_PATH) { + type = SourcePathType.SOURCES; + } else if (location == StandardLocation.CLASS_OUTPUT) { + type = SourcePathType.OUTPUT; + } else { + throw new IllegalArgumentException("Unsupported location: " + location); + } + } + if (paths == null || paths.isEmpty()) { + locations.remove(type); + } else { + locations.put(type, paths); + } + } + + /** + * Returns the search path associated with the given location, or {@code null} if none. + */ + @Override + public Collection getLocationAsPaths(Location location) { + return locations.get(JavaPathType.valueOf(location).orElse(null)); + } + + /** + * Returns whether a location is known to this file manager. + * This is defined as a matter of principle but is not used by the Maven compiler plugin. + */ + @Override + public boolean hasLocation(Location location) { + return getLocationAsPaths(location) != null; + } + + /** + * Adds class-path, module-path and other paths to the given command. + * + * @param command the list where to add the options + */ + void addAllLocations(List command) { + for (Map.Entry> entry : locations.entrySet()) { + for (String element : entry.getKey().option(entry.getValue())) { + command.add(element); + } + } + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public Iterable list( + Location location, String packageName, Set kinds, boolean recurse) throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public String inferBinaryName(Location location, JavaFileObject file) { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public JavaFileObject getJavaFileForInput(Location location, String className, JavaFileObject.Kind kind) + throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public JavaFileObject getJavaFileForOutput( + Location location, String className, JavaFileObject.Kind kind, FileObject sibling) throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Not yet implemented (not needed for forked tools). + */ + @Override + public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) + throws IOException { + throw new UnsupportedOperationException("Not supported yet."); + } + + /** + * Returns a class loader for loading plug-ins, or {@code null} if disabled. + */ + @Override + public ClassLoader getClassLoader(Location location) { + return null; + } + + /** + * Flushes any resources opened for output by this file manager. + */ + @Override + public void flush() {} + + /** + * Releases any resources opened by this file manager. + */ + @Override + public void close() { + locations.clear(); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuild.java b/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuild.java new file mode 100644 index 00000000..773a1be0 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuild.java @@ -0,0 +1,704 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.nio.file.attribute.FileTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + +import org.apache.maven.api.plugin.MojoException; + +/** + * Helper methods to support incremental builds. + */ +final class IncrementalBuild { + /** + * Elements to take in consideration when deciding whether to recompile a file. + * + * @see AbstractCompilerMojo#incrementalCompilation + */ + enum Aspect { + /** + * Recompile all source files if the compiler options changed. + * Changes are detected on a best-effort basis only. + */ + OPTIONS(Set.of()), + + /** + * Recompile all source files if at least one dependency (JAR file) changed since the last build. + * This check is based on the last modification times of JAR files. + * + *

Implementation note

+ * The checks use information about the previous build saved in {@code target/…/*.cache} files. + * Deleting those files cause a recompilation of all sources. + */ + DEPENDENCIES(Set.of()), + + /** + * Recompile source files modified since the last build. + * In addition, if a source file has been deleted, then all source files are recompiled. + * This check is based on the last modification times of source files, + * not on the existence or modification times of the {@code *.class} files. + * + *

It is usually not needed to specify both {@code SOURCES} and {@link #CLASSES}. + * But doing so it not forbidden.

+ * + *

Implementation note

+ * The checks use information about the previous build saved in {@code target/…/*.cache} files. + * Deleting those files cause a recompilation of all sources. + */ + SOURCES(Set.of()), + + /** + * Recompile source files ({@code *.java}) associated to no output file ({@code *.class}) + * or associated to an output file older than the source. This algorithm does not check + * if a source file has been removed, potentially leaving non-recompiled classes with + * references to classes that no longer exist. + * + *

It is usually not needed to specify both {@link #SOURCES} and {@code CLASSES}. + * But doing so it not forbidden.

+ * + *

Implementation note

+ * This check does not use or generate any {@code *.cache} file. + */ + CLASSES(Set.of()), + + /** + * Recompile all source files when the addition of a new file is detected. + * This aspect should be used together with {@link #SOURCES} or {@link #CLASSES}. + * When used with {@link #CLASSES}, it provides a way to detect class renaming + * (this is not needed with {@link #SOURCES}). + */ + ADDITIONS(Set.of()), + + /** + * Recompile modules and let the compiler decides which individual files to recompile. + * The compiler plugin does not enumerate the source files to recompile (actually, it does not scan at all the + * source directories). Instead, it only specifies the module to recompile using the {@code --module} option. + * The Java compiler will scan the source directories itself and compile only those source files that are newer + * than the corresponding files in the output directory. + * + *

This option is available only at the following conditions:

+ *
    + *
  • All sources of the project to compile are modules in the Java sense.
    • + *
  • {@link #SOURCES}, {@link #CLASSES} and {@link #ADDITIONS} aspects are not used.
    • + *
  • There is no include/exclude filter.
    • + *
+ */ + MODULES(Set.of(SOURCES, CLASSES, ADDITIONS)), + + /** + * The compiler plugin unconditionally specifies all sources to the Java compiler. + * This aspect is mutually exclusive with all other aspects. + */ + NONE(Set.of(OPTIONS, DEPENDENCIES, SOURCES, CLASSES, ADDITIONS, MODULES)); + + /** + * If this aspect is mutually exclusive with other aspects, the excluded aspects. + */ + private final Set excludes; + + /** + * Creates a new enumeration value. + * + * @param excludes the aspects that are mutually exclusive with this aspect + */ + Aspect(Set excludes) { + this.excludes = excludes; + } + + /** + * Returns the name in lower-case, for producing error message. + */ + @Override + public String toString() { + return name().toLowerCase(Locale.US); + } + + /** + * Parses a comma-separated list of aspects. + * + * @param values the plugin parameter to parse as a comma-separated list + * @return the aspect + * @throws MojoException if a value is not recognized, or if mutually exclusive values are specified + */ + static EnumSet parse(final String values) { + var aspects = EnumSet.noneOf(Aspect.class); + for (String value : values.split(",")) { + value = value.trim(); + try { + aspects.add(valueOf(value.toUpperCase(Locale.US))); + } catch (IllegalArgumentException e) { + var sb = new StringBuilder(256) + .append("Illegal incremental build setting: \"") + .append(value); + String s = "\". Valid values are "; + for (Aspect aspect : values()) { + sb.append(s).append(aspect); + s = ", "; + } + throw new CompilationFailureException(sb.append('.').toString(), e); + } + } + for (Aspect aspect : aspects) { + for (Aspect exclude : aspect.excludes) { + if (aspects.contains(exclude)) { + throw new CompilationFailureException("Illegal incremental build setting: \"" + aspect + + "\" and \"" + exclude + "\" are mutually exclusive."); + } + } + } + if (aspects.isEmpty()) { + throw new CompilationFailureException("Incremental build setting cannot be empty."); + } + return aspects; + } + } + + /** + * The options for following links. An empty array means that links will be followed. + */ + private static final LinkOption[] LINK_OPTIONS = new LinkOption[0]; + + /** + * Magic number, generated randomly, to store in the header of the binary file. + * This number shall be changed every times that the binary file format is modified. + * The file format is described in {@link #writeCache()}. + * + * @see #writeCache() + */ + private static final long MAGIC_NUMBER = -8163803035240576921L; + + /** + * Flags in the binary output file telling whether the source and/or target directory changed. + * Those flags are stored as a byte before each entry. They can be combined as bit mask. + * Those flags are for compressing the binary file, not for detecting if something changed + * since the last build. + */ + private static final byte NEW_SOURCE_DIRECTORY = 1, NEW_TARGET_DIRECTORY = 2; + + /** + * Flag in the binary output file telling that the output file of a source is different + * than the one inferred by heuristic rules. For performance reason, we store the output + * files explicitly only when it cannot be inferred. + * + * @see SourceInfo#toOutputFile(Path, Path, Path) + * @see javax.tools.JavaFileManager#getFileForOutput + */ + private static final byte EXPLICIT_OUTPUT_FILE = 4; + + /** + * Name of the file where to store the list of source files and the list of files created by the compiler. + * This is a binary format used for detecting changes. The file is stored in the {@code target} directory. + * If the file is absent of corrupted, it will be ignored and recreated. + * + * @see AbstractCompilerMojo#mojoStatusPath + */ + private final Path cacheFile; + + /** + * Whether the cache file has been loaded. + */ + private boolean cacheLoaded; + + /** + * All source files together with their last modification time. + * This list is specified at construction time and is not modified by this class. + * + * @see #getModifiedSources() + */ + private final List sourceFiles; + + /** + * The build time in milliseconds since January 1st, 1970. + * This is used for detecting if a dependency changed since the previous build. + */ + private final long buildTime; + + /** + * Time of the previous build. This value is initialized by {@link #loadCache()}. + * If the cache cannot be loaded, then this field is conservatively set to the same value + * as {@link #buildTime}, but it shouldn't matter because a full build will be done anyway. + */ + private long previousBuildTime; + + /** + * Hash code value of the compiler options during the previous build. + * This value is initialized by {@link #loadCache()}. + */ + private int previousOptionsHash; + + /** + * Whether to provide more details about why a module is rebuilt. + */ + private final boolean showCompilationChanges; + + /** + * Creates a new helper for an incremental build. + * + * @param mojo the MOJO which is compiling source code + * @param sourceFiles all source files + * @throws IOException if the parent directory cannot be created + */ + IncrementalBuild(AbstractCompilerMojo mojo, List sourceFiles) throws IOException { + this.sourceFiles = sourceFiles; + Path file = mojo.mojoStatusPath; + cacheFile = Files.createDirectories(file.getParent()).resolve(file.getFileName()); + showCompilationChanges = mojo.showCompilationChanges; + buildTime = System.currentTimeMillis(); + previousBuildTime = buildTime; + } + + /** + * Saves the list of source files in the cache file. The cache is a binary file + * and its format may change in any future version. The current format is as below: + * + *
    + *
  • The magic number (while change when the format changes).
    • + *
  • The build time in milliseconds since January 1st, 1970.
    • + *
  • Hash code value of the {@link Options#options} list.
    • + *
  • Number of source files, or 0 if {@code sources} is {@code false}.
    • + *
  • If {@code sources} is {@code true}, then for each source file:
      + *
    • A bit mask of {@link #NEW_SOURCE_DIRECTORY}, {@link #NEW_TARGET_DIRECTORY} and {@link #EXPLICIT_OUTPUT_FILE}.
      • + *
    • If {@link #NEW_SOURCE_DIRECTORY} is set, the new root directory of source files.
      • + *
    • If {@link #NEW_TARGET_DIRECTORY} is set, the new root directory of output files.
      • + *
    • If {@link #EXPLICIT_OUTPUT_FILE} is set, the output file.
      • + *
    • The file path relative to the parent of the previous file.
      • + *
    • Last modification time of the source file, in milliseconds since January 1st.
      • + *
    • + *
+ * + * The "is sibling" Boolean is for avoiding to repeat the parent directory. If that flag is {@code true}, + * then only the filename is stored and the parent is the same as the previous file. + * + * @param optionsHash hash code value of the {@link Options#options} list + * @param sources whether to save also the list of source files + * @throws IOException if an error occurred while writing the cache file + */ + @SuppressWarnings({"checkstyle:InnerAssignment", "checkstyle:NeedBraces"}) + public void writeCache(final int optionsHash, final boolean sources) throws IOException { + try (DataOutputStream out = new DataOutputStream(new BufferedOutputStream(Files.newOutputStream( + cacheFile, + StandardOpenOption.WRITE, + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING)))) { + out.writeLong(MAGIC_NUMBER); + out.writeLong(buildTime); + out.writeInt(optionsHash); + out.writeInt(sources ? sourceFiles.size() : 0); + if (sources) { + Path srcDir = null; + Path tgtDir = null; + Path previousParent = null; + for (SourceFile source : sourceFiles) { + final Path sourceFile = source.file; + final Path outputFile = source.getOutputFile(false); + boolean sameSrcDir = Objects.equals(srcDir, srcDir = source.directory.root); + boolean sameTgtDir = Objects.equals(tgtDir, tgtDir = source.directory.outputDirectory); + boolean sameOutput = (outputFile == null) + || outputFile.equals(SourceInfo.toOutputFile(srcDir, tgtDir, sourceFile)); + + out.writeByte((sameSrcDir ? 0 : NEW_SOURCE_DIRECTORY) + | (sameTgtDir ? 0 : NEW_TARGET_DIRECTORY) + | (sameOutput ? 0 : EXPLICIT_OUTPUT_FILE)); + + if (!sameSrcDir) out.writeUTF((previousParent = srcDir).toString()); + if (!sameTgtDir) out.writeUTF(tgtDir.toString()); + if (!sameOutput) out.writeUTF(outputFile.toString()); + out.writeUTF(previousParent.relativize(sourceFile).toString()); + out.writeLong(source.lastModified); + previousParent = sourceFile.getParent(); + } + } + } + } + + /** + * Loads the list of source files and their modification times from the previous build. + * The binary file format reads by this method is described in {@link #writeCache()}. + * The keys are the source files. The returned map is modifiable. + * + * @return the source files of previous build + * @throws IOException if an error occurred while reading the cache file + */ + @SuppressWarnings("checkstyle:NeedBraces") + private Map loadCache() throws IOException { + final Map previousBuild; + try (DataInputStream in = new DataInputStream( + new BufferedInputStream(Files.newInputStream(cacheFile, StandardOpenOption.READ)))) { + if (in.readLong() != MAGIC_NUMBER) { + throw new IOException("Invalid cache file."); + } + previousBuildTime = in.readLong(); + previousOptionsHash = in.readInt(); + int remaining = in.readInt(); + previousBuild = new HashMap<>(remaining + remaining / 3); + Path srcDir = null; + Path tgtDir = null; + Path srcFile = null; + while (--remaining >= 0) { + final byte flags = in.readByte(); + if ((flags & ~(NEW_SOURCE_DIRECTORY | NEW_TARGET_DIRECTORY | EXPLICIT_OUTPUT_FILE)) != 0) { + throw new IOException("Invalid cache file."); + } + boolean newSrcDir = (flags & NEW_SOURCE_DIRECTORY) != 0; + boolean newTgtDir = (flags & NEW_TARGET_DIRECTORY) != 0; + boolean newOutput = (flags & EXPLICIT_OUTPUT_FILE) != 0; + Path output = null; + if (newSrcDir) srcDir = Path.of(in.readUTF()); + if (newTgtDir) tgtDir = Path.of(in.readUTF()); + if (newOutput) output = Path.of(in.readUTF()); + String path = in.readUTF(); + srcFile = newSrcDir ? srcDir.resolve(path) : srcFile.resolveSibling(path); + srcFile = srcFile.normalize(); + if (previousBuild.put(srcFile, new SourceInfo(srcDir, tgtDir, output, in.readLong())) != null) { + throw new IOException("Duplicated source file declared in the cache: " + srcFile); + } + } + } + cacheLoaded = true; + return previousBuild; + } + + /** + * Information about a source file from a previous build. + * + * @param sourceDirectory root directory of the source file + * @param outputDirectory output directory of the compiled file + * @param outputFile the output file if it was explicitly specified, or {@code null} if it can be inferred + * @param lastModified last modification times of the source file during the previous build + */ + private static record SourceInfo(Path sourceDirectory, Path outputDirectory, Path outputFile, long lastModified) { + /** + * The default output extension used in heuristic rules. It is okay if the actual output file does not use + * this extension, because the heuristic rules should be applied only when we have detected that they apply. + */ + private static final String OUTPUT_EXTENSION = SourceDirectory.CLASS_FILE_SUFFIX; + + /** + * Infers the path to the output file using heuristic rules. This method is used for saving space in the + * common space where the heuristic rules work. If the heuristic rules do not work, the full output path + * will be stored in the {@link #cacheFile}. + * + * @param sourceDirectory root directory of the source file + * @param outputDirectory output directory of the compiled file + * @param sourceFile path to the source file + * @return path to the target file + */ + static Path toOutputFile(Path sourceDirectory, Path outputDirectory, Path sourceFile) { + return SourceFile.toOutputFile( + sourceDirectory, outputDirectory, sourceFile, SourceDirectory.JAVA_FILE_SUFFIX, OUTPUT_EXTENSION); + } + + /** + * Delete all output files associated to the given source file. If the output file is a {@code .class} file, + * then this method deletes also the output files for all inner classes (e.g. {@code "Foo$0.class"}). + * + * @param sourceFile the source file for which to delete output files + * @throws IOException if an error occurred while scanning the output directory or deleting a file + */ + void deleteClassFiles(final Path sourceFile) throws IOException { + Path output = outputFile; + if (output == null) { + output = toOutputFile(sourceDirectory, outputDirectory, sourceFile); + } + String filename = output.getFileName().toString(); + if (filename.endsWith(OUTPUT_EXTENSION)) { + String prefix = filename.substring(0, filename.length() - OUTPUT_EXTENSION.length()); + List outputs; + try (Stream files = Files.walk(output.getParent(), 1)) { + outputs = files.filter((f) -> { + String name = f.getFileName().toString(); + return name.startsWith(prefix) + && name.endsWith(OUTPUT_EXTENSION) + && (name.equals(filename) || name.charAt(prefix.length()) == '$'); + }) + .toList(); + } + for (Path p : outputs) { + Files.delete(p); + } + } else { + Files.deleteIfExists(output); + } + } + } + + /** + * Detects whether the list of detected files has changed since the last build. + * This method loads the list of files of the previous build from a status file + * and compare it with the new list. If the file cannot be read, then this method + * conservatively assumes that the file tree changed. + * + *

If this method returns {@code null}, the caller can check the {@link SourceFile#isNewOrModified} flag + * for deciding which files to recompile. If this method returns non-null value, then the {@code isModified} + * flag should be ignored and all files recompiled unconditionally. The returned non-null value is a message + * saying why the project needs to be rebuilt.

+ * + * @param staleMillis the granularity in milliseconds to use for comparing modification times + * @param rebuildOnAdd whether to recompile all source files if a file addition is detected + * @return {@code null} if the project does not need to be rebuilt, otherwise a message saying why to rebuild + * @throws IOException if an error occurred while deleting output files of the previous build + * + * @see Aspect#SOURCES + */ + String inputFileTreeChanges(final long staleMillis, final boolean rebuildOnAdd) throws IOException { + final Map previousBuild; + try { + previousBuild = loadCache(); + } catch (NoSuchFileException e) { + return "Compiling all files."; + } catch (IOException e) { + return causeOfRebuild("information about the previous build cannot be read", true) + .append(System.lineSeparator()) + .append(e) + .toString(); + } + boolean rebuild = false; + boolean allChanged = true; + List added = new ArrayList<>(); + for (SourceFile source : sourceFiles) { + SourceInfo previous = previousBuild.remove(source.file); + if (previous != null) { + if (source.lastModified - previous.lastModified <= staleMillis) { + /* + * Source file has not been modified. But we still need to check if the output file exists. + * It may be, for example, because the compilation failed during the previous build because + * of another class. + */ + allChanged = false; + Path output = source.getOutputFile(true); + if (Files.exists(output, LINK_OPTIONS)) { + continue; // Source file has not been modified and output file exists. + } + } + } else if (!source.ignoreModification) { + if (showCompilationChanges) { + added.add(source.file); + } + rebuild |= rebuildOnAdd; + } + source.isNewOrModified = true; + } + /* + * The files remaining in `previousBuild` are files that have been removed since the last build. + * If no file has been removed, then there is no need to rebuild the whole project (added files + * do not require a full build). + */ + if (previousBuild.isEmpty()) { + if (allChanged) { + return causeOfRebuild("all source files changed", false).toString(); + } + if (!rebuild) { + return null; + } + } + /* + * If some files have been removed, we need to delete the corresponding output files. + * If the output file extension is ".class", then many files may be deleted because + * the output file may be accompanied by inner classes (e.g. {@code "Foo$0.class"}). + */ + for (Map.Entry removed : previousBuild.entrySet()) { + removed.getValue().deleteClassFiles(removed.getKey()); + } + /* + * At this point, it has been decided that all source files will be recompiled. + * Format a message saying why. + */ + StringBuilder causeOfRebuild = causeOfRebuild("of added or removed source files", showCompilationChanges); + if (showCompilationChanges) { + for (Path fileAdded : added) { + causeOfRebuild.append(System.lineSeparator()).append(" + ").append(fileAdded); + } + for (Path fileRemoved : previousBuild.keySet()) { + causeOfRebuild.append(System.lineSeparator()).append(" - ").append(fileRemoved); + } + } + return causeOfRebuild.toString(); + } + + /** + * Returns whether at least one dependency file is more recent than the given build start time. + * This method should be invoked only after {@link #inputFileTreeChanges} returned {@code null}. + * Each given root can be either a regular file (typically a JAR file) or a directory. + * Directories are scanned recursively. + * + * @param directories files or directories to scan + * @param fileExtensions extensions of the file to check (usually "jar" and "class") + * @param changeTime the time at which a file is considered as changed + * @return {@code null} if the project does not need to be rebuilt, otherwise a message saying why to rebuild + * @throws IOException if an error occurred while scanning the directories + * + * @see Aspect#DEPENDENCIES + */ + String dependencyChanges(Iterable> dependencies, Collection fileExtensions) throws IOException { + if (!cacheLoaded) { + loadCache(); + } + final FileTime changeTime = FileTime.fromMillis(previousBuildTime); + List updated = new ArrayList<>(); + for (List roots : dependencies) { + for (Path root : roots) { + try (Stream files = Files.walk(root)) { + files.filter((f) -> { + String name = f.getFileName().toString(); + int s = name.lastIndexOf('.'); + if (s < 0 || !fileExtensions.contains(name.substring(s + 1))) { + return false; + } + try { + return Files.isRegularFile(f) + && Files.getLastModifiedTime(f).compareTo(changeTime) >= 0; + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }) + .forEach(updated::add); + } catch (UncheckedIOException e) { + throw e.getCause(); + } + } + } + if (updated.isEmpty()) { + return null; + } + StringBuilder causeOfRebuild = causeOfRebuild("some dependencies changed", showCompilationChanges); + if (showCompilationChanges) { + for (Path file : updated) { + causeOfRebuild.append(System.lineSeparator()).append(" ").append(file); + } + } + return causeOfRebuild.toString(); + } + + /** + * Returns whether the compilar options have changed. + * This method should be invoked only after {@link #inputFileTreeChanges} returned {@code null}. + * + * @param optionsHash hash code value of the {@link Options#options} list + * @return {@code null} if the project does not need to be rebuilt, otherwise a message saying why to rebuild + * @throws IOException if an error occurred while loading the cache file + * + * @see Aspect#OPTIONS + */ + String optionChanges(int optionsHash) throws IOException { + if (!cacheLoaded) { + loadCache(); + } + if (optionsHash == previousOptionsHash) { + return null; + } + return causeOfRebuild("of changes in compiler options", false).toString(); + } + + /** + * Prepares a message saying why a full rebuild is done. A colon character will be added + * if showing compilation changes is enabled, otherwise a period is added. + * + * @param cause the cause of the rebuild, without trailing colon or period + * @param colon whether to append a colon instead of a period after the message + * @return a buffer where more details can be appended for reporting the cause + */ + private static StringBuilder causeOfRebuild(String cause, boolean colon) { + return new StringBuilder(128) + .append("Recompiling all files because ") + .append(cause) + .append(colon ? ':' : '.'); + } + + /** + * Compares the modification time of all source files with the modification time of output files. + * The files identified as in need to be recompiled have their {@link SourceFile#isNewOrModified} + * flag set to {@code true}. This method does not use the cache file. + * + * @param staleMillis the granularity in milliseconds to use for comparing modification times + * @param rebuildOnAdd whether to recompile all source files if a file addition is detected + * @return {@code null} if the project does not need to be rebuilt, otherwise a message saying why to rebuild + * @throws IOException if an error occurred while reading the time stamp of an output file + * + * @see Aspect#CLASSES + */ + String markNewOrModifiedSources(long staleMillis, boolean rebuildOnAdd) throws IOException { + for (SourceFile source : sourceFiles) { + if (!source.isNewOrModified) { + // Check even if `source.ignoreModification` is true. + Path output = source.getOutputFile(true); + if (Files.exists(output, LINK_OPTIONS)) { + FileTime t = Files.getLastModifiedTime(output, LINK_OPTIONS); + if (source.lastModified - t.toMillis() <= staleMillis) { + continue; + } + } else if (rebuildOnAdd) { + StringBuilder causeOfRebuild = causeOfRebuild("of added source files", showCompilationChanges); + if (showCompilationChanges) { + causeOfRebuild + .append(System.lineSeparator()) + .append(" + ") + .append(source.file); + } + return causeOfRebuild.toString(); + } + source.isNewOrModified = true; + } + } + return null; + } + + /** + * Returns the source files that are marked as new or modified. The returned list may contain files + * that are new or modified, but should nevertheless be ignored in the decision to recompile or not. + * In order to decide if a compilation is needed, invoke {@link #isEmptyOrIgnorable(List)} instead + * of {@link List#isEmpty()}. + * + * @return new or modified source files, or an empty list if none + */ + List getModifiedSources() { + return sourceFiles.stream().filter((s) -> s.isNewOrModified).toList(); + } + + /** + * {@return whether the given list of modified files should not cause a recompilation}. + * This method returns {@code true} if the given list is empty or contains only files + * with the {@link SourceFile#ignoreModification} set to {@code true}. + * + * @param sourceFiles return value of {@link #getModifiedSources()}. + */ + static boolean isEmptyOrIgnorable(List sourceFiles) { + return !sourceFiles.stream().anyMatch((s) -> !s.ignoreModification); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuildHelper.java b/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuildHelper.java deleted file mode 100644 index 3dc0e2db..00000000 --- a/src/main/java/org/apache/maven/plugin/compiler/IncrementalBuildHelper.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.plugin.compiler; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.maven.api.plugin.MojoException; - -/** - * Various helper methods to support incremental builds - */ -public class IncrementalBuildHelper { - /** - * the root directory to store status information about Maven executions in. - */ - private static final String MAVEN_STATUS_ROOT = "maven-status"; - - public static final String CREATED_FILES_LST_FILENAME = "createdFiles.lst"; - private static final String INPUT_FILES_LST_FILENAME = "inputFiles.lst"; - - /** - * Needed for storing the status for the incremental build support. - */ - private final String mojoStatusPath; - - private final Set sources; - - private final Path directory; - - private final Path outputDirectory; - - /** - * Once the {@link #beforeRebuildExecution()} got - * called, this will contain the list of files in the build directory. - */ - private List filesBeforeAction = Collections.emptyList(); - - public IncrementalBuildHelper(String mojoStatusPath, Set sources, Path directory, Path outputDirectory) { - if (mojoStatusPath == null) { - throw new IllegalArgumentException("MojoExecution must not be null!"); - } - - this.mojoStatusPath = mojoStatusPath; - this.sources = sources; - this.directory = directory; - this.outputDirectory = outputDirectory; - } - - /** - * We use a specific status directory for each Mojo execution to store state - * which is needed during the next build invocation run. - * @return the directory for storing status information of the current Mojo execution. - */ - public Path getMojoStatusDirectory() throws MojoException { - // X TODO the executionId contains -cli and -mojoname - // X we should remove those postfixes as it should not make - // X any difference whether being run on the cli or via build - Path mojoStatusDir = directory.resolve(mojoStatusPath); - - try { - Files.createDirectories(mojoStatusDir); - } catch (IOException e) { - throw new MojoException("Unable to create directory: " + mojoStatusDir, e); - } - - return mojoStatusDir; - } - - /** - * Detect whether the list of detected files has changed since the last build. - * We simply load the list of files for the previous build from a status file - * and compare it with the new list. Afterwards we store the new list in the status file. - * - * @return true if the set of inputFiles got changed since the last build. - */ - public boolean inputFileTreeChanged(List added, List removed) { - Path mojoConfigBase = getMojoStatusDirectory(); - Path mojoConfigFile = mojoConfigBase.resolve(INPUT_FILES_LST_FILENAME); - - List oldInputFiles = Collections.emptyList(); - - if (Files.exists(mojoConfigFile)) { - try { - oldInputFiles = Files.readAllLines(mojoConfigFile); - } catch (IOException e) { - throw new MojoException("Error reading old mojo status " + mojoConfigFile, e); - } - } - - List newFiles = - sources.stream().map(Path::toAbsolutePath).map(Path::toString).collect(Collectors.toList()); - - List previousFiles = oldInputFiles; - newFiles.stream().filter(s -> !previousFiles.contains(s)).forEach(added::add); - previousFiles.stream().filter(s -> !newFiles.contains(s)).forEach(removed::add); - try { - Files.write(mojoConfigFile, added); - } catch (IOException e) { - throw new MojoException("Error while storing the mojo status", e); - } - - return added.size() + removed.size() > 0; - } - - /** - *

- * This method shall get invoked before the actual Mojo task gets triggered, e.g. the actual compile in - * maven-compiler-plugin. - *

- *

- * Attention: This method shall only get invoked if the plugin re-creates all the output. - *

- *

- * It first picks up the list of files created in the previous build and delete them. This step is necessary to - * prevent left-overs. After that we take a 'directory snapshot' (list of all files which exist in the - * outputDirectory after the clean). - *

- *

- * After the actual Mojo task got executed you should invoke the method - * {@link #afterRebuildExecution()} to collect the - * list of files which got changed by this task. - *

- */ - public void beforeRebuildExecution() { - Path mojoConfigBase = getMojoStatusDirectory(); - Path mojoConfigFile = mojoConfigBase.resolve(CREATED_FILES_LST_FILENAME); - - try { - if (Files.exists(mojoConfigFile)) { - for (String oldFileName : Files.readAllLines(mojoConfigFile)) { - Path oldFile = outputDirectory.resolve(oldFileName); - Files.deleteIfExists(oldFile); - } - } - - // we remember all files which currently exist in the output directory - if (Files.exists(outputDirectory)) { - try (Stream walk = Files.walk(outputDirectory)) { - filesBeforeAction = walk.filter(Files::isRegularFile).collect(Collectors.toList()); - } - } - } catch (IOException e) { - throw new MojoException("Error reading old mojo status", e); - } - } - - /** - *

This method collects and stores all information about files changed since the - * call to {@link #beforeRebuildExecution()}.

- * - *

Attention: This method shall only get invoked if the plugin re-creates all the output.

- */ - public void afterRebuildExecution() { - Path mojoConfigBase = getMojoStatusDirectory(); - Path mojoConfigFile = mojoConfigBase.resolve(CREATED_FILES_LST_FILENAME); - - try { - try (Stream walk = Files.walk(outputDirectory)) { - List added = walk.filter(Files::isRegularFile) - .filter(p -> !filesBeforeAction.contains(p)) - .map(Path::toString) - .collect(Collectors.toList()); - - Files.write(mojoConfigFile, added); - } - } catch (IOException e) { - throw new MojoException("Error while storing the mojo status", e); - } - - // in case of clean compile the file is not created so next compile won't see it - // we mus create it here - mojoConfigFile = mojoConfigBase.resolve(INPUT_FILES_LST_FILENAME); - if (!Files.exists(mojoConfigFile)) { - try { - Files.write(mojoConfigFile, sources.stream().map(Path::toString).collect(Collectors.toList())); - } catch (IOException e) { - throw new MojoException("Error while storing the mojo status", e); - } - } - } -} diff --git a/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoOverwrite.java b/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoOverwrite.java new file mode 100644 index 00000000..a83a5e29 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoOverwrite.java @@ -0,0 +1,151 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.apache.maven.plugin.compiler.SourceDirectory.CLASS_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.JAVA_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.MODULE_INFO; + +/** + * Helper class for the case where a {@code module-info.java} file defined in the tests + * overwrites the file defined in the main classes. It should be a last-resort practice only, + * when options such as {@code --add-reads} or {@code --add-exports} are not sufficient. + * + *

The code in this class is useful only when {@link AbstractCompilerMojo#SUPPORT_LEGACY} is true. + * This class can be fully deleted if a future version permanently set above-cited flag to false.

+ */ +final class ModuleInfoOverwrite implements Runnable { + /** + * Path to the original {@code module-info.java} file. It will need to be temporarily renamed + * because otherwise the Java compiler seems to unconditionally compiles it, even if we do not + * specify this file in the list of sources to compile. + */ + private final Path testSourceFile; + + /** + * Path to the {@code module-info.java.bak} file. + */ + private final Path savedSourceFile; + + /** + * Path to the main {@code module-info.class} file to temporarily hide. + * This file will be temporarily renamed to {@link #moduleInfoBackup} + * before to compile the tests. + */ + private final Path moduleInfoToHide; + + /** + * Path to the renamed main {@code module-info.class} file. This file + * needs to be renamed as {@link #moduleInfoToHide} after compilation. + */ + private final Path moduleInfoBackup; + + /** + * The {@code module-info.class} to use as a replacement for the one which has been renamed. + */ + private final Path moduleInfoReplacement; + + /** + * The shutdown hook invoked if the user interrupts the compilation, for example with [Control-C]. + */ + private Thread shutdownHook; + + /** + * Creates a new instance. + */ + private ModuleInfoOverwrite(Path source, Path main, Path test) { + testSourceFile = source; + savedSourceFile = source.resolveSibling(MODULE_INFO + JAVA_FILE_SUFFIX + ".bak"); + moduleInfoToHide = main; + moduleInfoBackup = main.resolveSibling(MODULE_INFO + CLASS_FILE_SUFFIX + ".bak"); + moduleInfoReplacement = test; + } + + /** + * Returns an instance for the given main output directory, or {@code null} if not needed. + * This method should be invoked only if a {@code module-info.java} file exists and may + * overwrite a file defined in the main classes. + */ + static ModuleInfoOverwrite create(Path source, Path mainOutputDirectory, Path testOutputDirectory) + throws IOException { + Path main = mainOutputDirectory.resolve(MODULE_INFO + CLASS_FILE_SUFFIX); + if (Files.isRegularFile(main)) { + Path test = testOutputDirectory.resolve(MODULE_INFO + CLASS_FILE_SUFFIX); + if (Files.isRegularFile(test)) { + var mo = new ModuleInfoOverwrite(source, main, test); + mo.substitute(); + return mo; + } + } + return null; + } + + /** + * Replaces the main {@code module-info.class} file by the test one. + * The original file is saved in the {@code module-info.class.bak} file. + * Then the test {@code module-info.class} is moved to the main directory. + * Note that it needs to be moved, not copied or linked, because we need + * to temporarily remove {@code module-info.class} from the test directory + * (otherwise {@code javac} does not seem to consider that we are patching a module). + * + * @throws IOException if an error occurred while renaming the file. + */ + private void substitute() throws IOException { + Files.move(testSourceFile, savedSourceFile); + Files.move(moduleInfoToHide, moduleInfoBackup); + Files.move(moduleInfoReplacement, moduleInfoToHide); + if (shutdownHook == null) { // Paranoiac check in case this method is invoked twice (should not happen). + shutdownHook = new Thread(this); + Runtime.getRuntime().addShutdownHook(shutdownHook); + } + } + + /** + * Restores the {@code module-info} file. + * + * @throws IOException if an error occurred while renaming the file. + */ + void restore() throws IOException { + if (shutdownHook != null) { + Runtime.getRuntime().removeShutdownHook(shutdownHook); + } + Files.move(savedSourceFile, testSourceFile); // File to restore in priority. + Files.move(moduleInfoToHide, moduleInfoReplacement); + Files.move(moduleInfoBackup, moduleInfoToHide); + } + + /** + * Invoked during JVM shutdown if user interrupted the compilation, for example with [Control-C]. + */ + @Override + @SuppressWarnings("CallToPrintStackTrace") + public void run() { + shutdownHook = null; + try { + restore(); + } catch (IOException e) { + // We cannot do much better because the loggers are shutting down. + e.printStackTrace(); + } + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/Options.java b/src/main/java/org/apache/maven/plugin/compiler/Options.java new file mode 100644 index 00000000..c12ec8f8 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/Options.java @@ -0,0 +1,340 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.tools.OptionChecker; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.function.UnaryOperator; + +import org.apache.maven.api.plugin.Log; + +/** + * An helper class for preparing the options to pass to the tool (compiler or document generator). + * It does not include the options related to paths (class-path, destination directory, etc.). + * If an option is unsupported by the tool, a message is logged at the warning level. + * + * @author Martin Desruisseaux + */ +public final class Options { + /** + * The list of options with their values. For example, in order to compile for Java 17, + * {@code --release} and {@code 17} shall be two consecutive elements in this list. + */ + final List options; + + /** + * The tools to use for checking whether an option is supported. + * It can be the Java compiler or the Javadoc generator. + */ + private final OptionChecker checker; + + /** + * Where to report warnings about unsupported options. + */ + private final Log logger; + + /** + * The warning message to log. This is used when a warning is not logged immediately, + * but deferred for allowing the caller to complete the message before to log. + */ + private String warning; + + /** + * Creates an initially empty list of options. + * + * @param checker the tools to use for checking whether an option is supported + * @param logger where to report warnings about unsupported options + */ + Options(OptionChecker checker, Log logger) { + options = new ArrayList<>(); + this.checker = checker; + this.logger = logger; + } + + /** + * Strips white spaces and returns the result if non-empty, or {@code null} otherwise. + * + * @param value the value from which to strip white spaces, or {@code null} + * @return the stripped value, or {@code null} if the value was null or blank + */ + private static String strip(String value) { + if (value != null) { + value = value.strip(); + if (value.isEmpty()) { + return null; + } + } + return value; + } + + /** + * Adds the given option if the given value is true and the option is supported. + * If the option is unsupported, then a warning is logged and the option is not added. + * + * @param option the option (e.g. {@code --enable-preview}) + * @param value value of the option + * @return whether the option has been added + */ + public boolean addIfTrue(String option, boolean value) { + if (value && checkNumberOfArguments(option, 0, true)) { + options.add(option); + return true; + } + return false; + } + + /** + * Adds the given option if a non-null and non-blank value is provided and if the option is supported. + * If the option is unsupported by the tool, then a warning is logged and the option is not added. + * + * @param option the option (e.g., {@code --release}) + * @param value value of the option, or {@code null} or blank if none + * @return whether the option has been added + */ + public boolean addIfNonBlank(String option, String value) { + value = strip(value); + if (value != null) { + if (checkNumberOfArguments(option, 1, true)) { + options.add(option); + options.add(value); + return true; + } + } + return false; + } + + /** + * Adds the given option using the {@code option:values} syntax where {@code values} is a coma-separated list. + * The option is added only if at least one non-blank value is provided. Values are converted to lower cases. + * Leading and trailing spaces are removed. If a filter is specified, then that filter will receive the values + * specified by the users and shall return the values to append, or {@code null} for not appending the option. + * + * @param option the option (e.g. {@code -g}) + * @param values coma-separated values of the option, or {@code null} if none + * @param valids valid values for better error message when needed, or {@code null} if unspecified + * @param filter filter to apply on the values before to add them, or {@code null} if none + * @return whether the option has been added + */ + public boolean addComaSeparated( + final String option, String values, Collection valids, UnaryOperator filter) { + if (values == null) { + return false; + } + /* + * Rebuild the comma-separated list of options with spaces removed, empty values omitted and case + * changed to lower-case. The split list will be reused for diagnostic if the option is not accepted. + */ + String[] split = values.split(","); + int count = 0; + for (String value : split) { + value = value.strip(); + if (!value.isEmpty()) { + split[count++] = value.toLowerCase(Locale.US); + } + } + /* + * If a filter is specified, replace the user-specified list by the filtered one. + * The filtering may result in an empty list, which is interpreted as an option without value. + * This is different than an absence of user-supplied values, which is interpreted as no option. + * This subtle difference explains why the check for absence of values is done before filtering, + * and is needed for making possible to replace "-g:all" by "-g" (because the "all" value is a + * Maven addition). + */ + if (count == 0) { + return false; + } + if (filter != null) { + if (count != split.length) { + split = Arrays.copyOfRange(split, 0, count); + } + split = filter.apply(split); + if (split == null) { + return false; + } + count = split.length; + } + /* + * Format the option (possibly with no values), then validate. + */ + var sb = new StringBuilder(option); + for (int i = 0; i < count; i++) { + sb.append(i == 0 ? ':' : ',').append(split[i]); + } + String s = sb.toString(); + if (checkNumberOfArguments(s, 0, false)) { + options.add(s); + return true; + } + /* + * A log message has been prepared in the `warning` field for saying that the option is not supported. + * If a collection of valid options was provided, use it for identifying which option was invalid. + */ + if (valids != null) { + for (int i = 0; i < count; i++) { + String value = split[i]; + if (!valids.contains(value)) { + sb.setLength(0); + sb.append(warning); + sb.setLength(sb.length() - 1); // Remove the trailing dot. + sb.append(", because the specified ") + .append(option) + .append(" value '") + .append(value) + .append("' is unexpected. Legal values are: "); + int j = 0; + for (String valid : valids) { + if (j++ != 0) { + sb.append(", "); + if (j == valids.size()) { + sb.append("and "); + } + } + sb.append('\'').append(valid).append('\''); + } + warning = sb.append('.').toString(); + break; + } + } + } + logger.warn(warning); + warning = null; + return false; + } + + /** + * Verifies the validity of the given memory setting and adds it as an option. + * If the value has no units and Maven defaults are enabled, appends "M" as the default units of measurement. + * Note: in the International System of Units, the symbol shall be upper-case "M". The lower-case "m" symbol + * is not correct as it stands for "milli". + * + * @param option the option (e.g. {@code -J-Xms}) + * @param label name of the XML element or attribute, used only if a warning message needs to be produced + * @param value the memory setting, or {@code null} if none + * @param addDefaultUnit whether to add a default unit (currently 'M') if none is provided + * @return whether the option has been added + */ + public boolean addMemoryValue(String option, String label, String value, boolean addDefaultUnit) { + value = strip(value); + if (value != null) { + int length = value.length(); + for (int i = 0; i < length; i++) { + char c = value.charAt(i); + if (c < '0' || c > '9') { // Do no use `isDigit(…)` because we do not accept other languages. + if (i == length - 1) { + c = Character.toUpperCase(c); + if (c == 'K' || c == 'M' || c == 'G') { + addDefaultUnit = false; + break; + } + } + logger.warn("Invalid value for " + label + "=\"" + value + "\". Ignoring this option."); + return false; + } + } + if (addDefaultUnit) { + value += 'M'; // Upper case because this is the correct case in International System of Units. + logger.warn("Value " + label + "=\"" + value + "\" has been specified without unit. " + + "An explicit \"M\" unit symbol should be appended for avoiding ambiguity."); + } + option += value; + if (checkNumberOfArguments(option, 0, true)) { + options.add(option); + return true; + } + } + return false; + } + + /** + * Verifies if the given option is supported and accepts the given number of arguments. + * If not, a warning is logged if {@code immediate} is {@code true}, or stored in the + * {@link #warning} field if {@code immediate} is {@code false}. + * + *

If a message is stored in {@link #warning}, then it will always end with a dot. + * This guarantee allows callers to delete the last character and replace it by a coma + * for continuing the sentence.

+ * + * @param option the option to validate + * @param count the number of arguments that the caller wants to provide + * @param immediate whether to log immediately or to store the message in {@link #warning} + * @return whether the given option is supported and accepts the specified number of arguments + */ + private boolean checkNumberOfArguments(String option, int count, boolean immediate) { + int expected = checker.isSupportedOption(option); + if (expected == count) { + warning = null; + return true; + } else if (expected < 1) { + if (checker instanceof ForkedCompiler) { + return true; // That implementation actually knows nothing about which options are supported. + } + warning = "The '" + option + "' option is not supported."; + } else if (expected == 0) { + warning = "The '" + option + "' option does not expect any argument."; + } else if (expected == 1) { + warning = "The '" + option + "' option expects a single argument."; + } else { + warning = "The '" + option + "' option expects " + expected + " arguments."; + } + if (immediate) { + logger.warn(warning); + warning = null; + } + return false; + } + + /** + * Adds the non-null and non-empty elements without verifying their validity. + * This method is used for user-specified compiler arguments. + * + * @param arguments the arguments to add, or {@code null} or empty if none + */ + public void addUnchecked(Iterable arguments) { + if (arguments != null) { + for (String arg : arguments) { + if (arg != null) { + arg = arg.strip(); + if (!arg.isEmpty()) { + options.add(arg); + } + } + } + } + } + + /** + * Splits the given arguments around spaces, then adds them without verifying their validity. + * This is used for user-specified arguments. + * + * @param arguments the arguments to add, or {@code null} if none + * + * @deprecated Use {@link #addUnchecked(List)} instead. This method does not check for quoted strings. + */ + @Deprecated(since = "4.0.0") + void addUnchecked(String arguments) { + if (arguments != null) { + addUnchecked(Arrays.asList(arguments.split(" "))); + } + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/PathFilter.java b/src/main/java/org/apache/maven/plugin/compiler/PathFilter.java new file mode 100644 index 00000000..d194b30e --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/PathFilter.java @@ -0,0 +1,305 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.tools.JavaFileObject; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.FileSystem; +import java.nio.file.FileVisitOption; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.PathMatcher; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.DosFileAttributes; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.List; +import java.util.function.Predicate; + +/** + * Applies inclusion and exclusion filters on paths, and builds a list of files in a directory tree. + * The set of allowed syntax contains at least "glob" and "regex". + * See {@link FileSystem#getPathMatcher(String)} Javadoc for a description of the "glob" syntax. + * If no syntax is specified, then the default syntax is "glob". + * + *

The list of files to process is built by applying the path matcher on each regular (non directory) files. + * The walk in file trees has the following characteristics:

+ * + *
    + *
  • Symbolic links are followed.
    • + *
  • Hidden files and hidden directories are ignored.
    • + *
+ * + * Instances of this class can be reused for filtering many directories, but is not thread safe. + * Each instance shall be used by a single thread only. + * + * @author Martin Desruisseaux + */ +final class PathFilter extends SimpleFileVisitor implements Predicate { + /** + * Whether to use the default include pattern. + * The pattern depends on the type of source file. + */ + private final boolean defaultInclude; + + /** + * All inclusion filters for the files in the directories to walk. The array shall contain at least one element. + * If {@link #defaultInclude} is {@code true}, then this array length shall be exactly 1 and the single element + * is overwritten for each directory to walk. + */ + private final String[] includes; + + /** + * All exclusion filters for the files in the directories to walk, or an empty array if none. + */ + private final String[] excludes; + + /** + * All exclusion filters for incremental build calculation, or an empty array if none. + * Updated files, if excluded by this filter, will not cause the project to be rebuilt. + */ + private final String[] incrementalExcludes; + + /** + * The matchers for inclusion filters (never empty). + * The array length shall be equal to the {@link #includes} array length. + * The values are initially null and overwritten when first needed, then when the file system changes. + */ + private final PathMatcher[] includeMatchers; + + /** + * The matchers for exclusion filters (potentially empty). + * The array length shall be equal to the {@link #excludes} array length. + * The values are initially null and overwritten when first needed, then when the file system changes. + */ + private final PathMatcher[] excludeMatchers; + + /** + * The matchers for exclusion filters for incremental build calculation. + * The array length shall be equal to the {@link #incrementalExcludes} array length. + * The values are initially null and overwritten when first needed, then when the file system changes. + */ + private final PathMatcher[] incrementalExcludeMatchers; + + /** + * Whether paths must be relativized before to be given to a matcher. If {@code true} (the default), + * then every paths will be made relative to the source root directory for allowing patterns like + * {@code "foo/bar/*.java"} to work. As a slight optimization, we can skip this step if all patterns + * start with {@code "**"}. + */ + private final boolean needRelativize; + + /** + * The file system of the path matchers, or {@code null} if not yet determined. + * This is used in case not all paths are on the same file system. + */ + private FileSystem fs; + + /** + * The result of listing all files, or {@code null} if no walking is in progress. + * This field is temporarily assigned a value when walking in a tree of directories, + * then reset to {@code null} after the walk finished. + */ + private List sourceFiles; + + /** + * The root directory of files being scanned. + * This field is temporarily assigned a value when walking in a tree of directories, + * then reset to {@code null} after the walk finished. + */ + private SourceDirectory sourceRoot; + + /** + * Creates a new filter. + * + * @param includes inclusion filters for the compiler, or empty for all source files + * @param excludes exclusion filters for the compiler + * @param incrementalExcludes exclusion filters for incremental build calculation + */ + PathFilter(Collection includes, Collection excludes, Collection incrementalExcludes) { + defaultInclude = includes.isEmpty(); + if (defaultInclude) { + includes = List.of("**"); + } + this.includes = includes.toArray(String[]::new); + this.excludes = excludes.toArray(String[]::new); + this.incrementalExcludes = incrementalExcludes.toArray(String[]::new); + includeMatchers = new PathMatcher[this.includes.length]; + excludeMatchers = new PathMatcher[this.excludes.length]; + incrementalExcludeMatchers = new PathMatcher[this.incrementalExcludes.length]; + needRelativize = needRelativize(this.includes) || needRelativize(this.excludes); + } + + /** + * Returns {@code true} if at least one pattern does not start with {@code "**"}. + * This is a slight optimization for avoiding the need to relativize each path + * before to give it to a matcher. + */ + private static boolean needRelativize(String[] patterns) { + for (String pattern : patterns) { + if (!pattern.startsWith("**")) { + return true; + } + } + return false; + } + + /** + * If the default include patterns is used, updates it for the given kind of source files. + * + * @param sourceFileKind the kind of files to compile + */ + private void updateDefaultInclude(JavaFileObject.Kind sourceFileKind) { + if (defaultInclude) { + String pattern = "glob:**" + sourceFileKind.extension; + if (!pattern.equals(includes[0])) { + includes[0] = pattern; + if (fs != null) { + createMatchers(includes, includeMatchers, fs); + } + } + } + } + + /** + * Fills the target array with path matchers created from the given patterns. + * If a pattern does not specify a syntax, then the "glob" syntax is used by default. + * + *

This method should be invoked only once, unless different paths are on different file systems.

+ */ + private static void createMatchers(String[] patterns, PathMatcher[] target, FileSystem fs) { + for (int i = 0; i < patterns.length; i++) { + String pattern = patterns[i]; + if (pattern.indexOf(':') < 0) { + pattern = "glob:" + pattern; + } + target[i] = fs.getPathMatcher(pattern); + } + } + + /** + * Tests whether the given path should be included according the include/exclude patterns. + * This method does not perform any I/O operation. For example, it does not check if the file is hidden. + * + * @param path the source file to test + * @return whether the given source file should be included + */ + @Override + public boolean test(Path path) { + FileSystem pfs = path.getFileSystem(); + if (pfs != fs) { + createMatchers(includes, includeMatchers, pfs); + createMatchers(excludes, excludeMatchers, pfs); + createMatchers(incrementalExcludes, incrementalExcludeMatchers, pfs); + fs = pfs; + } + if (needRelativize) { + path = sourceRoot.root.relativize(path); + } + for (PathMatcher include : includeMatchers) { + if (include.matches(path)) { + for (PathMatcher exclude : excludeMatchers) { + if (exclude.matches(path)) { + return false; + } + } + return true; + } + } + return false; + } + + /** + * {@return whether to ignore the given file for incremental build calculation}. + * This method shall be invoked only after {@link #test(Path)} for the same file, + * because it depends on matcher updates performed by the {@code test} method. + */ + private boolean ignoreModification(Path path) { + for (PathMatcher exclude : incrementalExcludeMatchers) { + if (exclude.matches(path)) { + return true; + } + } + return false; + } + + /** + * Invoked for a file in a directory. If the given file is not hidden and pass the include/exclude filters, + * then it is added to the list of source files. + */ + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + if (!isHidden(file, attrs) && test(file)) { + sourceFiles.add(new SourceFile(sourceRoot, file, attrs, ignoreModification(file))); + } + return FileVisitResult.CONTINUE; + } + + /** + * Invoked for a directory before entries in the directory are visited. + * If the directory is hidden, then it is skipped. + */ + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + return isHidden(dir, attrs) ? FileVisitResult.SKIP_SUBTREE : FileVisitResult.CONTINUE; + } + + /** + * {@return whether the given file is hidden}. This method is used instead of {@link Files#isHidden(Path)} + * because it opportunistically uses the available attributes instead of making another access to the file system. + */ + private static boolean isHidden(Path file, BasicFileAttributes attrs) { + if (attrs instanceof DosFileAttributes dos) { + return dos.isHidden(); + } else { + return file.getFileName().toString().startsWith("."); + } + } + + /** + * {@return all source files found in the given root directories}. + * The include and exclude filters specified at construction time are applied. + * Hidden files and directories are ignored, and symbolic links are followed. + * + * @param rootDirectories the root directories to scan + * @throws IOException if a root directory cannot be walked + */ + public List walkSourceFiles(Iterable rootDirectories) throws IOException { + final var result = new ArrayList(); + try { + sourceFiles = result; + for (SourceDirectory directory : rootDirectories) { + sourceRoot = directory; + updateDefaultInclude(directory.fileKind); + Files.walkFileTree(directory.root, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, this); + } + } catch (UncheckedIOException e) { + throw e.getCause(); + } finally { + sourceRoot = null; + sourceFiles = null; + } + return result; + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/Providers.java b/src/main/java/org/apache/maven/plugin/compiler/Providers.java index c02156b8..b43dda1a 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/Providers.java +++ b/src/main/java/org/apache/maven/plugin/compiler/Providers.java @@ -18,19 +18,17 @@ */ package org.apache.maven.plugin.compiler; -import java.lang.reflect.Field; -import java.util.Map; - import org.apache.maven.api.Session; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Provides; -import org.apache.maven.api.services.*; -import org.codehaus.plexus.compiler.Compiler; -import org.codehaus.plexus.compiler.javac.JavacCompiler; -import org.codehaus.plexus.compiler.javac.JavaxToolsCompiler; -import org.codehaus.plexus.compiler.manager.CompilerManager; -import org.codehaus.plexus.compiler.manager.NoSuchCompilerException; +import org.apache.maven.api.services.ArtifactManager; +import org.apache.maven.api.services.MessageBuilderFactory; +import org.apache.maven.api.services.ProjectManager; +import org.apache.maven.api.services.ToolchainManager; +/** + * For providing instances to fields annotated with {@code @Inject} if the MOJO. + */ @Named class Providers { @@ -53,26 +51,4 @@ static ProjectManager projectManager(Session session) { static MessageBuilderFactory messageBuilderFactory(Session session) { return session.getService(MessageBuilderFactory.class); } - - @Provides - static CompilerManager compilerManager(Map compilers) { - return compilerId -> { - Compiler compiler = compilers.get(compilerId); - if (compiler == null) { - throw new NoSuchCompilerException(compilerId); - } else { - return compiler; - } - }; - } - - @Provides - @Named("javac") - static Compiler javacCompiler() throws Exception { - JavacCompiler compiler = new JavacCompiler(); - Field ipc = JavacCompiler.class.getDeclaredField("inProcessCompiler"); - ipc.setAccessible(true); - ipc.set(compiler, new JavaxToolsCompiler()); - return compiler; - } } diff --git a/src/main/java/org/apache/maven/plugin/compiler/SourceDirectory.java b/src/main/java/org/apache/maven/plugin/compiler/SourceDirectory.java new file mode 100644 index 00000000..180f7218 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/SourceDirectory.java @@ -0,0 +1,238 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.lang.model.SourceVersion; +import javax.tools.JavaFileObject; + +import java.nio.file.FileSystem; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +/** + * A single root directory of source files, associated with module name and release version. + * The module names are used when compiling a Module Source Hierarchy. + * The release version is used for multi-versions JAR files. + * + *

This class contains also the output directory, because this information is needed + * for determining whether a source file need to be recompiled.

+ * + * @author Martin Desruisseaux + */ +final class SourceDirectory { + /** + * The module-info filename, without extension. + */ + static final String MODULE_INFO = "module-info"; + + /** + * File suffix of source code. + */ + static final String JAVA_FILE_SUFFIX = ".java"; + + /** + * File suffix of compiler classes. + */ + static final String CLASS_FILE_SUFFIX = ".class"; + + /** + * The root directory of all source files. + */ + final Path root; + + /** + * Kind of source files in this directory. This is usually {@link JavaFileObject.Kind#SOURCE}. + * This information is used for building a default include filter such as {@code "glob:*.java} + * if the user didn't specified an explicit filter. The default include filter may change for + * each root directory. + */ + final JavaFileObject.Kind fileKind; + + /** + * Name of the module for which source directories are provided, or {@code null} if none. + * This name is supplied to the constructor instead of parsed from {@code module-info.java} + * file because the latter may not exist in this directory. For example, in a multi-release + * project the module-info may be declared in another directory for the base version. + */ + final String moduleName; + + /** + * Path to the {@code module-info} file, or {@code null} if none. This flag is set when + * walking through the directory content. This is related, but not strictly equivalent, + * to whether the {@link #moduleName} is non-null. + */ + private Path moduleInfo; + + /** + * The Java release for which source directories are provided, or {@code null} for the default release. + * This is used for multi-versions JAR files. + */ + final SourceVersion release; + + /** + * The directory where to store the compilation results. + * This is the MOJO output directory with sub-directories appended according the following rules, in that order: + * + *
    + *
  1. If {@link #moduleName} is non-null, then the module name is appended.
    2. + *
  2. If {@link #release} is non-null, then the next elements in the paths are + * {@code "META-INF/versions/"} where {@code } is the release number.
    3. + *
+ */ + final Path outputDirectory; + + /** + * Kind of output files in the output directory. + * This is usually {@link JavaFileObject.Kind#CLASS}. + */ + final JavaFileObject.Kind outputFileKind; + + /** + * Creates a new source directory. + * + * @param root the root directory of all source files + * @param fileKind kind of source files in this directory (usually {@code SOURCE}) + * @param moduleName name of the module for which source directories are provided, or {@code null} if none + * @param release Java release for which source directories are provided, or {@code null} for the default release + * @param outputDirectory the directory where to store the compilation results + * @param outputFileKind Kind of output files in the output directory (usually {@ codeCLASS}) + */ + private SourceDirectory( + Path root, + JavaFileObject.Kind fileKind, + String moduleName, + SourceVersion release, + Path outputDirectory, + JavaFileObject.Kind outputFileKind) { + this.root = Objects.requireNonNull(root); + this.fileKind = Objects.requireNonNull(fileKind); + this.moduleName = moduleName; + this.release = release; + if (release != null) { + String version = release.name(); + version = version.substring(version.lastIndexOf('_') + 1); + FileSystem fs = outputDirectory.getFileSystem(); + Path subdir; + if (moduleName != null) { + subdir = fs.getPath(moduleName, "META-INF", "versions", version); + } else { + subdir = fs.getPath("META-INF", "versions", version); + } + outputDirectory = outputDirectory.resolve(subdir); + } else if (moduleName != null) { + outputDirectory = outputDirectory.resolve(moduleName); + } + this.outputDirectory = outputDirectory; + this.outputFileKind = outputFileKind; + } + + /** + * Converts the given list of paths to a list of source directories. + * The returned list includes only the directories that exist. + * + * @param compileSourceRoots the root paths to source files + * @param outputDirectory the directory where to store the compilation results + * @return the given list of paths wrapped as source directory objects + */ + static List fromPaths(List compileSourceRoots, Path outputDirectory) { + var roots = new ArrayList(compileSourceRoots.size()); + for (Path p : compileSourceRoots) { + if (Files.exists(p)) { + // TODO: specify file kind, module name and release version. + roots.add(new SourceDirectory( + p, JavaFileObject.Kind.SOURCE, null, null, outputDirectory, JavaFileObject.Kind.CLASS)); + } + } + return roots; + } + + /** + * Returns whether the given file is a {@code module-info.java} file. + * TODO: we could make this method non-static and verify that the given + * file is in the root of this directory. + */ + static boolean isModuleInfoSource(Path file) { + return (MODULE_INFO + JAVA_FILE_SUFFIX).equals(file.getFileName().toString()); + } + + /** + * Invoked for each source files in this directory. + */ + void visit(Path sourceFile) { + if (isModuleInfoSource(sourceFile)) { + // Paranoiac check: only one file should exist, but if many, keep the one closest to the root. + if (moduleInfo == null || moduleInfo.getNameCount() >= sourceFile.getNameCount()) { + moduleInfo = sourceFile; + } + } + } + + /** + * Path to the {@code module-info.java} source file, or empty if none. + * This information is accurate only after {@link PathFilter} finished + * to walk through all source files in a directory. + */ + public Optional getModuleInfo() { + return Optional.ofNullable(moduleInfo); + } + + /** + * Compares the given object with this source directory for equality. + * + * @param obj the object to compare + * @return whether the two objects have the same path, module name and release version + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof SourceDirectory other) { + return release == other.release + && Objects.equals(moduleName, other.moduleName) + && root.equals(other.root) + && outputDirectory.equals(other.outputDirectory); + } + return false; + } + + /** + * {@return a hash code value for this root directory}. + */ + @Override + public int hashCode() { + return root.hashCode() + 7 * Objects.hash(moduleName, release); + } + + /** + * {@return a string representation of this root directory for debugging purposes}. + */ + @Override + public String toString() { + var sb = new StringBuilder(100).append('"').append(root).append('"'); + if (moduleName != null) { + sb.append(" for module \"").append(moduleName).append('"'); + } + if (release != null) { + sb.append(" on Java release ").append(release); + } + return sb.toString(); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/SourceFile.java b/src/main/java/org/apache/maven/plugin/compiler/SourceFile.java new file mode 100644 index 00000000..cae5baee --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/SourceFile.java @@ -0,0 +1,174 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributes; + +/** + * A single source file, associated with the root directory from which it belong. + * This class contains also the output file, because this information is needed + * for determining whether a source file need to be recompiled. + * + * @author Martin Desruisseaux + */ +final class SourceFile { + /** + * The root directory which was walked for obtaining this file. + */ + final SourceDirectory directory; + + /** + * The source file found by walking under the directory. + * This path is already resolved relative to {@link SourceDirectory#root}. + */ + final Path file; + + /** + * The time this file object was last modified, in milliseconds since January 1, 1970. + */ + final long lastModified; + + /** + * Whether this source has been flagged as new or modified since the last build. + * + * @see IncrementalBuildHelper#inputFileTreeChanges + */ + boolean isNewOrModified; + + /** + * Whether to ignore this file for incremental build calculation. + * This flag is set to {@code true} if this file matches a filter + * specified by {@link AbstractCompilerMojo#getIncrementalExcludes()}. + * + *

Note that a value of {@code true} should not prevent the {@link #isNewOrModified} flag to be + * set to {@code true} if a modification is detected, because we want this file to be included in + * compilation unit if a compilation is decided for another reason than a change of this file.

+ * + * @see AbstractCompilerMojo#getIncrementalExcludes() + */ + final boolean ignoreModification; + + /** + * The path of the {@code .class} file, created when first requested. + * + * @see #getOutputFile(boolean) + */ + private Path outputFile; + + /** + * Creates a new source file. + * + * @param directory the root directory where the file come from + * @param file a source file found by walking under the directory + * @param attrs the source file attributes + * @param ignoreModification whether to ignore this file for incremental build calculation + */ + SourceFile(SourceDirectory directory, Path file, BasicFileAttributes attrs, boolean ignoreModification) { + this.directory = directory; + this.file = file; + this.lastModified = attrs.lastModifiedTime().toMillis(); + this.ignoreModification = ignoreModification; + directory.visit(file); + } + + /** + * Returns the file resulting from the compilation of this source file. If the output file has been + * {@linkplain javax.tools.JavaFileManager#getFileForOutput obtained from the compiler}, that value + * if returned. Otherwise if {@code infer} is {@code true}, then the output file is inferred using + * {@linkplain #toOutputFile heuristic rules}. + * + * @param infer whether to allow this method to infer a default path using heuristic rules + * @return path to the output file, or {@code null} if unspecified and {@code infer} is {@code false} + */ + Path getOutputFile(boolean infer) { + if (!infer) { + /* + * TODO: add a `setOutputFile(Path)` method after we clarified how to get this information from the compiler. + * It may be from javax.tools.JavaFileManager.getFileForOutput(...). + */ + return null; + } + if (outputFile == null) { + outputFile = toOutputFile( + directory.root, + directory.outputDirectory, + file, + directory.fileKind.extension, + directory.outputFileKind.extension); + } + return outputFile; + } + + /** + * Infers the path to the output file using heuristic rules. + * If the extension of the file is the one of {@linkplain SourceDirectory#fileKind source file kind} + * (usually {@code ".java"}), then it is replaced by the extension specified in {@code outputFileKind}. + * Otherwise the extension is left unmodified. Then, the path is made relative to the output directory. + * + * @param sourceDirectory root directory of the source file + * @param outputDirectory output directory of the compiled file + * @param file path to the source file + * @param extension expected extension of the source file, leading dot included + * @param outext extension of the output file, leading dot included + * @return path to the target file + */ + static Path toOutputFile(Path sourceDirectory, Path outputDirectory, Path file, String extension, String outext) { + Path output = sourceDirectory.relativize(file); + String filename = file.getFileName().toString(); + if (filename.endsWith(extension)) { + filename = filename.substring(0, filename.length() - extension.length()); + filename = filename.concat(outext); + output = output.resolveSibling(filename); + } + return outputDirectory.resolve(output); + } + + /** + * Compares the given object with this source file for equality. + * This method compares only the file path. Metadata such as last modification time are ignored. + * + * @param obj the object to compare + * @return whether the two objects have the same path and attributes + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof SourceFile other) { + return file.equals(other.file) && directory.equals(other.directory); + } + return false; + } + + /** + * {@return a hash code value for this file}. + */ + @Override + public int hashCode() { + return directory.hashCode() + 7 * file.hashCode(); + } + + /** + * {@return a string representation of this source file for debugging purposes}. + * This string representation is shown in Maven output if debug logs are enabled. + */ + @Override + public String toString() { + return file.toString(); + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/SourcesForRelease.java b/src/main/java/org/apache/maven/plugin/compiler/SourcesForRelease.java new file mode 100644 index 00000000..68c76086 --- /dev/null +++ b/src/main/java/org/apache/maven/plugin/compiler/SourcesForRelease.java @@ -0,0 +1,181 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler; + +import javax.lang.model.SourceVersion; + +import java.io.Closeable; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Source files for a specific Java release. Instances of {@code SourcesForRelease} are created from + * a list of {@link SourceFile} after the sources have been filtered according include and exclude filters. + * + * @author Martin Desruisseaux + */ +final class SourcesForRelease implements Closeable { + /** + * The release for this set of sources. For this class, the + * {@link SourceVersion#RELEASE_0} value means "no version". + */ + final SourceVersion release; + + /** + * All source files. + */ + final List files; + + /** + * The root directories for each module. Keys are module names. + * The empty string stands for no module. + */ + final Map> roots; + + /** + * The directories that contains a {@code module-info.java} file. If the set of source files + * is for a Java release different than the base release, or if it is for the test sources, + * then a non-empty map means that some modules overwrite {@code module-info.class}. + */ + private final Map moduleInfos; + + /** + * Last directory added to the {@link #roots} map. This is a small optimization for reducing + * the number of accesses to the map. In most cases, only one element will be written there. + */ + private SourceDirectory lastDirectoryAdded; + + /** + * Creates an initially empty instance for the given Java release. + * + * @param release the release for this set of sources, or {@link SourceVersion#RELEASE_0} for no version. + */ + private SourcesForRelease(SourceVersion release) { + this.release = release; + roots = new LinkedHashMap<>(); + files = new ArrayList<>(256); + moduleInfos = new LinkedHashMap<>(); + } + + /** + * Adds the given source file to this collection of source files. + * The value of {@code source.directory.release} must be {@link #release}. + * + * @param source the source file to add. + */ + private void add(SourceFile source) { + var directory = source.directory; + if (lastDirectoryAdded != directory) { + lastDirectoryAdded = directory; + String moduleName = directory.moduleName; + if (moduleName == null) { + moduleName = ""; + } + roots.computeIfAbsent(moduleName, (key) -> new LinkedHashSet<>()).add(directory.root); + directory.getModuleInfo().ifPresent((path) -> moduleInfos.put(directory, null)); + } + files.add(source.file); + } + + /** + * Groups all sources files first by Java release versions, then by module names. + * The elements in the returned collection are sorted in the order of {@link SourceVersion} + * enumeration values. It should match the increasing order of Java releases. + * + * @param sources the sources to group. + * @return the given sources grouped by Java release versions and module names. + */ + public static Collection groupByReleaseAndModule(List sources) { + var result = new EnumMap(SourceVersion.class); + for (SourceFile source : sources) { + SourceVersion release = source.directory.release; + if (release == null) { + release = SourceVersion.RELEASE_0; // No release sub-directory for the compiled classes. + } + result.computeIfAbsent(release, SourcesForRelease::new).add(source); + } + // TODO: add empty set for all modules present in a release but not in the next release. + return result.values(); + } + + /** + * If there is any {@code module-info.class} in the main classes that are overwritten by this set of sources, + * temporarily replace the main files by the test files. The {@link #close()} method must be invoked after + * this method for resetting the original state. + * + *

This method is invoked when the test files overwrite the {@code module-info.class} from the main files. + * This method should not be invoked during the compilation of main classes, as its behavior may be not well + * defined.

+ */ + void substituteModuleInfos(final Path mainOutputDirectory, final Path testOutputDirectory) throws IOException { + for (Map.Entry entry : moduleInfos.entrySet()) { + Path main = mainOutputDirectory; + Path test = testOutputDirectory; + SourceDirectory directory = entry.getKey(); + String moduleName = directory.moduleName; + if (moduleName != null) { + main = main.resolve(moduleName); + if (!Files.isDirectory(main)) { + main = mainOutputDirectory; + } + test = test.resolve(moduleName); + if (!Files.isDirectory(test)) { + test = testOutputDirectory; + } + } + Path source = directory.getModuleInfo().orElseThrow(); // Should never be absent for entries in the map. + entry.setValue(ModuleInfoOverwrite.create(source, main, test)); + } + } + + /** + * Restores the hidden {@code module-info.class} files to their original names. + */ + @Override + public void close() throws IOException { + IOException error = null; + for (Map.Entry entry : moduleInfos.entrySet()) { + ModuleInfoOverwrite mo = entry.getValue(); + if (mo != null) { + entry.setValue(null); + try { + mo.restore(); + } catch (IOException e) { + if (error == null) { + error = e; + } else { + error.addSuppressed(e); + } + } + } + } + if (error != null) { + throw error; + } + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java index 5eb5b40f..ed3b729e 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java @@ -18,469 +18,600 @@ */ package org.apache.maven.plugin.compiler; +import javax.tools.JavaCompiler; +import javax.tools.OptionChecker; + import java.io.IOException; +import java.io.InputStream; +import java.lang.module.ModuleDescriptor; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.StringJoiner; -import org.apache.maven.api.JavaToolchain; -import org.apache.maven.api.PathScope; +import org.apache.maven.api.Dependency; +import org.apache.maven.api.JavaPathType; +import org.apache.maven.api.PathType; import org.apache.maven.api.ProjectScope; -import org.apache.maven.api.Toolchain; +import org.apache.maven.api.annotations.Nonnull; +import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.plugin.MojoException; import org.apache.maven.api.plugin.annotations.Mojo; import org.apache.maven.api.plugin.annotations.Parameter; -import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner; -import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor; -import org.codehaus.plexus.languages.java.jpms.LocationManager; -import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest; -import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult; +import org.apache.maven.api.services.DependencyResolverResult; +import org.apache.maven.api.services.MessageBuilder; + +import static org.apache.maven.plugin.compiler.SourceDirectory.CLASS_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.JAVA_FILE_SUFFIX; +import static org.apache.maven.plugin.compiler.SourceDirectory.MODULE_INFO; /** * Compiles application test sources. - * By default uses the javac compiler - * of the JDK used to execute Maven. This can be overwritten through Toolchains - * or parameter {@link AbstractCompilerMojo#compilerId}. + * Each instance shall be used only once, then discarded. * * @author Jason van Zyl - * @since 2.0 + * @author Martin Desruisseaux * @see javac Command + * @since 2.0 */ @Mojo(name = "testCompile", defaultPhase = "test-compile") public class TestCompilerMojo extends AbstractCompilerMojo { /** - * Set this to 'true' to bypass compilation of test sources. - * Its use is NOT RECOMMENDED, but quite convenient on occasion. + * Whether to bypass compilation of test sources. + * Its use is not recommended, but quite convenient on occasion. + * + * @see CompilerMojo#skipMain */ @Parameter(property = "maven.test.skip") - private boolean skip; + protected boolean skip; /** * The source directories containing the test-source to be compiled. + * + * @see CompilerMojo#compileSourceRoots */ @Parameter - private List compileSourceRoots; - - /** - * The directory where compiled test classes go. - */ - @Parameter(defaultValue = "${project.build.outputDirectory}", required = true) - private Path mainOutputDirectory; + protected List compileSourceRoots; /** - * The directory where compiled test classes go. - *

- * This parameter should only be modified in special cases. - * See the {@link CompilerMojo#outputDirectory} for more information. + * Specify where to place generated source files created by annotation processing. * - * @see CompilerMojo#outputDirectory + * @see CompilerMojo#generatedSourcesDirectory + * @since 2.2 */ - @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true) - private Path outputDirectory; + @Parameter(defaultValue = "${project.build.directory}/generated-test-sources/test-annotations") + protected Path generatedTestSourcesDirectory; /** - * A list of inclusion filters for the compiler. + * A set of inclusion filters for the compiler. + * + * @see CompilerMojo#includes */ @Parameter - private Set testIncludes = new HashSet<>(); + protected Set testIncludes; /** - * A list of exclusion filters for the compiler. + * A set of exclusion filters for the compiler. + * + * @see CompilerMojo#excludes */ @Parameter - private Set testExcludes = new HashSet<>(); + protected Set testExcludes; /** - * A list of exclusion filters for the incremental calculation. + * A set of exclusion filters for the incremental calculation. + * Updated files, if excluded by this filter, will not cause the project to be rebuilt. + * + * @see CompilerMojo#incrementalExcludes * @since 3.11 */ @Parameter - private Set testIncrementalExcludes = new HashSet<>(); + protected Set testIncrementalExcludes; /** - * The -source argument for the test Java compiler. + * The {@code --source} argument for the test Java compiler. * + * @see CompilerMojo#source * @since 2.1 */ @Parameter(property = "maven.compiler.testSource") - private String testSource; + protected String testSource; /** - * The -target argument for the test Java compiler. + * The {@code --target} argument for the test Java compiler. * + * @see CompilerMojo#target * @since 2.1 */ @Parameter(property = "maven.compiler.testTarget") - private String testTarget; + protected String testTarget; /** - * the -release argument for the test Java compiler + * the {@code --release} argument for the test Java compiler * + * @see CompilerMojo#release * @since 3.6 */ @Parameter(property = "maven.compiler.testRelease") - private String testRelease; + protected String testRelease; /** - *

- * Sets the arguments to be passed to test compiler (prepending a dash) if fork is set to true. - *

- *

- * This is because the list of valid arguments passed to a Java compiler - * varies based on the compiler version. - *

+ * The arguments to be passed to the test compiler. + * If this parameter is specified, it replaces {@link #compilerArgs}. + * Otherwise, the {@code compilerArgs} parameter is used. + * + * @see CompilerMojo#compilerArgs + * @since 4.0.0 + */ + @Parameter + protected List testCompilerArgs; + + /** + * The arguments to be passed to test compiler. + * + * @deprecated Replaced by {@link #testCompilerArgs} for consistency with the main phase. * * @since 2.1 */ @Parameter - private Map testCompilerArguments; + @Deprecated(since = "4.0.0") + protected Map testCompilerArguments; /** - *

- * Sets the unformatted argument string to be passed to test compiler if fork is set to true. - *

- *

- * This is because the list of valid arguments passed to a Java compiler - * varies based on the compiler version. - *

+ * The single argument string to be passed to the test compiler. + * If this parameter is specified, it replaces {@link #compilerArgument}. + * Otherwise, the {@code compilerArgument} parameter is used. + * + * @deprecated Use {@link #testCompilerArgs} instead. * + * @see CompilerMojo#compilerArgument * @since 2.1 */ @Parameter - private String testCompilerArgument; + @Deprecated(since = "4.0.0") + protected String testCompilerArgument; /** - *

- * Specify where to place generated source files created by annotation processing. - * Only applies to JDK 1.6+ - *

+ * The directory where compiled test classes go. + * This parameter should only be modified in special cases. + * See the {@link CompilerMojo#outputDirectory} for more information. * - * @since 2.2 + * @see CompilerMojo#outputDirectory */ - @Parameter(defaultValue = "${project.build.directory}/generated-test-sources/test-annotations") - private Path generatedTestSourcesDirectory; + @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true) + protected Path outputDirectory; /** - *

- * When {@code true}, uses the module path when compiling with a release or target of 9+ and - * module-info.java or module-info.class is present. - * When {@code false}, always uses the class path. - *

+ * The output directory of the main classes. + * This directory will be added to the class-path or module-path. + * Its value should be the same as {@link CompilerMojo#outputDirectory}. + * + * @see CompilerMojo#outputDirectory + * @see #addImplicitDependencies(Map, boolean) + */ + @Parameter(defaultValue = "${project.build.outputDirectory}", required = true, readonly = true) + protected Path mainOutputDirectory; + + /** + * Whether to place the main classes on the module path when {@code module-info} is present. + * When {@code false}, always places the main classes on the class path. + * Dependencies are also placed on the class-path, unless their type is {@code module-jar}. * * @since 3.11 + * + * @deprecated Use {@code "claspath-jar"} dependency type instead, and avoid {@code module-info.java} in tests. */ + @Deprecated(since = "4.0.0") @Parameter(defaultValue = "true") - private boolean useModulePath; - - @Parameter - private List testPath; + protected boolean useModulePath = true; /** - * when forking and debug activated the commandline used will be dumped in this file - * @since 3.10.0 + * Name of the main module to compile, or {@code null} if not yet determined. + * If the project is not modular, an empty string. + * + * TODO: use "*" as a sentinel value for modular source hierarchy. + * + * @see #getMainModuleName() */ - @Parameter(defaultValue = "javac-test") - private String debugFileName; + private String moduleName; - final LocationManager locationManager = new LocationManager(); + /** + * Whether a {@code module-info.java} file is defined in the test sources. + * In such case, it has precedence over the {@code module-info.java} in main sources. + * This is defined for compatibility with Maven 3, but not recommended. + */ + private boolean hasTestModuleInfo; - private Map pathElements; + /** + * Whether the {@code module-info} of the tests overwrites the main {@code module-info}. + * This is a deprecated practice, but is accepted if {@link #SUPPORT_LEGACY} is true. + */ + private boolean overwriteMainModuleInfo; - private List classpathElements; + /** + * The file where to dump the command-line when debug is activated or when the compilation failed. + * For example, if the value is {@code "javac-test"}, then the Java compiler can be launched + * from the command-line by typing {@code javac @target/javac-test.args}. + * The debug file will contain the compiler options together with the list of source files to compile. + * + * @see CompilerMojo#debugFileName + * @since 3.10.0 + */ + @Parameter(defaultValue = "javac-test.args") + protected String debugFileName; - private List modulepathElements; + /** + * Creates a new test compiler MOJO. + */ + public TestCompilerMojo() { + super(true); + } + /** + * Runs the Java compiler on the test source code. + * + * @throws MojoException if the compiler cannot be run. + */ + @Override public void execute() throws MojoException { if (skip) { - getLog().info("Not compiling test sources"); + logger.info("Not compiling test sources"); return; } super.execute(); } + /** + * Parses the parameters declared in the MOJO. + * + * @param compiler the tools to use for verifying the validity of options + * @return the options after validation + */ + @Override + @SuppressWarnings("deprecation") + protected Options acceptParameters(final OptionChecker compiler) { + Options compilerConfiguration = super.acceptParameters(compiler); + compilerConfiguration.addUnchecked( + testCompilerArgs == null || testCompilerArgs.isEmpty() ? compilerArgs : testCompilerArgs); + if (testCompilerArguments != null) { + for (Map.Entry entry : testCompilerArguments.entrySet()) { + compilerConfiguration.addUnchecked(List.of(entry.getKey(), entry.getValue())); + } + } + compilerConfiguration.addUnchecked(testCompilerArgument == null ? compilerArgument : testCompilerArgument); + return compilerConfiguration; + } + + /** + * {@return the root directories of Java source files to compile for the tests}. + */ + @Nonnull + @Override protected List getCompileSourceRoots() { if (compileSourceRoots == null || compileSourceRoots.isEmpty()) { - return projectManager.getCompileSourceRoots(getProject(), ProjectScope.TEST); + return projectManager.getCompileSourceRoots(project, ProjectScope.TEST); } else { - return compileSourceRoots.stream().map(Paths::get).collect(Collectors.toList()); + return compileSourceRoots.stream().map(Paths::get).toList(); } } + /** + * {@return the path where to place generated source files created by annotation processing on the test classes}. + */ + @Nullable @Override - protected Map getPathElements() { - return pathElements; + protected Path getGeneratedSourcesDirectory() { + return generatedTestSourcesDirectory; } - protected List getClasspathElements() { - return classpathElements; + /** + * {@return the inclusion filters for the compiler, or an empty set for all Java source files}. + */ + @Override + protected Set getIncludes() { + return (testIncludes != null) ? testIncludes : Set.of(); } + /** + * {@return the exclusion filters for the compiler, or an empty set if none}. + */ @Override - protected List getModulepathElements() { - return modulepathElements; + protected Set getExcludes() { + return (testExcludes != null) ? testExcludes : Set.of(); } - protected Path getOutputDirectory() { - return outputDirectory; + /** + * {@return the exclusion filters for the incremental calculation, or an empty set if none}. + */ + @Override + protected Set getIncrementalExcludes() { + return (testIncrementalExcludes != null) ? testIncrementalExcludes : Set.of(); } + /** + * If a different source version has been specified for the tests, returns that version. + * Otherwise returns the same source version as the main code. + * + * @return the {@code --source} argument for the Java compiler + */ + @Nullable @Override - protected void preparePaths(Set sourceFiles) { - List testPath = this.testPath; - if (testPath == null) { - Stream s1 = Stream.of(outputDirectory.toString(), mainOutputDirectory.toString()); - Stream s2 = session.resolveDependencies(getProject(), PathScope.TEST_COMPILE).stream() - .map(Path::toString); - testPath = Stream.concat(s1, s2).collect(Collectors.toList()); - } - - Path mainOutputDirectory = Paths.get(getProject().getBuild().getOutputDirectory()); - - Path mainModuleDescriptorClassFile = mainOutputDirectory.resolve("module-info.class"); - JavaModuleDescriptor mainModuleDescriptor = null; - - Path testModuleDescriptorJavaFile = Paths.get("module-info.java"); - JavaModuleDescriptor testModuleDescriptor = null; - - // Go through the source files to respect includes/excludes - for (Path sourceFile : sourceFiles) { - // @todo verify if it is the root of a sourcedirectory? - if ("module-info.java".equals(sourceFile.getFileName().toString())) { - testModuleDescriptorJavaFile = sourceFile; - break; - } - } + protected String getSource() { + return testSource == null ? source : testSource; + } - // Get additional information from the main module descriptor, if available - if (Files.exists(mainModuleDescriptorClassFile)) { - ResolvePathsResult result; + /** + * If a different target version has been specified for the tests, returns that version. + * Otherwise returns the same target version as the main code. + * + * @return the {@code --target} argument for the Java compiler + */ + @Nullable + @Override + protected String getTarget() { + return testTarget == null ? target : testTarget; + } - try { - ResolvePathsRequest request = ResolvePathsRequest.ofStrings(testPath) - .setIncludeStatic(true) - .setMainModuleDescriptor( - mainModuleDescriptorClassFile.toAbsolutePath().toString()); + /** + * If a different release version has been specified for the tests, returns that version. + * Otherwise returns the same release version as the main code. + * + * @return the {@code --release} argument for the Java compiler + */ + @Nullable + @Override + protected String getRelease() { + return testRelease == null ? release : testRelease; + } - Optional toolchain = getToolchain(); - if (toolchain.isPresent() && toolchain.get() instanceof JavaToolchain) { - request.setJdkHome(((JavaToolchain) toolchain.get()).getJavaHome()); - } + /** + * {@return the destination directory for test class files}. + */ + @Nonnull + @Override + protected Path getOutputDirectory() { + return outputDirectory; + } - result = locationManager.resolvePaths(request); + /** + * {@return the file where to dump the command-line when debug is activated or when the compilation failed}. + */ + @Nullable + @Override + protected String getDebugFileName() { + return debugFileName; + } - for (Entry pathException : - result.getPathExceptions().entrySet()) { - Throwable cause = pathException.getValue(); - while (cause.getCause() != null) { - cause = cause.getCause(); - } - String fileName = - Paths.get(pathException.getKey()).getFileName().toString(); - getLog().warn("Can't extract module name from " + fileName + ": " + cause.getMessage()); + /** + * {@return the module name of the main code, or an empty string if none}. + * This method reads the module descriptor when first needed and caches the result. + * + * @throws IOException if the module descriptor cannot be read. + */ + private String getMainModuleName() throws IOException { + if (moduleName == null) { + Path file = mainOutputDirectory.resolve(MODULE_INFO + CLASS_FILE_SUFFIX); + if (Files.isRegularFile(file)) { + try (InputStream in = Files.newInputStream(file)) { + moduleName = ModuleDescriptor.read(in).name(); } - } catch (IOException e) { - throw new RuntimeException(e); + } else { + moduleName = ""; } - - mainModuleDescriptor = result.getMainModuleDescriptor(); - - pathElements = new LinkedHashMap<>(result.getPathElements().size()); - pathElements.putAll(result.getPathElements()); - - modulepathElements = new ArrayList<>(result.getModulepathElements().keySet()); - classpathElements = new ArrayList<>(result.getClasspathElements()); } + return moduleName; + } - // Get additional information from the test module descriptor, if available - if (Files.exists(testModuleDescriptorJavaFile)) { - ResolvePathsResult result; - - try { - ResolvePathsRequest request = ResolvePathsRequest.ofStrings(testPath) - .setMainModuleDescriptor( - testModuleDescriptorJavaFile.toAbsolutePath().toString()); - - Optional toolchain = getToolchain(); - if (toolchain.isPresent() && toolchain.get() instanceof JavaToolchain) { - request.setJdkHome(((JavaToolchain) toolchain.get()).getJavaHome()); - } - - result = locationManager.resolvePaths(request); - } catch (IOException e) { - throw new RuntimeException(e); + /** + * {@return the module name declared in the test sources}. We have to parse the source instead + * of the {@code module-info.class} file because the classes may not have been compiled yet. + * This is not very reliable, but putting a {@code module-info.java} file in the tests is + * deprecated anyway. + */ + private String getTestModuleName(List compileSourceRoots) throws IOException { + for (SourceDirectory directory : compileSourceRoots) { + if (directory.moduleName != null) { + return directory.moduleName; + } + String name = parseModuleInfoName(directory.getModuleInfo().orElse(null)); + if (name != null) { + return name; } - - testModuleDescriptor = result.getMainModuleDescriptor(); } + return null; + } - if (release != null && !release.isEmpty()) { - if (Integer.parseInt(release) < 9) { - pathElements = Collections.emptyMap(); - modulepathElements = Collections.emptyList(); - classpathElements = testPath; - return; + /** + * {@return whether the project has at least one {@code module-info.class} file}. + * This method opportunistically fetches the module name. + * + * @param roots root directories of the sources to compile + * @throws IOException if this method needed to read a module descriptor and failed + */ + @Override + final boolean hasModuleDeclaration(final List roots) throws IOException { + hasTestModuleInfo = super.hasModuleDeclaration(roots); + if (hasTestModuleInfo) { + MessageBuilder message = messageBuilderFactory.builder(); + message.a("Overwriting the ") + .warning(MODULE_INFO + JAVA_FILE_SUFFIX) + .a(" file in the test directory is deprecated. Use ") + .info("--add-reads") + .a(", ") + .info("--add-modules") + .a(" and related options instead."); + logger.warn(message.toString()); + if (SUPPORT_LEGACY) { + return useModulePath; } - } else if (Double.parseDouble(getTarget()) < Double.parseDouble(MODULE_INFO_TARGET)) { - pathElements = Collections.emptyMap(); - modulepathElements = Collections.emptyList(); - classpathElements = testPath; - return; } + return useModulePath && !getMainModuleName().isEmpty(); + } - if (testModuleDescriptor != null) { - modulepathElements = testPath; - classpathElements = Collections.emptyList(); + /** + * Adds the main compilation output directories as test dependencies. + * + * @param addTo where to add dependencies + * @param hasModuleDeclaration whether the main sources have or should have a {@code module-info} file + */ + @Override + protected void addImplicitDependencies(Map> addTo, boolean hasModuleDeclaration) { + var pathType = hasModuleDeclaration ? JavaPathType.MODULES : JavaPathType.CLASSES; + if (Files.exists(mainOutputDirectory)) { + addTo.computeIfAbsent(pathType, (key) -> new ArrayList<>()).add(mainOutputDirectory); + } + } - if (mainModuleDescriptor != null) { - if (getLog().isDebugEnabled()) { - getLog().debug("Main and test module descriptors exist:"); - getLog().debug(" main module = " + mainModuleDescriptor.name()); - getLog().debug(" test module = " + testModuleDescriptor.name()); + /** + * Adds {@code --patch-module} options for the given source directories. + * In this case, the option values are directory of source files. + * Not to be confused with cases where a module is patched with compiled + * classes (it may happen in other parts of the compiler plugin). + * + * @param addTo the collection of source paths to augment + * @param compileSourceRoots the source paths to eventually adds to the {@code toAdd} map + * @throws IOException if this method needs to read a module descriptor and this operation failed + */ + @Override + final void addSourceDirectories(Map> addTo, List compileSourceRoots) + throws IOException { + for (SourceDirectory dir : compileSourceRoots) { + String moduleToPatch = dir.moduleName; + if (moduleToPatch == null) { + moduleToPatch = getMainModuleName(); + if (moduleToPatch.isEmpty()) { + continue; // No module-info found. } - - if (testModuleDescriptor.name().equals(mainModuleDescriptor.name())) { - if (compilerArgs == null) { - compilerArgs = new ArrayList<>(); - } - compilerArgs.add("--patch-module"); - - StringBuilder patchModuleValue = new StringBuilder(); - patchModuleValue.append(testModuleDescriptor.name()); - patchModuleValue.append('='); - - for (Path root : projectManager.getCompileSourceRoots(getProject(), ProjectScope.MAIN)) { - if (Files.exists(root)) { - patchModuleValue.append(root).append(PS); + if (SUPPORT_LEGACY) { + String testModuleName = getTestModuleName(compileSourceRoots); + if (testModuleName != null) { + overwriteMainModuleInfo = testModuleName.equals(getMainModuleName()); + if (!overwriteMainModuleInfo) { + continue; // The test classes are in their own module. } } - - compilerArgs.add(patchModuleValue.toString()); - } else { - getLog().debug("Black-box testing - all is ready to compile"); - } - } else { - // No main binaries available? Means we're a test-only project. - if (!Files.exists(mainOutputDirectory)) { - return; } - // very odd - // Means that main sources must be compiled with -modulesource and -Xmodule: - // However, this has a huge impact since you can't simply use it as a classpathEntry - // due to extra folder in between - throw new UnsupportedOperationException( - "Can't compile test sources " + "when main sources are missing a module descriptor"); - } - } else { - if (mainModuleDescriptor != null) { - if (compilerArgs == null) { - compilerArgs = new ArrayList<>(); - } - compilerArgs.add("--patch-module"); - - StringBuilder patchModuleValue = new StringBuilder(mainModuleDescriptor.name()) - .append('=') - .append(mainOutputDirectory) - .append(PS); - for (Path root : getCompileSourceRoots()) { - patchModuleValue.append(root).append(PS); - } - - compilerArgs.add(patchModuleValue.toString()); - - compilerArgs.add("--add-reads"); - compilerArgs.add(mainModuleDescriptor.name() + "=ALL-UNNAMED"); - } else { - modulepathElements = Collections.emptyList(); - classpathElements = testPath; } + addTo.computeIfAbsent(JavaPathType.patchModule(moduleToPatch), (key) -> new ArrayList<>()) + .add(dir.root); } } - protected SourceInclusionScanner getSourceInclusionScanner(int staleMillis) { - SourceInclusionScanner scanner; - - if (testIncludes.isEmpty() && testExcludes.isEmpty() && testIncrementalExcludes.isEmpty()) { - scanner = new StaleSourceScanner(staleMillis); - } else { - if (testIncludes.isEmpty()) { - testIncludes.add("**/*.java"); + /** + * Generates the {@code --add-modules} and {@code --add-reads} options for the dependencies that are not + * in the main compilation. This method is invoked only if {@code hasModuleDeclaration} is {@code true}. + * + * @param dependencies the project dependencies + * @param addTo where to add the options + * @throws IOException if the module information of a dependency cannot be read + */ + @Override + @SuppressWarnings({"checkstyle:MissingSwitchDefault", "fallthrough"}) + protected void addModuleOptions(DependencyResolverResult dependencies, Options addTo) throws IOException { + if (SUPPORT_LEGACY && useModulePath && hasTestModuleInfo) { + /* + * Do not add any `--add-reads` parameters. The developers should put + * everything needed in the `module-info`, including test dependencies. + */ + return; + } + final var done = new HashSet(); // Added modules and their dependencies. + final var addModules = new StringJoiner(","); + StringJoiner addReads = null; + boolean hasUnnamed = false; + for (Map.Entry entry : dependencies.getDependencies().entrySet()) { + boolean compile = false; + switch (entry.getKey().getScope()) { + case TEST: + case TEST_ONLY: + compile = true; + // Fall through + case TEST_RUNTIME: + if (compile) { + // Needs to be initialized even if `name` is null. + if (addReads == null) { + addReads = new StringJoiner(",", getMainModuleName() + "=", ""); + } + } + Path path = entry.getValue(); + String name = dependencies.getModuleName(path).orElse(null); + if (name == null) { + hasUnnamed = true; + } else if (done.add(name)) { + addModules.add(name); + if (compile) { + addReads.add(name); + } + /* + * For making the options simpler, we do not add `--add-modules` or `--add-reads` + * options for modules that are required by a module that we already added. This + * simplification is not necessary, but makes the command-line easier to read. + */ + dependencies.getModuleDescriptor(path).ifPresent((descriptor) -> { + for (ModuleDescriptor.Requires r : descriptor.requires()) { + done.add(r.name()); + } + }); + } + break; } - scanner = new StaleSourceScanner(staleMillis, testIncludes, add(testExcludes, testIncrementalExcludes)); } - - return scanner; - } - - protected SourceInclusionScanner getSourceInclusionScanner(String inputFileEnding) { - SourceInclusionScanner scanner; - - // it's not defined if we get the ending with or without the dot '.' - String defaultIncludePattern = "**/*" + (inputFileEnding.startsWith(".") ? "" : ".") + inputFileEnding; - - if (testIncludes.isEmpty() && testExcludes.isEmpty() && testIncrementalExcludes.isEmpty()) { - testIncludes = Collections.singleton(defaultIncludePattern); - scanner = new SimpleSourceInclusionScanner(testIncludes, Collections.emptySet()); - } else { - if (testIncludes.isEmpty()) { - testIncludes.add(defaultIncludePattern); + if (!done.isEmpty()) { + addTo.addIfNonBlank("--add-modules", addModules.toString()); + } + if (addReads != null) { + if (hasUnnamed) { + addReads.add("ALL-UNNAMED"); } - scanner = new SimpleSourceInclusionScanner(testIncludes, add(testExcludes, testIncrementalExcludes)); + addTo.addIfNonBlank("--add-reads", addReads.toString()); } - - return scanner; - } - - protected String getSource() { - return testSource == null ? source : testSource; - } - - protected String getTarget() { - return testTarget == null ? target : testTarget; - } - - @Override - protected String getRelease() { - return testRelease == null ? release : testRelease; - } - - protected String getCompilerArgument() { - return testCompilerArgument == null ? compilerArgument : testCompilerArgument; - } - - protected Path getGeneratedSourcesDirectory() { - return generatedTestSourcesDirectory; - } - - @Override - protected String getDebugFileName() { - return debugFileName; - } - - @Override - protected boolean isTestCompile() { - return true; - } - - @Override - protected Set getIncludes() { - return testIncludes; } + /** + * Separates the compilation of {@code module-info} from other classes. This is needed when the + * {@code module-info} of the test classes overwrite the {@code module-info} of the main classes. + * In the latter case, we need to compile the test {@code module-info} first in order to substitute + * the main module-info by the test one before to compile the remaining test classes. + */ @Override - protected Set getExcludes() { - return testExcludes; + final CompilationTaskSources[] toCompilationTasks(final SourcesForRelease unit) { + if (!(SUPPORT_LEGACY && useModulePath && hasTestModuleInfo && overwriteMainModuleInfo)) { + return super.toCompilationTasks(unit); + } + CompilationTaskSources moduleInfo = null; + final List files = unit.files; + for (int i = files.size(); --i >= 0; ) { + if (SourceDirectory.isModuleInfoSource(files.get(i))) { + moduleInfo = new CompilationTaskSources(List.of(files.remove(i))); + if (files.isEmpty()) { + return new CompilationTaskSources[] {moduleInfo}; + } + break; + } + } + var task = new CompilationTaskSources(files) { + /** + * Substitutes the main {@code module-info.class} by the test's one, compiles test classes, + * then restores the original {@code module-info.class}. The test {@code module-info.class} + * must have been compiled separately before this method is invoked. + */ + @Override + boolean compile(JavaCompiler.CompilationTask task) throws IOException { + try (unit) { + unit.substituteModuleInfos(mainOutputDirectory, outputDirectory); + return super.compile(task); + } + } + }; + if (moduleInfo != null) { + return new CompilationTaskSources[] {moduleInfo, task}; + } else { + return new CompilationTaskSources[] {task}; + } } } diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index c8e2be6a..263b8b70 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -30,19 +30,10 @@ ${project.name} The Compiler Plugin is used to compile the sources of your project. The default compiler used to compile Java sources is javax.tools.JavaCompiler. - If you want to force the plugin to use <<>>, you must configure the plugin option {{{./compile-mojo.html#forceJavacCompilerUse}<<>>}}. - - Also note that at present the default <<>> setting is <<<1.8>>> and the default <<>> - setting is <<<1.8>>>, independently of the JDK you run Maven with. - You are highly encouraged to change these defaults by setting <<>> and <<>> - as described in - {{{./examples/set-compiler-source-and-target.html}Setting the -source and -target of the Java Compiler}}. - - Other compilers than <<>> can be used and work has already started - on AspectJ, .NET, and C#. + Other compilers than <<>> can be used. <> + {{https://docs.oracle.com/en/java/javase/17/docs/specs/man/javac.html}}.> * Goals Overview diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java index 0dd6c997..a53c51cc 100644 --- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java +++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java @@ -22,19 +22,13 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; -import org.apache.maven.api.Artifact; import org.apache.maven.api.PathScope; import org.apache.maven.api.Project; import org.apache.maven.api.Session; @@ -44,13 +38,12 @@ import org.apache.maven.api.model.Build; import org.apache.maven.api.model.Model; import org.apache.maven.api.plugin.Log; -import org.apache.maven.api.plugin.Mojo; import org.apache.maven.api.plugin.testing.Basedir; import org.apache.maven.api.plugin.testing.InjectMojo; import org.apache.maven.api.plugin.testing.MojoExtension; import org.apache.maven.api.plugin.testing.MojoParameter; import org.apache.maven.api.plugin.testing.MojoTest; -import org.apache.maven.api.plugin.testing.stubs.ArtifactStub; +import org.apache.maven.api.plugin.testing.stubs.ProducedArtifactStub; import org.apache.maven.api.plugin.testing.stubs.ProjectStub; import org.apache.maven.api.plugin.testing.stubs.SessionMock; import org.apache.maven.api.services.ArtifactManager; @@ -59,16 +52,12 @@ import org.apache.maven.api.services.ToolchainManager; import org.apache.maven.internal.impl.DefaultMessageBuilderFactory; import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.plugin.compiler.stubs.CompilerManagerStub; -import org.codehaus.plexus.languages.java.version.JavaVersion; +import org.apache.maven.plugin.compiler.stubs.CompilerStub; import org.junit.jupiter.api.Test; -import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir; -import static org.apache.maven.api.plugin.testing.MojoExtension.getVariableValueFromObject; -import static org.apache.maven.api.plugin.testing.MojoExtension.setVariableValueToObject; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -91,363 +80,308 @@ public class CompilerMojoTestCase { private Session session; /** - * tests the ability of the plugin to compile a basic file + * Verifies that the given output file exists. + * + * @param mojo the tested mojo + * @param first the first path element + * @param more the other path elements, if any + */ + private static void assertOutputFileExists(AbstractCompilerMojo mojo, String first, String... more) { + Path file = mojo.getOutputDirectory().resolve(Path.of(first, more)); + assertTrue(Files.isRegularFile(file), () -> "File not found: " + file); + } + + /** + * Verifies that the given output file does not exist. + * + * @param mojo the tested mojo + * @param first the first path element + * @param more the other path elements, if any + */ + private static void assertOutputFileDoesNotExist(AbstractCompilerMojo mojo, String first, String... more) { + Path file = mojo.getOutputDirectory().resolve(Path.of(first, more)); + assertFalse(Files.exists(file), () -> "File should not exist: " + file); + } + + /** + * Tests the ability of the plugin to compile a basic file. + * This test does not declare a Java release version. Therefore, a warning should be emitted. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-basic-test") public void testCompilerBasic( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - Log log = setMockLogger(compileMojo); - - setVariableValueToObject(compileMojo, "targetOrReleaseSet", Boolean.FALSE); - execute(compileMojo); - - verify(log).warn(startsWith("No explicit value set for target or release!")); + TestCompilerMojo testCompileMojo) { - Path testClass = compileMojo.getOutputDirectory().resolve("foo/TestCompile0.class"); - assertTrue(Files.exists(testClass)); - Artifact projectArtifact = (Artifact) getVariableValueFromObject(compileMojo, "projectArtifact"); - assertNotNull( - session.getArtifactPath(projectArtifact).orElse(null), + Log log = mock(Log.class); + compileMojo.logger = log; + compileMojo.execute(); + verify(log).warn(startsWith("No explicit value set for --release or --target.")); + assertOutputFileExists(compileMojo, "foo", "TestCompile0.class"); + assertTrue( + session.getArtifactPath(compileMojo.projectArtifact).isPresent(), "MCOMPILER-94: artifact file should only be null if there is nothing to compile"); - execute(testCompileMojo); - - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestCompile0Test.class"); - assertTrue(Files.exists(testClass)); + testCompileMojo.execute(); + assertOutputFileExists(testCompileMojo, "foo", "TestCompile0Test.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestCompile0Test.class"); } + /** + * A project with a source and target version specified. + * No warning should be logged. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-basic-sourcetarget") public void testCompilerBasicSourceTarget( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - Log log = setMockLogger(compileMojo); - - execute(compileMojo); + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo) { - verify(log, never()).warn(startsWith("No explicit value set for target or release!")); + Log log = mock(Log.class); + compileMojo.logger = log; + compileMojo.execute(); + verify(log, never()).warn(startsWith("No explicit value set for --release or --target.")); } /** - * tests the ability of the plugin to respond to empty source + * Tests the ability of the plugin to respond to empty source. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-empty-source-test") public void testCompilerEmptySource( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") @MojoParameter(name = "compileSourceRoots", value = "${basedir}/src/test/java") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - execute(compileMojo); + TestCompilerMojo testCompileMojo) { + compileMojo.execute(); assertFalse(Files.exists(compileMojo.getOutputDirectory())); - Artifact projectArtifact = (Artifact) getVariableValueFromObject(compileMojo, "projectArtifact"); assertNull( - session.getArtifactPath(projectArtifact).orElse(null), + session.getArtifactPath(compileMojo.projectArtifact).orElse(null), "MCOMPILER-94: artifact file should be null if there is nothing to compile"); - execute(testCompileMojo); - + testCompileMojo.execute(); assertFalse(Files.exists(testCompileMojo.getOutputDirectory())); } /** - * tests the ability of the plugin to respond to includes and excludes correctly + * Tests the ability of the plugin to respond to includes and excludes correctly. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-includes-excludes-test") public void testCompilerIncludesExcludes( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - Set includes = new HashSet<>(); - includes.add("**/TestCompile4*.java"); - setVariableValueToObject(compileMojo, "includes", includes); - - Set excludes = new HashSet<>(); - excludes.add("**/TestCompile2*.java"); - excludes.add("**/TestCompile3*.java"); - setVariableValueToObject(compileMojo, "excludes", excludes); - - execute(compileMojo); - - Path testClass = compileMojo.getOutputDirectory().resolve("foo/TestCompile2.class"); - assertFalse(Files.exists(testClass)); - - testClass = compileMojo.getOutputDirectory().resolve("foo/TestCompile3.class"); - assertFalse(Files.exists(testClass)); - - testClass = compileMojo.getOutputDirectory().resolve("foo/TestCompile4.class"); - assertTrue(Files.exists(testClass)); - - setVariableValueToObject(testCompileMojo, "testIncludes", includes); - setVariableValueToObject(testCompileMojo, "testExcludes", excludes); - - execute(testCompileMojo); - - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestCompile2TestCase.class"); - assertFalse(Files.exists(testClass)); - - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestCompile3TestCase.class"); - assertFalse(Files.exists(testClass)); - - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestCompile4TestCase.class"); - assertTrue(Files.exists(testClass)); + TestCompilerMojo testCompileMojo) { + + compileMojo.execute(); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestCompile2.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestCompile3.class"); + assertOutputFileExists(compileMojo, "foo", "TestCompile4.class"); + + testCompileMojo.execute(); + assertOutputFileDoesNotExist(testCompileMojo, "foo", "TestCompile2TestCase.class"); + assertOutputFileDoesNotExist(testCompileMojo, "foo", "TestCompile3TestCase.class"); + assertOutputFileExists(testCompileMojo, "foo", "TestCompile4TestCase.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestCompile4TestCase.class"); } /** - * tests the ability of the plugin to fork and successfully compile + * Tests the ability of the plugin to fork and successfully compile. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-fork-test") public void testCompilerFork( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - // JAVA_HOME doesn't have to be on the PATH. - setVariableValueToObject( - compileMojo, "executable", new File(System.getenv("JAVA_HOME"), "bin/javac").getPath()); - - execute(compileMojo); - - Path testClass = compileMojo.getOutputDirectory().resolve("foo/TestCompile1.class"); - assertTrue(Files.exists(testClass)); + TestCompilerMojo testCompileMojo) { // JAVA_HOME doesn't have to be on the PATH. - setVariableValueToObject( - testCompileMojo, "executable", new File(System.getenv("JAVA_HOME"), "bin/javac").getPath()); - - execute(testCompileMojo); + String javaHome = System.getenv("JAVA_HOME"); + if (javaHome != null) { + String command = new File(javaHome, "bin/javac").getPath(); + compileMojo.executable = command; + testCompileMojo.executable = command; + } + compileMojo.execute(); + assertOutputFileExists(compileMojo, "foo", "TestCompile1.class"); - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestCompile1TestCase.class"); - assertTrue(Files.exists(testClass)); + testCompileMojo.execute(); + assertOutputFileExists(testCompileMojo, "foo", "TestCompile1TestCase.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestCompile1TestCase.class"); } + /** + * Tests the use of a custom compiler. + * The dummy compiler used in this test generates only one file, despite having more than one source. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-one-output-file-test") public void testOneOutputFileForAllInput( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "compilerManager", new CompilerManagerStub()); - - execute(compileMojo); - - Path testClass = compileMojo.getOutputDirectory().resolve("compiled.class"); - assertTrue(Files.exists(testClass)); - - setVariableValueToObject(testCompileMojo, "compilerManager", new CompilerManagerStub()); + @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") + TestCompilerMojo testCompileMojo) { - setVariableValueToObject( - testCompileMojo, - "compileSourceRoots", - Collections.singletonList( - Paths.get(getBasedir(), "src/test/java").toString())); - execute(testCompileMojo); + assertEquals(CompilerStub.COMPILER_ID, compileMojo.compilerId); + compileMojo.execute(); + assertOutputFileExists(compileMojo, CompilerStub.OUTPUT_FILE); - testClass = testCompileMojo.getOutputDirectory().resolve("compiled.class"); - assertTrue(Files.exists(testClass)); + assertEquals(CompilerStub.COMPILER_ID, testCompileMojo.compilerId); + testCompileMojo.execute(); + assertOutputFileExists(testCompileMojo, CompilerStub.OUTPUT_FILE); } + /** + * Verifies that the options in the {@code } elements are given to the compiler. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-args-test") - public void testCompilerArgs( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "compilerManager", new CompilerManagerStub()); - - execute(compileMojo); - - Path testClass = compileMojo.getOutputDirectory().resolve("compiled.class"); - assertTrue(Files.exists(testClass)); - assertEquals( - Arrays.asList("key1=value1", "-Xlint", "-my&special:param-with+chars/not>allowed_in_XML_element_names"), - compileMojo.compilerArgs); + public void testCompilerArgs(@InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo) { + + assertEquals(CompilerStub.COMPILER_ID, compileMojo.compilerId); + compileMojo.execute(); + + assertOutputFileExists(compileMojo, CompilerStub.OUTPUT_FILE); + assertArrayEquals( + new String[] {"key1=value1", "-Xlint", "-my&special:param-with+chars/not>allowed_in_XML_element_names"}, + compileMojo.compilerArgs.toArray(String[]::new)); + + List options = CompilerStub.getOptions(); + assertArrayEquals( + new String[] { + "--module-version", // Added by the plugin + "1.0-SNAPSHOT", + "key1=value1", // Specified in + "-Xlint", + "-my&special:param-with+chars/not>allowed_in_XML_element_names", + "param", // Specified in + "value" + }, + options.toArray(String[]::new)); } + /** + * Tests the {@code } option when set to "none". + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-implicit-test") public void testImplicitFlagNone( - @InjectMojo(goal = "compile", pom = "plugin-config-none.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - assertEquals("none", compileMojo.getImplicit()); + @InjectMojo(goal = "compile", pom = "plugin-config-none.xml") CompilerMojo compileMojo) { + + assertEquals("none", compileMojo.implicit); + compileMojo.execute(); } + /** + * Tests the {@code } option when not set. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-implicit-test") public void testImplicitFlagNotSet( - @InjectMojo(goal = "compile", pom = "plugin-config-not-set.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - assertNull(compileMojo.getImplicit()); + @InjectMojo(goal = "compile", pom = "plugin-config-not-set.xml") CompilerMojo compileMojo) { + + assertNull(compileMojo.implicit); + compileMojo.execute(); } + /** + * Tests the compilation of a project having a {@code module-info.java} file, together with its tests. + * The compilation of tests requires a {@code --patch-module} option, otherwise compilation will fail. + */ @Test - @Basedir("${basedir}/target/test-classes/unit/compiler-one-output-file-test2") - public void testOneOutputFileForAllInput2( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @Basedir("${basedir}/target/test-classes/unit/compiler-modular-project") + public void testModularProject( + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "compilerManager", new CompilerManagerStub()); - - Set includes = new HashSet<>(); - includes.add("**/TestCompile4*.java"); - setVariableValueToObject(compileMojo, "includes", includes); - - Set excludes = new HashSet<>(); - excludes.add("**/TestCompile2*.java"); - excludes.add("**/TestCompile3*.java"); - setVariableValueToObject(compileMojo, "excludes", excludes); - - execute(compileMojo); - - Path testClass = compileMojo.getOutputDirectory().resolve("compiled.class"); - assertTrue(Files.exists(testClass)); - - setVariableValueToObject(testCompileMojo, "compilerManager", new CompilerManagerStub()); - setVariableValueToObject(testCompileMojo, "testIncludes", includes); - setVariableValueToObject(testCompileMojo, "testExcludes", excludes); - - setVariableValueToObject( - testCompileMojo, - "compileSourceRoots", - Collections.singletonList( - Paths.get(getBasedir(), "src/test/java").toString())); - execute(testCompileMojo); - - testClass = testCompileMojo.getOutputDirectory().resolve("compiled.class"); - assertTrue(Files.exists(testClass)); + @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") + TestCompilerMojo testCompileMojo) { + + compileMojo.execute(); + assertOutputFileExists(compileMojo, SourceDirectory.MODULE_INFO + SourceDirectory.CLASS_FILE_SUFFIX); + assertOutputFileExists(compileMojo, "foo", "TestModular.class"); + + testCompileMojo.execute(); + assertOutputFileExists(testCompileMojo, "foo", "TestModularTestCase.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestModularTestCase.class"); } + /** + * Tests a compilation task which is expected to fail. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-fail-test") - public void testCompileFailure( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "compilerManager", new CompilerManagerStub(true)); - + public void testCompileFailure(@InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo) { assertThrows(CompilationFailureException.class, compileMojo::execute, "Should throw an exception"); + assertOutputFileExists(compileMojo, "..", "javac.args"); // Command-line that user can execute. } + /** + * Tests a compilation task which is expected to fail, but where test failure are ignored. + */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-failonerror-test") public void testCompileFailOnError( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "compilerManager", new CompilerManagerStub(true)); + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo) { try { - execute(compileMojo); - assertTrue(true); + compileMojo.execute(); } catch (CompilationFailureException e) { fail("The compilation error should have been consumed because failOnError = false"); } + assertOutputFileExists(compileMojo, "..", "javac.args"); // Command-line that user can execute. } /** - * Tests that setting 'skipMain' to true skips compilation of the main Java source files, but that test Java source - * files are still compiled. + * Tests that setting {@code skipMain} to true skips compilation of the main Java source files, + * but that test Java source files are still compiled. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-skip-main") public void testCompileSkipMain( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - setVariableValueToObject(compileMojo, "skipMain", true); - execute(compileMojo); - Path testClass = compileMojo.getOutputDirectory().resolve("foo/TestSkipMainCompile0.class"); - assertFalse(Files.exists(testClass)); - - setVariableValueToObject( - testCompileMojo, - "compileSourceRoots", - Collections.singletonList( - Paths.get(getBasedir(), "src/test/java").toString())); - execute(testCompileMojo); - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestSkipMainCompile0Test.class"); - assertTrue(Files.exists(testClass)); + @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") + TestCompilerMojo testCompileMojo) { + + compileMojo.skipMain = true; + compileMojo.execute(); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestSkipMainCompile0.class"); + + testCompileMojo.execute(); + assertOutputFileExists(testCompileMojo, "foo", "TestSkipMainCompile0Test.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestSkipMainCompile0Test.class"); } /** - * Tests that setting 'skip' to true skips compilation of the test Java source files, but that main Java source - * files are still compiled. + * Tests that setting {@code skip} to true skips compilation of the test Java source files, + * but that main Java source files are still compiled. */ @Test @Basedir("${basedir}/target/test-classes/unit/compiler-skip-test") public void testCompileSkipTest( - @InjectMojo(goal = "compile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/compile") - CompilerMojo compileMojo, + @InjectMojo(goal = "compile", pom = "plugin-config.xml") CompilerMojo compileMojo, @InjectMojo(goal = "testCompile", pom = "plugin-config.xml") - @MojoParameter(name = "mojoStatusPath", value = "maven-status/testCompile") - TestCompilerMojo testCompileMojo) - throws Exception { - execute(compileMojo); - Path testClass = compileMojo.getOutputDirectory().resolve("foo/TestSkipTestCompile0.class"); - assertTrue(Files.exists(testClass)); - - setVariableValueToObject(testCompileMojo, "skip", true); - setVariableValueToObject( - testCompileMojo, - "compileSourceRoots", - Collections.singletonList( - Paths.get(getBasedir(), "src/test/java").toString())); - execute(testCompileMojo); - testClass = testCompileMojo.getOutputDirectory().resolve("foo/TestSkipTestCompile0Test.class"); - assertFalse(Files.exists(testClass)); + @MojoParameter(name = "compileSourceRoots", value = "${project.basedir}/src/test/java") + TestCompilerMojo testCompileMojo) { + + compileMojo.execute(); + assertOutputFileExists(compileMojo, "foo/TestSkipTestCompile0.class"); + + testCompileMojo.skip = true; + testCompileMojo.execute(); + assertOutputFileDoesNotExist(testCompileMojo, "foo", "TestSkipTestCompile0Test.class"); + assertOutputFileDoesNotExist(compileMojo, "foo", "TestSkipTestCompile0Test.class"); } @Provides @Singleton @SuppressWarnings("unused") private static InternalSession createSession() { - InternalSession session = SessionMock.getMockSession(getBasedir() + LOCAL_REPO); + InternalSession session = SessionMock.getMockSession(MojoExtension.getBasedir() + LOCAL_REPO); ToolchainManager toolchainManager = mock(ToolchainManager.class); doReturn(toolchainManager).when(session).getService(ToolchainManager.class); @@ -456,29 +390,13 @@ private static InternalSession createSession() { .when(session) .getStartTime(); - Artifact junit = new ArtifactStub("junit", "junit", null, "3.8.1", "jar"); + var junit = new ProducedArtifactStub("junit", "junit", null, "3.8.1", "jar"); MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory(); doReturn(messageBuilderFactory).when(session).getService(MessageBuilderFactory.class); - String source = AbstractCompilerMojo.DEFAULT_SOURCE; - String target = AbstractCompilerMojo.DEFAULT_TARGET; - String javaSpec = System.getProperty("java.specification.version"); - // It is needed to set target/source to JDK 7 for JDK12+ and JDK 8 for JDK17+ - // because this is the lowest version which is supported by those JDK's. - // The default source/target "6" is not supported anymore. - if (JavaVersion.parse(javaSpec).isAtLeast("17")) { - source = "8"; - target = "8"; - } else if (JavaVersion.parse(javaSpec).isAtLeast("12")) { - source = "7"; - target = "7"; - } - Map props = new HashMap<>(); props.put("basedir", MojoExtension.getBasedir()); - props.put("maven.compiler.source", source); - props.put("maven.compiler.target", target); doReturn(props).when(session).getUserProperties(); List artifacts = new ArrayList<>(); @@ -486,8 +404,14 @@ private static InternalSession createSession() { Path artifactFile; String localRepository = System.getProperty("localRepository"); if (localRepository != null) { - artifactFile = Paths.get( - localRepository, "org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar"); + artifactFile = Path.of( + localRepository, + "org", + "junit", + "jupiter", + "junit-jupiter-api", + "5.10.2", + "junit-jupiter-api-5.10.2.jar"); } else { // for IDE String junitURI = Test.class.getResource("Test.class").toURI().toString(); @@ -502,7 +426,7 @@ private static InternalSession createSession() { } ProjectManager projectManager = session.getService(ProjectManager.class); - doAnswer(iom -> Collections.emptyList()).when(session).resolveDependencies(any(), eq(PathScope.MAIN_COMPILE)); + doAnswer(iom -> List.of()).when(session).resolveDependencies(any(), eq(PathScope.MAIN_COMPILE)); doAnswer(iom -> artifacts).when(session).resolveDependencies(any(), eq(PathScope.TEST_COMPILE)); return session; @@ -513,7 +437,7 @@ private static InternalSession createSession() { @SuppressWarnings("unused") private static Project createProject() { ProjectStub stub = new ProjectStub(); - ArtifactStub artifact = new ArtifactStub("myGroupId", "myArtifactId", null, "1.0-SNAPSHOT", "jar"); + var artifact = new ProducedArtifactStub("myGroupId", "myArtifactId", null, "1.0-SNAPSHOT", "jar"); stub.setMainArtifact(artifact); stub.setModel(Model.newBuilder() .groupId(artifact.getGroupId()) @@ -526,144 +450,7 @@ private static Project createProject() { .testOutputDirectory(MojoExtension.getBasedir() + "/target/test-classes") .build()) .build()); - stub.setBasedir(Paths.get(MojoExtension.getBasedir())); + stub.setBasedir(Path.of(MojoExtension.getBasedir())); return stub; } - - // @Provides - // @SuppressWarnings("unused") - // ProjectManager createProjectManager(InternalSession session) { - // return session.getService(ProjectManager.class); - // } - - // @Provides - // @SuppressWarnings("unused") - // ArtifactManager createArtifactManager(InternalSession session) { - // return session.getService(ArtifactManager.class); - // } - - private Log setMockLogger(AbstractCompilerMojo mojo) throws IllegalAccessException { - Log log = mock(Log.class); - setVariableValueToObject(mojo, "logger", log); - return log; - } - - private static void execute(Mojo mojo) { - try { - mojo.execute(); - } catch (CompilationFailureException e) { - throw new RuntimeException(e.getLongMessage(), e); - } - } - - /* - private CompilerMojo getCompilerMojo( String pomXml ) - throws Exception - { - File testPom = new File( getBasedir(), pomXml ); - - CompilerMojo mojo = (CompilerMojo) lookupMojo( "compile", testPom ); - - setVariableValueToObject( mojo, "projectArtifact", new ArtifactStub() ); - setVariableValueToObject( mojo, "compilePath", Collections.EMPTY_LIST ); - setVariableValueToObject( mojo, "session", getMockMavenSession() ); - setVariableValueToObject( mojo, "project", getMockMavenProject() ); - setVariableValueToObject( mojo, "mojoExecution", getMockMojoExecution() ); - setVariableValueToObject( mojo, "source", source ); - setVariableValueToObject( mojo, "target", target ); - - return mojo; - } - - private TestCompilerMojo getTestCompilerMojo( CompilerMojo compilerMojo, String pomXml ) - throws Exception - { - File testPom = new File( getBasedir(), pomXml ); - - TestCompilerMojo mojo = (TestCompilerMojo) lookupMojo( "testCompile", testPom ); - - setVariableValueToObject( mojo, "log", new DebugEnabledLog() ); - - File buildDir = (File) getVariableValueFromObject( compilerMojo, "buildDirectory" ); - File testClassesDir = new File( buildDir, "test-classes" ); - setVariableValueToObject( mojo, "outputDirectory", testClassesDir ); - - List testClasspathList = new ArrayList<>(); - - Artifact junitArtifact = mock( Artifact.class ); - ArtifactHandler handler = mock( ArtifactHandler.class ); - when( handler.isAddedToClasspath() ).thenReturn( true ); - when( junitArtifact.getArtifactHandler() ).thenReturn( handler ); - - File artifactFile; - String localRepository = System.getProperty( "localRepository" ); - if ( localRepository != null ) - { - artifactFile = new File( localRepository, "junit/junit/3.8.1/junit-3.8.1.jar" ); - } - else - { - // for IDE - String junitURI = org.junit.Test.class.getResource( "Test.class" ).toURI().toString(); - junitURI = junitURI.substring( "jar:".length(), junitURI.indexOf( '!' ) ); - artifactFile = new File( URI.create( junitURI ) ); - } - when ( junitArtifact.getFile() ).thenReturn( artifactFile ); - - testClasspathList.add( artifactFile.getAbsolutePath() ); - testClasspathList.add( compilerMojo.getOutputDirectory().toString() ); - - String testSourceRoot = testPom.getParent() + "/src/test/java"; - setVariableValueToObject( mojo, "compileSourceRoots", Collections.singletonList( testSourceRoot ) ); - - Project project = getMockMavenProject(); - project.setFile( testPom ); - project.addCompileSourceRoot("/src/main/java" ); - project.setArtifacts( Collections.singleton( junitArtifact ) ); - project.getBuild().setOutputDirectory( new File( buildDir, "classes" ).getAbsolutePath() ); - setVariableValueToObject( mojo, "project", project ); - setVariableValueToObject( mojo, "testPath", testClasspathList ); - setVariableValueToObject( mojo, "session", getMockMavenSession() ); - setVariableValueToObject( mojo, "mojoExecution", getMockMojoExecution() ); - setVariableValueToObject( mojo, "source", source ); - setVariableValueToObject( mojo, "target", target ); - - return mojo; - } - - - private MavenProject getMockMavenProject() - { - MavenProject mp = new MavenProject(); - mp.getBuild().setDirectory( "target" ); - mp.getBuild().setOutputDirectory( "target/classes" ); - mp.getBuild().setSourceDirectory( "src/main/java" ); - mp.getBuild().setTestOutputDirectory( "target/test-classes" ); - return mp; - } - - private MavenSession getMockMavenSession() - { - MavenSession session = mock( MavenSession.class ); - // when( session.getPluginContext( isA(PluginDescriptor.class), isA(MavenProject.class) ) ).thenReturn( - // Collections.emptyMap() ); - when( session.getCurrentProject() ).thenReturn( getMockMavenProject() ); - return session; - } - - private MojoExecution getMockMojoExecution() - { - MojoDescriptor md = new MojoDescriptor(); - md.setGoal( "compile" ); - - MojoExecution me = new MojoExecution( md ); - - PluginDescriptor pd = new PluginDescriptor(); - pd.setArtifactId( "maven-compiler-plugin" ); - md.setPluginDescriptor( pd ); - - return me; - } - */ - } diff --git a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerManagerStub.java b/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerManagerStub.java deleted file mode 100644 index 59f0a839..00000000 --- a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerManagerStub.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.plugin.compiler.stubs; - -import org.codehaus.plexus.compiler.manager.CompilerManager; - -/** - * @author Edwin Punzalan - */ -public class CompilerManagerStub implements CompilerManager { - private boolean shouldFail; - - public CompilerManagerStub() { - this(false); - } - - public CompilerManagerStub(boolean shouldFail) { - this.shouldFail = shouldFail; - } - - public org.codehaus.plexus.compiler.Compiler getCompiler(String compilerId) { - return new CompilerStub(shouldFail); - } -} diff --git a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java b/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java index 8131fa77..b31c37f4 100644 --- a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java +++ b/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java @@ -18,69 +18,358 @@ */ package org.apache.maven.plugin.compiler.stubs; +import javax.annotation.processing.Processor; +import javax.lang.model.SourceVersion; +import javax.tools.DiagnosticListener; +import javax.tools.FileObject; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; + import java.io.File; import java.io.IOException; -import java.util.Collections; - -import org.codehaus.plexus.compiler.CompilerConfiguration; -import org.codehaus.plexus.compiler.CompilerException; -import org.codehaus.plexus.compiler.CompilerMessage; -import org.codehaus.plexus.compiler.CompilerOutputStyle; -import org.codehaus.plexus.compiler.CompilerResult; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UncheckedIOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Set; /** + * A dummy implementation of the {@code JavaCompiler} interface for testing the Maven compiler plugin + * with alternative compilers. This dummy compiler actually ignores all source files and always writes + * exactly one output file, namely {@value #OUTPUT_FILE}. + * + *

Instantiation

+ * This stub is not instantiated directly. Instead, the fully-qualified class name must be declared + * in the {@code META-INF/services/javax.tools.Tool} file. Then, an instance is requested by setting + * the {@code } element to {@value #COMPILER_ID} in the {@code plugin-config.xml} file + * of the test. + * * @author Edwin Punzalan + * @author Martin Desruisseaux */ -public class CompilerStub implements org.codehaus.plexus.compiler.Compiler { - private boolean shouldFail; +public class CompilerStub implements JavaCompiler, StandardJavaFileManager { + /** + * The name returned by {@link #name()}. Used for identifying this stub. + * This is the value to specify in the {@code } element of the POM test file. + * + * @see #name() + */ + public static final String COMPILER_ID = "maven-compiler-stub"; + + /** + * Name of the dummy file created as output by this compiler stub. + * + * @see #inferBinaryName(JavaFileManager.Location, JavaFileObject) + */ + public static final String OUTPUT_FILE = "compiled.class"; + + /** + * The output directory, or {@code null} if not yet set. + * + * @see #setLocation(JavaFileManager.Location, Iterable) + */ + private File outputDir; + + /** + * Options given to the compiler when executed. + * + * @see #getOptions() + */ + private static final ThreadLocal> arguments = new ThreadLocal<>(); + + /** + * Invoked by reflection by {@link java.util.ServiceLoader}. + */ + public CompilerStub() {} + + /** + * {@return the compiler idenitifer of this stub}. + */ + @Override + public String name() { + return COMPILER_ID; + } + + /** + * {@return an arbitrary Java release number}. This is not used by the tests. + */ + @Override + public Set getSourceVersions() { + return Set.of(SourceVersion.RELEASE_17); + } + + /** + * {@return the number of arguments expected by the given option}. + * This method is implemented by a hard-coded list of options that + * are known to be used in some tests. + */ + @Override + public int isSupportedOption(String option) { + if (option.startsWith("-my&")) { + return 0; + } + switch (option) { + case "-Xlint": + return 0; + default: + return 1; + } + } + + /** + * {@return the object where source and destination directories will be specified by the Maven compiler plugin}. + */ + @Override + public StandardJavaFileManager getStandardFileManager( + DiagnosticListener diagnosticListener, Locale locale, Charset charset) { + return this; + } + + /** + * {@return whether the two given objects are for the same file}. + * This method is not seriously implemented, as it is not needed for the tests. + */ + @Override + public boolean isSameFile(FileObject a, FileObject b) { + return a.equals(b); + } + + /** + * Source or target directory, or source file to compile. + * For this test, we do not bother to identify the exact purpose of the wrapped file. + */ + private static final class UnknownFile extends SimpleJavaFileObject { + UnknownFile(final File file) { + super(file.toURI(), JavaFileObject.Kind.OTHER); + } + + UnknownFile(final String name) { + this(new File(name)); + } + } + + /** + * {@return the given files or directories wrapped in a dummy implementation of {@code FileObject}}. + */ + @Override + public Iterable getJavaFileObjectsFromFiles(Iterable files) { + var objects = new ArrayList(); + files.forEach(UnknownFile::new); + return objects; + } + + /** + * {@return the given files or directories wrapped in a dummy implementation of {@code FileObject}}. + */ + @Override + public Iterable getJavaFileObjects(File... files) { + return getJavaFileObjectsFromFiles(Arrays.asList(files)); + } + + /** + * {@return the given files or directories wrapped in a dummy implementation of {@code FileObject}}. + */ + @Override + public Iterable getJavaFileObjectsFromStrings(Iterable names) { + var objects = new ArrayList(); + names.forEach(UnknownFile::new); + return objects; + } - public CompilerStub() { - this(false); + /** + * {@return the given files or directories wrapped in a dummy implementation of {@code FileObject}}. + */ + @Override + public Iterable getJavaFileObjects(String... names) { + return getJavaFileObjectsFromStrings(Arrays.asList(names)); } - public CompilerStub(boolean shouldFail) { - this.shouldFail = shouldFail; + /** + * {@return whether the given location is known to this file manager}. + */ + @Override + public boolean hasLocation(Location location) { + return location == StandardLocation.CLASS_OUTPUT; + } + + /** + * Sets a directory for the given type of location. This simple stubs accepts a single + * directory for {@link StandardLocation#CLASS_OUTPUT} and ignores all other locations. + */ + @Override + public void setLocation(Location location, Iterable files) { + if (location == StandardLocation.CLASS_OUTPUT) { + outputDir = null; + Iterator it = files.iterator(); + if (it.hasNext()) { + outputDir = it.next(); + if (it.hasNext()) { + throw new IllegalArgumentException("This simple stub accepts a maximum of one output directory."); + } + } + } } - public CompilerOutputStyle getCompilerOutputStyle() { - return CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES; + /** + * {@return the directory for the given type of location}. + */ + @Override + public Iterable getLocation(Location location) { + if (location == StandardLocation.CLASS_OUTPUT && outputDir != null) { + return Set.of(outputDir); + } + return Set.of(); } - public String getInputFileEnding(CompilerConfiguration compilerConfiguration) { - return "java"; + /** + * Not used by the tests. + */ + @Override + public ClassLoader getClassLoader(Location location) { + return Thread.currentThread().getContextClassLoader(); } - public String getOutputFileEnding(CompilerConfiguration compilerConfiguration) { - return "class"; + /** + * Not used by the tests. + */ + @Override + public Iterable list( + Location location, String packageName, Set kinds, boolean recurse) { + return Set.of(); } - public String getOutputFile(CompilerConfiguration compilerConfiguration) { - return "output-file"; + /** + * {@returns the name of the single file created by this dummy compiler}. + */ + @Override + public String inferBinaryName(Location location, JavaFileObject file) { + return OUTPUT_FILE; } - public boolean canUpdateTarget(CompilerConfiguration compilerConfiguration) { + /** + * Not used by the tests. + */ + @Override + public boolean handleOption(String current, Iterator remaining) { return false; } - public CompilerResult performCompile(CompilerConfiguration compilerConfiguration) throws CompilerException { - File outputDir = new File(compilerConfiguration.getOutputLocation()); + /** + * Not used by the tests. + */ + @Override + public JavaFileObject getJavaFileForInput(Location location, String className, JavaFileObject.Kind kind) { + return null; + } - try { - outputDir.mkdirs(); + /** + * Not used by the tests. + */ + @Override + public JavaFileObject getJavaFileForOutput( + Location location, String className, JavaFileObject.Kind kind, FileObject sibling) { + return null; + } + + /** + * Not used by the tests. + */ + @Override + public FileObject getFileForInput(Location location, String packageName, String relativeName) { + return null; + } - File outputFile = new File(outputDir, "compiled.class"); - if (!outputFile.exists() && !outputFile.createNewFile()) { - throw new CompilerException("could not create output file: " + outputFile.getAbsolutePath()); + /** + * Not used by the tests. + */ + @Override + public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) { + return null; + } + + /** + * {@return a compilation task}. + */ + @Override + public CompilationTask getTask( + Writer out, + JavaFileManager fileManager, + DiagnosticListener diagnosticListener, + Iterable options, + Iterable classes, + Iterable compilationUnits) { + + arguments.set(options); + return new CompilationTask() { + @Override + public void addModules(Iterable moduleNames) {} + + @Override + public void setProcessors(Iterable processors) {} + + @Override + public void setLocale(Locale locale) {} + + /** + * Executes the pseudo-compilation. + * + * @return true for success, false otherwise + */ + @Override + public Boolean call() { + return run(null, null, null, (String[]) null) == 0; } + }; + } + + /** + * Executes the pseudo-compilation. + * + * @return 0 for success, nonzero otherwise + */ + @Override + public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { + try { + outputDir.mkdirs(); + File outputFile = new File(outputDir, OUTPUT_FILE); + outputFile.createNewFile(); } catch (IOException e) { - throw new CompilerException("An exception occurred while creating output file", e); + throw new UncheckedIOException("An exception occurred while creating output file.", e); } - - return new CompilerResult( - !shouldFail, Collections.singletonList(new CompilerMessage("message 1", CompilerMessage.Kind.OTHER))); + return 0; } - public String[] createCommandLine(CompilerConfiguration compilerConfiguration) { - return new String[0]; + /** + * {@return the options given to the compiler when the compilation tasks was created}. + */ + public static List getOptions() { + var options = new ArrayList(); + Iterable args = arguments.get(); + if (args != null) { + args.forEach(options::add); + } + return options; } + + /** + * Nothing to do. + */ + @Override + public void flush() {} + + /** + * Nothing to do. + */ + @Override + public void close() {} } diff --git a/src/test/java/org/apache/maven/plugin/compiler/stubs/FailingCompilerStub.java b/src/test/java/org/apache/maven/plugin/compiler/stubs/FailingCompilerStub.java new file mode 100644 index 00000000..64b75e1b --- /dev/null +++ b/src/test/java/org/apache/maven/plugin/compiler/stubs/FailingCompilerStub.java @@ -0,0 +1,64 @@ +/* + * 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. + */ +package org.apache.maven.plugin.compiler.stubs; + +import java.io.InputStream; +import java.io.OutputStream; + +/** + * A dummy implementation of the {@code JavaCompiler} interface with intentional failure. + * + *

Instantiation

+ * This stub is not instantiated directly. Instead, the fully-qualified class name must be declared + * in the {@code META-INF/services/javax.tools.Tool} file. Then, an instance is requested by setting + * the {@code } element to {@value #FAILING_COMPILER_ID} in the {@code plugin-config.xml} + * file of the test. + */ +public class FailingCompilerStub extends CompilerStub { + /** + * The name returned by {@link #name()}. Used for identifying this stub. + * This is the value to specify in the {@code } element of the POM test file. + * + * @see #name() + */ + public static final String FAILING_COMPILER_ID = "maven-failing-compiler-stub"; + + /** + * Invoked by reflection by {@link java.util.ServiceLoader}. + */ + public FailingCompilerStub() {} + + /** + * {@return the compiler idenitifer of this stub}. + */ + @Override + public String name() { + return FAILING_COMPILER_ID; + } + + /** + * Executes the pseudo-compilation. + * + * @return 1 for error + */ + @Override + public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { + return 1; + } +} diff --git a/src/it/MCOMPILER-197/invoker.properties b/src/test/resources/META-INF/services/javax.tools.JavaCompiler similarity index 87% rename from src/it/MCOMPILER-197/invoker.properties rename to src/test/resources/META-INF/services/javax.tools.JavaCompiler index 3f8fa043..1d05d1c8 100644 --- a/src/it/MCOMPILER-197/invoker.properties +++ b/src/test/resources/META-INF/services/javax.tools.JavaCompiler @@ -5,9 +5,9 @@ # 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 @@ -15,4 +15,5 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.6, 1.7, 1.8 +org.apache.maven.plugin.compiler.stubs.CompilerStub +org.apache.maven.plugin.compiler.stubs.FailingCompilerStub diff --git a/src/test/resources/unit/compiler-args-test/plugin-config.xml b/src/test/resources/unit/compiler-args-test/plugin-config.xml index d6d6d17f..8bafaff3 100644 --- a/src/test/resources/unit/compiler-args-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-args-test/plugin-config.xml @@ -19,24 +19,22 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin + + none ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes - - - value1 - value2 - - + maven-compiler-stub key1=value1 -Xlint diff --git a/src/test/resources/unit/compiler-basic-sourcetarget/plugin-config.xml b/src/test/resources/unit/compiler-basic-sourcetarget/plugin-config.xml index cf09fbc8..415d923a 100644 --- a/src/test/resources/unit/compiler-basic-sourcetarget/plugin-config.xml +++ b/src/test/resources/unit/compiler-basic-sourcetarget/plugin-config.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,10 +29,9 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes + 17 + 17 + none diff --git a/src/test/resources/unit/compiler-basic-test/plugin-config.xml b/src/test/resources/unit/compiler-basic-test/plugin-config.xml index 13c4512e..011ced27 100644 --- a/src/test/resources/unit/compiler-basic-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-basic-test/plugin-config.xml @@ -29,8 +29,7 @@ ${project.basedir}/src/main/java - javac - true + none diff --git a/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml b/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml index 7d7a2461..f29f1548 100644 --- a/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,13 +29,8 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes - 8 - 8 + 17 + none diff --git a/src/test/resources/unit/compiler-fail-test/plugin-config.xml b/src/test/resources/unit/compiler-fail-test/plugin-config.xml index 13c4512e..e5374755 100644 --- a/src/test/resources/unit/compiler-fail-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-fail-test/plugin-config.xml @@ -29,8 +29,8 @@ ${project.basedir}/src/main/java - javac - true + maven-failing-compiler-stub + none diff --git a/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml b/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml index 34467014..3fee7325 100644 --- a/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -27,11 +30,8 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + maven-failing-compiler-stub + none diff --git a/src/test/resources/unit/compiler-fork-test/plugin-config.xml b/src/test/resources/unit/compiler-fork-test/plugin-config.xml index f9459426..01649cd3 100644 --- a/src/test/resources/unit/compiler-fork-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-fork-test/plugin-config.xml @@ -19,13 +19,15 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin true - 8 - 8 + 17 @@ -37,17 +39,13 @@ ${project.basedir}/src/main/java - javac - true + none javac - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes diff --git a/src/test/resources/unit/compiler-implicit-test/plugin-config-none.xml b/src/test/resources/unit/compiler-implicit-test/plugin-config-none.xml index c90ee61b..6463368a 100644 --- a/src/test/resources/unit/compiler-implicit-test/plugin-config-none.xml +++ b/src/test/resources/unit/compiler-implicit-test/plugin-config-none.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,11 +29,7 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + none none diff --git a/src/test/resources/unit/compiler-implicit-test/plugin-config-not-set.xml b/src/test/resources/unit/compiler-implicit-test/plugin-config-not-set.xml index 64e1e7fb..011ced27 100644 --- a/src/test/resources/unit/compiler-implicit-test/plugin-config-not-set.xml +++ b/src/test/resources/unit/compiler-implicit-test/plugin-config-not-set.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,11 +29,7 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + none diff --git a/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml b/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml index d248ec8d..b0083f31 100644 --- a/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml @@ -29,29 +29,21 @@ ${project.basedir}/src/main/java - - - - - - javac - true + + **/TestCompile4*.java + + + **/TestCompile2*.java + **/TestCompile3*.java + + none diff --git a/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml b/src/test/resources/unit/compiler-modular-project/plugin-config.xml similarity index 72% rename from src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml rename to src/test/resources/unit/compiler-modular-project/plugin-config.xml index feb075ca..011ced27 100644 --- a/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml +++ b/src/test/resources/unit/compiler-modular-project/plugin-config.xml @@ -19,19 +19,17 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin - ${project.basedir}/src/main/java - + ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + none diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java b/src/test/resources/unit/compiler-modular-project/src/main/java/foo/TestModular.java similarity index 93% rename from src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java rename to src/test/resources/unit/compiler-modular-project/src/main/java/foo/TestModular.java index 7e519324..0f2b8d58 100644 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java +++ b/src/test/resources/unit/compiler-modular-project/src/main/java/foo/TestModular.java @@ -18,10 +18,9 @@ */ package foo; -public class TestCompile4 { - - public TestCompile4() { +public class TestModular { + public TestModular() { System.out.println("Woo Hoo!"); } } diff --git a/src/it/release-without-profile-fork/src/main/java/MyClass.java b/src/test/resources/unit/compiler-modular-project/src/main/java/module-info.java similarity index 95% rename from src/it/release-without-profile-fork/src/main/java/MyClass.java rename to src/test/resources/unit/compiler-modular-project/src/main/java/module-info.java index d4132bb2..38f61c0e 100644 --- a/src/it/release-without-profile-fork/src/main/java/MyClass.java +++ b/src/test/resources/unit/compiler-modular-project/src/main/java/module-info.java @@ -16,6 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package foo; - -public class MyClass {} +module foo.bar {} diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java b/src/test/resources/unit/compiler-modular-project/src/test/java/foo/TestModularTestCase.java similarity index 88% rename from src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java rename to src/test/resources/unit/compiler-modular-project/src/test/java/foo/TestModularTestCase.java index 2f33e30e..4f634a4e 100644 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java +++ b/src/test/resources/unit/compiler-modular-project/src/test/java/foo/TestModularTestCase.java @@ -18,10 +18,8 @@ */ package foo; -public class TestCompile3 { - - public TestCompile3() { - - System.out.println("Woo Hoo!"); +public class TestModularTestCase { + public void test() { + TestModular test = new TestModular(); } } diff --git a/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml b/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml index feb075ca..25231800 100644 --- a/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml @@ -19,19 +19,18 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin - ${project.basedir}/src/main/java - + ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + maven-compiler-stub + none diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java b/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java deleted file mode 100644 index 6e2a6ec2..00000000 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ -package foo; - -public class TestCompile2 { - - public TestCompile2() { - - System.out.println("Woo Hoo!"); - } -} diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java deleted file mode 100644 index 7d6cf4d2..00000000 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package foo; - -public class TestCompile2TestCase { - public void testCompile2() { - TestCompile2 test = new TestCompile2(); - } -} diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java deleted file mode 100644 index 1d485066..00000000 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package foo; - -public class TestCompile3TestCase { - public void testCompile3() { - TestCompile3 test = new TestCompile3(); - } -} diff --git a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java b/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java deleted file mode 100644 index 7d39b079..00000000 --- a/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package foo; - -public class TestCompile4TestCase { - public void testCompile4() { - TestCompile4 test = new TestCompile4(); - } -} diff --git a/src/test/resources/unit/compiler-skip-main/plugin-config.xml b/src/test/resources/unit/compiler-skip-main/plugin-config.xml index 64e1e7fb..011ced27 100644 --- a/src/test/resources/unit/compiler-skip-main/plugin-config.xml +++ b/src/test/resources/unit/compiler-skip-main/plugin-config.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,11 +29,7 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + none diff --git a/src/test/resources/unit/compiler-skip-test/plugin-config.xml b/src/test/resources/unit/compiler-skip-test/plugin-config.xml index 64e1e7fb..011ced27 100644 --- a/src/test/resources/unit/compiler-skip-test/plugin-config.xml +++ b/src/test/resources/unit/compiler-skip-test/plugin-config.xml @@ -19,6 +19,9 @@ + ${project.basedir}/target + ${project.basedir}/target/classes + ${project.basedir}/target/test-classes maven-compiler-plugin @@ -26,11 +29,7 @@ ${project.basedir}/src/main/java - javac - true - ${project.basedir}/target - ${project.basedir}/target/classes - ${project.basedir}/target/test-classes + none