You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/09/08 23:26:48 UTC
[maven-compiler-plugin] branch MCOMPILER-476 updated (3ff39ed -> 29c834a)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MCOMPILER-476
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
discard 3ff39ed [MCOMPILER-476] Simplify code for toolchains
add f875750 Bump mockito-core from 4.1.0 to 4.2.0
add ce4eb1e Bump plexus-component-metadata from 2.1.0 to 2.1.1
add 8d5d3cd Fix site build
add 6335382 Shared GitHub Acton v2
add aeb15b6 [maven-release-plugin] prepare release maven-compiler-plugin-3.9.0
add 564eda0 [maven-release-plugin] prepare for next development iteration
add 4e332c3 Bump mockito-core from 4.2.0 to 4.3.1 (#83)
add f288a4e [MCOMPILER-481] compiler plugin should include static module for compilation (#82)
add 408f0e3 [MCOMPILER-474] - Also check jar files when determining if dependencies changed (#73)
add defecd0 (doc) Fix typo and follow xml block style used for other parameters
add 1176891 [MCOMPILER-479] Clarify compiler arguments Javadoc (#90)
add 12378bb [MCOMPILER-484] Remove deprecated mojos (#87)
add 40dd50f [MCOMPILER-205] Add a boolean to generate missing package-info classes by default (#88)
add b57e3bc [MCOMPILER-225] javac.sh/javac.bat added to archive (#91)
add 0e9e225 plexus-compiler version bump to 2.10.0
add 4428883 test release drafter
add d493466 test release drafter
add 46c7397 test
add 9df7bb2 Jira links working
add 5a4eb69 use plexus-compiler 2.10.0 (#92)
add 4e2d9b8 fix missing license
add 771eab7 bump version to 3.10.0-SNAPSHOT
add 500ade4 add more jdk for testing (#93)
add a0fa151 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
add 07d635a [maven-release-plugin] prepare for next development iteration
add 037670c restore snapshot version
add 807d4e5 use last release plugin version
add 2863d29 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
add bd72d75 back to snapshot again
add 49a40ab use github
add fda9729 fix typo gtrhhhrhr
add f4239a4 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
add 87b5a7f [maven-release-plugin] prepare for next development iteration
add 4a54a9a Bump maven-javadoc-plugin from 3.3.1 to 3.3.2
add f605c0f Merge pull request #94 from apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.3.2
add fa80028 [MCOMPILER-485] Fixes internal string format in generated package-info.class (#95)
add 96ed94f use shared release drafter
add 1de8c91 MCOMPILER 346 workaround to jdk bug: assertion error from javaxcompiler javax.tools API (#97)
add 6795b0f [MCOMPILER-426] add flag to enable-preview java compiler feature (#98)
add 4e08e2b [maven-release-plugin] prepare release maven-compiler-plugin-3.10.1
add c335f4e [maven-release-plugin] prepare for next development iteration
add be9b5ed Bump mockito-core from 4.3.1 to 4.4.0 (#100)
add cfea6eb [MCOMPILER-347] Set Xcludes in config passed to actual compiler (#101)
add 785089d [MCOMPILER-488] dedicated option for `implicit` javac flag (#102)
add 1d91230 Bump mockito-core from 4.4.0 to 4.5.1
add eda754e Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 (#118)
add 3d71421 Bump commons-io in /src/it/MCOMPILER-203-processorpath/annotation-user (#117)
add ebf97bb Bump junit in /src/it/multirelease-patterns/singleproject-toolchains
add d51d189 Bump junit
add 7c50bdf Bump junit
add 289eed3 Bump junit from 4.10 to 4.13.1 in /src/it/MCOMPILER-157/annotation-user
add 7277e1f Bump junit
add 488f560 Bump junit
add a74d1ca Bump junit in /src/it/multirelease-patterns/singleproject-runtime
add 51fa1ba Bump plexusCompilerVersion from 2.11.2-SNAPSHOT to 2.12.0
add 2ee984b Bump junit from 4.12 to 4.13.1 in /src/it/MCOMPILER-298
add 54d0927 Bump junit in /src/it/groovy-project-with-new-plexus-compiler
add c40f5fd MCOMPILER-495 create missing dirs in createMissingPackageInfoClasses (#121)
add 5a65232 ignore Maven Core updates by dependabot
add 6657ecf Bump maven-invoker-plugin from 3.2.2 to 3.3.0
add 3539d4c Bump mockito-core from 4.5.1 to 4.6.0
add 7d5d9d9 Fix Jenkins url
add c7a47c1 Bump maven-release-plugin from 3.0.0-M5 to 3.0.0-M6
add 58f6d60 Bump mockito-core from 4.6.0 to 4.6.1
add 876452d Bump maven-shared-utils
add b965e04 Bump maven-shared-utils in /src/it/MCOMPILER-157/annotation-verify
add 06fc217 Bump plexusCompilerVersion from 2.12.0 to 2.12.1
add 961734e Bump junit in /src/it/MCOMPILER-203-processorpath/annotation-user (#114)
add baa4ad9 Bump maven-jxr-plugin from 3.1.1 to 3.2.0
add 1b0d19a test build with 18 (#126)
add cdfeb52 usage of reflection is not needed anymore (#140)
add a522b31 [MCOMPILER-500] add some parameter to pattern from stale source calculation (#141)
add 413dbb7 MCOMPILER 499 display recompilation causes (#143)
add 0d1ff9f next version will be 3.11.0
add 7761563 force invoker.junitPackageName value
add 415c5a2 [MCOMPILER-505] - Update default source/target from 1.7 to 1.8
add f1ed86f Bump maven-jxr-plugin from 3.2.0 to 3.3.0
add 4353f9d [MCOMPILER-505] Small cleanup after review
add ff45fef [MCOMPILER-506] Upgrade parent pom to 37 and cleanup pom
new 73ccc38 Bump mockito-core from 4.6.1 to 4.8.0
new 29c834a [MCOMPILER-476] Simplify code for toolchains
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3ff39ed)
\
N -- N -- N refs/heads/MCOMPILER-476 (29c834a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/dependabot.yml | 3 +
.../release-drafter.yml | 5 +-
.github/workflows/maven-verify.yml | 10 +-
.../release-drafter.yml} | 20 +-
pom.xml | 123 ++-----
src/it/MCOMPILER-157/annotation-user/pom.xml | 2 +-
src/it/MCOMPILER-157/annotation-verify/pom.xml | 2 +-
.../annotation-user/pom.xml | 4 +-
.../annotation-verify/pom.xml | 2 +-
.../invoker.properties | 1 +
src/it/{MCOMPILER-192 => MCOMPILER-205}/pom.xml | 7 -
.../src/main/java/dummy/HelloWorld.java | 0
.../src/main/java/dummy/package-info.java | 7 +-
.../{MCOMPILER-197 => MCOMPILER-205}/verify.groovy | 42 +--
src/it/MCOMPILER-298/pom.xml | 2 +-
.../invoker.properties | 1 +
.../pom.xml | 127 ++++----
.../acceptance/server/PooledJenkinsController.java | 212 ++++++++++++
.../verify.groovy | 49 +--
src/it/MCOMPILER-349_dependencyChanged/pom.xml | 2 +-
.../dependent-module/pom.xml | 4 +-
.../dependent-module/src/main/java/Main.java | 2 +-
.../invoker.properties | 4 +-
.../pom.xml | 15 +-
.../service/pom.xml | 4 +-
.../service/src/main/java/TestService.java | 2 +-
.../verify.groovy | 2 -
.../app}/pom.xml | 95 +++---
.../app/src/main/java/module-info.java} | 7 +-
.../app/src/main/java/org/test/app/Main.java} | 5 +-
.../app/src/test/java/org/test/app/MainTest.java} | 18 +-
.../invoker.properties | 1 +
.../pom.xml | 23 +-
.../service}/pom.xml | 82 +++--
.../service/src/main/java/module-info.java} | 50 ++-
.../main/java/org/test/service/JSONService.java} | 53 +--
.../src/main/java/org/test/service/Service.java} | 47 +--
.../invoker.properties | 1 +
src/it/{MCOMPILER-192 => MCOMPILER-485}/pom.xml | 95 +++---
.../src/main/java/dummy/HelloWorld.java | 56 ++--
.../src/main/java/dummy/package-info.java | 7 +-
.../{MCOMPILER-197 => MCOMPILER-485}/verify.groovy | 9 +-
.../invoker.properties | 1 +
src/it/{MCOMPILER-192 => MCOMPILER-495}/pom.xml | 95 +++---
.../src/main/java/dummy/package-info.java | 7 +-
.../{MCOMPILER-197 => MCOMPILER-495}/verify.groovy | 9 +-
.../invoker.properties | 4 +-
.../pom.xml | 101 +++---
.../src/main/java/dummy}/Person.java | 8 +-
.../src/main/java/dummy/foo}/Person.java | 8 +-
.../src/main/java/dummy/package-info.java | 7 +-
.../verify.groovy | 3 +-
.../invoker.properties | 2 +-
src/it/{default => default-fork-windows}/pom.xml | 3 +-
.../src/main/java/MyClass.java | 0
.../src/test/java/MyTest.java | 0
.../verify.groovy} | 30 +-
.../invoker.properties | 2 +-
src/it/{default => default-fork}/pom.xml | 3 +-
.../src/main/java/MyClass.java | 0
.../src/test/java/MyTest.java | 0
.../verify.groovy} | 21 +-
.../pom.xml | 2 +-
src/it/mcompiler-182/pom.xml | 2 +-
src/it/mcompiler-21_class-remove/pom.xml | 2 +-
src/it/mcompiler-21_methodname-change/pom.xml | 2 +-
.../multimodule/multirelease-base/pom.xml | 2 +-
.../multimodule/multirelease-nine/pom.xml | 2 +-
.../multiproject/multirelease-base/pom.xml | 2 +-
.../multiproject/multirelease-nine/pom.xml | 2 +-
.../singleproject-runtime/pom.xml | 2 +-
.../singleproject-toolchains/pom.xml | 2 +-
.../apache/maven/plugin/AbstractCompilerMojo.java | 38 ---
.../maven/plugin/CompilationFailureException.java | 40 ---
.../java/org/apache/maven/plugin/CompilerMojo.java | 34 --
.../org/apache/maven/plugin/TestCompilerMojo.java | 34 --
.../plugin/compiler/AbstractCompilerMojo.java | 361 ++++++++++++++++-----
.../apache/maven/plugin/compiler/CompilerMojo.java | 47 ++-
.../maven/plugin/compiler/TestCompilerMojo.java | 52 ++-
src/site/apt/index.apt.vm | 4 +-
.../plugin/compiler/CompilerMojoTestCase.java | 46 ++-
.../plugin-config-none.xml} | 7 +-
.../plugin-config-not-set.xml} | 6 +-
83 files changed, 1233 insertions(+), 963 deletions(-)
copy src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor => .github/release-drafter.yml (83%)
copy .github/{dependabot.yml => workflows/release-drafter.yml} (79%)
copy src/it/{mcompiler-106 => MCOMPILER-205}/invoker.properties (96%)
copy src/it/{MCOMPILER-192 => MCOMPILER-205}/pom.xml (85%)
copy src/it/{MCOMPILER-192 => MCOMPILER-205}/src/main/java/dummy/HelloWorld.java (100%)
copy Jenkinsfile => src/it/MCOMPILER-205/src/main/java/dummy/package-info.java (93%)
copy src/it/{MCOMPILER-197 => MCOMPILER-205}/verify.groovy (84%)
copy src/it/{MCOMPILER-190 => MCOMPILER-346}/invoker.properties (96%)
copy src/it/{MCOMPILER-268_modulepath => MCOMPILER-346}/pom.xml (61%)
create mode 100644 src/it/MCOMPILER-346/src/main/java/org/jenkinsci/test/acceptance/server/PooledJenkinsController.java
copy src/it/{mcompiler-21_class-remove => MCOMPILER-346}/verify.groovy (83%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/dependent-module/pom.xml (96%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/dependent-module/src/main/java/Main.java (99%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/invoker.properties (93%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/pom.xml (87%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/service/pom.xml (96%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/service/src/main/java/TestService.java (99%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-474_recompile-dependent-when-package}/verify.groovy (99%)
copy src/it/{MCOMPILER-203-processorpath/annotation-processor => MCOMPILER-481-requires-static-included/app}/pom.xml (58%)
copy src/it/{MCOMPILER-336_incremental-modulepath/b/src/main/java/test/Foo.java => MCOMPILER-481-requires-static-included/app/src/main/java/module-info.java} (90%)
copy src/it/{MCOMPILER-336_incremental-modulepath/a/src/main/java/module-info.java => MCOMPILER-481-requires-static-included/app/src/main/java/org/test/app/Main.java} (95%)
copy src/it/{MCOMPILER-298/src/test/java/com/foo/ParameterTest.java => MCOMPILER-481-requires-static-included/app/src/test/java/org/test/app/MainTest.java} (74%)
copy src/it/{MCOMPILER-373_mrjar => MCOMPILER-481-requires-static-included}/invoker.properties (96%)
copy src/it/{mcompiler-179 => MCOMPILER-481-requires-static-included}/pom.xml (74%)
copy src/it/{MCOMPILER-203-processorpath/annotation-processor => MCOMPILER-481-requires-static-included/service}/pom.xml (70%)
copy src/it/{MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java => MCOMPILER-481-requires-static-included/service/src/main/java/module-info.java} (88%)
copy src/it/{MCOMPILER-203-processorpath/annotation-user/src/main/java/org/issue/SimpleObject.java => MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/JSONService.java} (84%)
copy src/it/{MCOMPILER-129/src/main/java/MyClass.java => MCOMPILER-481-requires-static-included/service/src/main/java/org/test/service/Service.java} (93%)
copy src/it/{mcompiler-106 => MCOMPILER-485}/invoker.properties (96%)
copy src/it/{MCOMPILER-192 => MCOMPILER-485}/pom.xml (85%)
copy src/it/{MCOMPILER-192 => MCOMPILER-485}/src/main/java/dummy/HelloWorld.java (97%)
copy Jenkinsfile => src/it/MCOMPILER-485/src/main/java/dummy/package-info.java (93%)
copy src/it/{MCOMPILER-197 => MCOMPILER-485}/verify.groovy (72%)
copy src/it/{mcompiler-106 => MCOMPILER-495}/invoker.properties (96%)
copy src/it/{MCOMPILER-192 => MCOMPILER-495}/pom.xml (85%)
copy Jenkinsfile => src/it/MCOMPILER-495/src/main/java/dummy/package-info.java (93%)
copy src/it/{MCOMPILER-197 => MCOMPILER-495}/verify.groovy (72%)
copy src/it/{MCOMPILER-190 => MCOMPILER-500-package-info-incr}/invoker.properties (90%)
copy src/it/{MCOMPILER-192 => MCOMPILER-500-package-info-incr}/pom.xml (79%)
copy src/it/{MCOMPILER-197/src/main/java/org/issue => MCOMPILER-500-package-info-incr/src/main/java/dummy}/Person.java (87%)
copy src/it/{MCOMPILER-197/src/main/java/org/issue => MCOMPILER-500-package-info-incr/src/main/java/dummy/foo}/Person.java (87%)
copy Jenkinsfile => src/it/MCOMPILER-500-package-info-incr/src/main/java/dummy/package-info.java (93%)
copy src/it/{MCOMPILER-349_dependencyChanged => MCOMPILER-500-package-info-incr}/verify.groovy (85%)
copy src/it/{MCOMPILER-321_pathexceptions => default-fork-windows}/invoker.properties (96%)
copy src/it/{default => default-fork-windows}/pom.xml (96%)
copy src/it/{MCOMPILER-328_multiReleaseOutput => default-fork-windows}/src/main/java/MyClass.java (100%)
copy src/it/{default-incremental-disable => default-fork-windows}/src/test/java/MyTest.java (100%)
copy src/it/{MCOMPILER-197/src/main/java/org/issue/Person.java => default-fork-windows/verify.groovy} (62%)
copy src/it/{MCOMPILER-321_pathexceptions => default-fork}/invoker.properties (96%)
copy src/it/{default => default-fork}/pom.xml (96%)
copy src/it/{MCOMPILER-328_multiReleaseOutput => default-fork}/src/main/java/MyClass.java (100%)
copy src/it/{default-incremental-disable => default-fork}/src/test/java/MyTest.java (100%)
copy src/it/{MCOMPILER-298/src/test/java/com/foo/ParameterTest.java => default-fork/verify.groovy} (62%)
mode change 100755 => 100644 src/it/groovy-project-with-new-plexus-compiler/pom.xml
delete mode 100644 src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
delete mode 100644 src/main/java/org/apache/maven/plugin/CompilationFailureException.java
delete mode 100644 src/main/java/org/apache/maven/plugin/CompilerMojo.java
delete mode 100644 src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
copy src/test/resources/unit/{compiler-basic-test/plugin-config.xml => compiler-implicit-test/plugin-config-none.xml} (84%)
copy src/test/resources/unit/{compiler-basic-test/plugin-config.xml => compiler-implicit-test/plugin-config-not-set.xml} (86%)
[maven-compiler-plugin] 01/02: Bump mockito-core from 4.6.1 to 4.8.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCOMPILER-476
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 73ccc38aacbcbc30980957a96e1e2f34af2161b2
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Sep 8 14:20:01 2022 +0000
Bump mockito-core from 4.6.1 to 4.8.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.8.0)
---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 847dc58..d6b532d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.6.1</version>
+ <version>4.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
[maven-compiler-plugin] 02/02: [MCOMPILER-476] Simplify code for toolchains
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCOMPILER-476
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 29c834acdf1c2fb8a94d72d1a2b36ce8de4545ad
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Dec 19 14:32:41 2021 +0100
[MCOMPILER-476] Simplify code for toolchains
---
.../singleproject-toolchains/pom.xml | 2 +-
.../plugin/compiler/AbstractCompilerMojo.java | 31 ----------------------
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
index 154f8ae..39445bf 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<goals>
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 58d907d..8a14483 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.compiler;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.charset.Charset;
import java.nio.file.Files;
@@ -1602,43 +1601,13 @@ public abstract class AbstractCompilerMojo
return value;
}
- //TODO remove the part with ToolchainManager lookup once we depend on
- //3.0.9 (have it as prerequisite). Define as regular component field then.
protected final Toolchain getToolchain()
{
Toolchain tc = null;
-
if ( jdkToolchain != null )
- {
- // Maven 3.3.1 has plugin execution scoped Toolchain Support
- try
- {
- Method getToolchainsMethod =
- toolchainManager.getClass().getMethod( "getToolchains", MavenSession.class, String.class,
- Map.class );
-
- @SuppressWarnings( "unchecked" )
- List<Toolchain> tcs =
- (List<Toolchain>) getToolchainsMethod.invoke( toolchainManager, session, "jdk",
- jdkToolchain );
-
- if ( tcs != null && !tcs.isEmpty() )
- {
- tc = tcs.get( 0 );
- }
- }
- catch ( NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException e )
- {
- // ignore
- }
- }
-
- if ( tc == null )
{
tc = toolchainManager.getToolchainFromBuildContext( "jdk", session );
}
-
return tc;
}