(maven-site) branch MNGSITE-536 deleted (was 1c94e531)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-536 in repository https://gitbox.apache.org/repos/asf/maven-site.git was 1c94e531 [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-site) branch master updated (886888f6 -> 1c94e531)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git from 886888f6 Upgraded extension page - maven-build-cache-extension 1.1.0 - maven-enforcer-extension 3.4.1 add 1c94e531 [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong No new revisions were added by this update. Summary of changes: content/apt/plugin-developers/index.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-site) branch MNGSITE-536 created (now 1c94e531)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-536 in repository https://gitbox.apache.org/repos/asf/maven-site.git at 1c94e531 [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong This branch includes the following new commits: new 1c94e531 [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong The 1 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.
(maven-site) 01/01: [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNGSITE-536 in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 1c94e531a75dd1be1130ac42badcdc510b1a0186 Author: Karl Heinz Marbaise AuthorDate: Fri Apr 12 18:55:44 2024 +0200 [MNGSITE-536] - Link to Reference "Maven Plugin Tools and annotations" wrong --- content/apt/plugin-developers/index.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/apt/plugin-developers/index.apt b/content/apt/plugin-developers/index.apt index e8f45e8d..995f7737 100644 --- a/content/apt/plugin-developers/index.apt +++ b/content/apt/plugin-developers/index.apt @@ -58,7 +58,7 @@ Plugin Developers Centre * {{{../developers/mojo-api-specification.html} Mojo API and Annotation Reference}} - * {{{/plugin-tools/examples/using-annotations.html} Maven Plugin Tools and annotations}} + * {{{/plugin-tools/maven-plugin-tools-annotations/index.html} Maven Plugin Tools and annotations}} * {{{../ref/current/index.html} Maven API Reference}}
(maven-site) branch master updated: Upgraded extension page - maven-build-cache-extension 1.1.0 - maven-enforcer-extension 3.4.1
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new 886888f6 Upgraded extension page - maven-build-cache-extension 1.1.0 - maven-enforcer-extension 3.4.1 886888f6 is described below commit 886888f66e16570738fa569b8325db3734dd5963 Author: Karl Heinz Marbaise AuthorDate: Fri Apr 12 18:33:58 2024 +0200 Upgraded extension page - maven-build-cache-extension 1.1.0 - maven-enforcer-extension 3.4.1 --- content/markdown/extensions/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/markdown/extensions/index.md b/content/markdown/extensions/index.md index f17a374d..c4575e06 100644 --- a/content/markdown/extensions/index.md +++ b/content/markdown/extensions/index.md @@ -29,8 +29,8 @@ it is possible to hook into Maven, e.g. to manipulate the lifecycle. | Extension | Version | Release Date | Description | Source Repository | Issue Tracker ||-|--|-|-|-| -|[Build Cache](./maven-build-cache-extension/) | 1.0.0 | 2022-11-07 | Maven Incremental Build and Cache (local and remote). | [Git](https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git) / [GitHub](https://github.com/apache/maven-build-cache-extension/) | [Jira MBUILDCACHE](https://issues.apache.org/jira/browse/MBUILDCACHE) -|[Enforcer](/enforcer/maven-enforcer-extension/) | 3.0.0 | 2021-07-26 | Environmental constraint checking (Maven Version, JDK etc), User Custom Rule Execution. | [Git](https://gitbox.apache.org/repos/asf/maven-enforcer.git) / [GitHub](https://github.com/apache/maven-enforcer/) | [Jira MENFORCER](https://issues.apache.org/jira/browse/MENFORCER) +|[Build Cache](./maven-build-cache-extension/) | 1.1.0 | 2023-11-27 | Maven Incremental Build and Cache (local and remote). | [Git](https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git) / [GitHub](https://github.com/apache/maven-build-cache-extension/) | [Jira MBUILDCACHE](https://issues.apache.org/jira/browse/MBUILDCACHE) +|[Enforcer](/enforcer/maven-enforcer-extension/) | 3.4.1 | 2023-09-07 | Environmental constraint checking (Maven Version, JDK etc), User Custom Rule Execution. | [Git](https://gitbox.apache.org/repos/asf/maven-enforcer.git) / [GitHub](https://github.com/apache/maven-enforcer/) | [Jira MENFORCER](https://issues.apache.org/jira/browse/MENFORCER) ### Outside The Maven Land
(maven-site) branch MNGSITE-532 deleted (was f8a71bdd)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-532 in repository https://gitbox.apache.org/repos/asf/maven-site.git was f8a71bdd [MNGSITE-532] - Move plugin-report to Reporting Plugin table The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-site) branch master updated (7d8d3c18 -> f8a71bdd)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git from 7d8d3c18 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory add f8a71bdd [MNGSITE-532] - Move plugin-report to Reporting Plugin table No new revisions were added by this update. Summary of changes: content/apt/plugins/index.apt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(maven-site) 01/01: [MNGSITE-532] - Move plugin-report to Reporting Plugin table
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNGSITE-532 in repository https://gitbox.apache.org/repos/asf/maven-site.git commit f8a71bdd125a4d6f271811e0552609332fd7dd52 Author: Karl Heinz Marbaise AuthorDate: Fri Apr 12 18:10:04 2024 +0200 [MNGSITE-532] - Move plugin-report to Reporting Plugin table --- content/apt/plugins/index.apt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt index 4be1b118..be33926f 100644 --- a/content/apt/plugins/index.apt +++ b/content/apt/plugins/index.apt @@ -127,6 +127,8 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-pmd-plugin/} <<>>}} | B+R| 3.21.2 | 2023-11-02 | Generate a PMD report. | {{{https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git}Git}} / {{{https://github.com/apache/maven-pmd-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPMD}Jira MPMD}} *--++--++--+++ +| {{{/plugin-tools/maven-plugin-report-plugin/} <<>>}} | R | 3.12.0 | 2024-04-02 | Create a plugin documentation for any mojos found in the source tree. | {{{https://gitbox.apache.org/repos/asf/maven-plugin-tools.git}Git}} / {{{https://github.com/apache/maven-plugin-tools/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPLUGIN}Jira MPLUGIN}} +*--++--++--+++ | {{{/plugins/maven-project-info-reports-plugin/} <<>>}} | R | 3.5.0 | 2023-11-17 | Generate standard project reports. | {{{https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git}Git}} / {{{https://github.com/apache/maven-project-info-reports-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPIR}Jira MPIR}} *--++--++--+++ | {{{/surefire/maven-surefire-report-plugin/} <<>>}} | R | 3.2.5| 2024-01-06 | Generate a report based on the results of unit tests. | {{{https://gitbox.apache.org/repos/asf/maven-surefire.git}Git}} / {{{https://github.com/apache/maven-surefire/}GitHub}} | {{{https://issues.apache.org/jira/browse/SUREFIRE}Jira SUREFIRE}} @@ -161,8 +163,6 @@ Available Plugins *--++--++--+++ | {{{/plugin-tools/maven-plugin-plugin/} <<>>}}| B | 3.12.0 | 2024-04-02 | Create a Maven plugin descriptor for any mojos found in the source tree, to include in the JAR. | {{{https://gitbox.apache.org/repos/asf/maven-plugin-tools.git}Git}} / {{{https://github.com/apache/maven-plugin-tools/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPLUGIN}Jira MPLUGIN}} *--++--++--+++ -| {{{/plugin-tools/maven-plugin-report-plugin/} <<>>}} | R | 3.12.0 | 2024-04-02 | Create a plugin documentation for any mojos found in the source tree. | {{{https://gitbox.apache.org/repos/asf/maven-plugin-tools.git}Git}} / {{{https://github.com/apache/maven-plugin-tools/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPLUGIN}Jira MPLUGIN}} -*--++--++--+++ | {{{/plugins/maven-release-plugin/} <<>>}} | B | 3.0.1| 2023-05-30 | Release the current project - updating the POM and tagging in the SCM. | {{{https://gitbox.apache.org/repos/asf/maven-release.git}Git}} / {{{https://github.com/apache/maven-release/}GitHub}} | {{{https://issues.apache.org/jira/browse/MRELEASE}Jira MRELEASE}} *--++--++--+++ | {{{/plugins/maven-remote-resources-plugin/} <<>>}}| B | 3.1.0| 2023-05-08 | Copy remote resources to the output directory for inclusion in the artifact. | {{{https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git}Git}} / {{{https://github.com/apache/maven-remote-resources-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MRRESOURCES}Jira MRRESOURCES}}
(maven-site) branch MNGSITE-532 created (now f8a71bdd)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-532 in repository https://gitbox.apache.org/repos/asf/maven-site.git at f8a71bdd [MNGSITE-532] - Move plugin-report to Reporting Plugin table This branch includes the following new commits: new f8a71bdd [MNGSITE-532] - Move plugin-report to Reporting Plugin table The 1 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.
(maven-site) branch MNGSITE-535 deleted (was 7d8d3c18)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-535 in repository https://gitbox.apache.org/repos/asf/maven-site.git was 7d8d3c18 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-site) branch master updated (9ae1a5e9 -> 7d8d3c18)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git from 9ae1a5e9 maven-gpg-plugin 3.2.3 (fixed date) add 7d8d3c18 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory No new revisions were added by this update. Summary of changes: content/markdown/docs/3.9.2/release-notes.md | 2 ++ 1 file changed, 2 insertions(+)
(maven-site) 01/01: [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNGSITE-535 in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 7d8d3c187215da8137e6ff7a174a741d59c8a3e7 Author: Karl Heinz Marbaise AuthorDate: Fri Apr 12 17:41:16 2024 +0200 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory --- content/markdown/docs/3.9.2/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/markdown/docs/3.9.2/release-notes.md b/content/markdown/docs/3.9.2/release-notes.md index b432aa66..c1cd6ada 100644 --- a/content/markdown/docs/3.9.2/release-notes.md +++ b/content/markdown/docs/3.9.2/release-notes.md @@ -53,6 +53,8 @@ changes since Resolver 1.9.7 see release notes for Resolver [1.9.8](https://issu properties usable in configuration interpolation: `session.topDirectory` (reactor top directory) and `session.rootDirectory` (project root directory, usually where `.mvn` directory reside). It is recommended to create `.mvn` directory in project root directory, as presence of this directory is used to detect root directory location. If `.mvn` directory does not exists, root directory will not be detected, and in such case attempted use of expression `session.rootDirectory` in interpolation will make Maven refuse to start (will report error). +It is important to mention, that those two new properties, are only working within the `maven.config` file and +via the command line. They are **NOT** usable as configuration properties within your plugin configuration in your `pom.xml` file. * Plugin validation warnings change: they are not littered in console log anymore, but are collected and reported at the build end. Moreover, the validation checks have been extended, more warnings are to be expected if build contains plugins that may not work with upcoming Maven 4. The build end validation report verbosity can be controlled by `maven.plugin.validation` property values "brief", "default" and "verbose". The validation report cannot be turned off,
(maven-site) branch MNGSITE-535 created (now 7d8d3c18)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNGSITE-535 in repository https://gitbox.apache.org/repos/asf/maven-site.git at 7d8d3c18 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory This branch includes the following new commits: new 7d8d3c18 [MNGSITE-535] - Improve the Release Notes about 3.9.2 - related to topDirectory/rootDirectory The 1 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.
(maven) 01/03: Enhancements JDK17
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-enhancement-jdk17 in repository https://gitbox.apache.org/repos/asf/maven.git commit df8c8d0e148cf6b7fb38530bcf06619d837d3e58 Author: Karl Heinz Marbaise AuthorDate: Thu Mar 7 01:30:21 2024 +0100 Enhancements JDK17 --- .../org/apache/maven/api/feature/Features.java | 4 ++-- api/maven-api-model/src/main/mdo/maven.mdo | 3 +-- .../src/main/mdo/toolchains.mdo| 3 +-- .../org/apache/maven/artifact/ArtifactUtils.java | 25 +++--- .../manager/DefaultArtifactHandlerManager.java | 5 ++--- .../manager/LegacyArtifactHandlerManager.java | 5 ++--- .../resolver/filter/AndArtifactFilter.java | 4 +--- .../filter/CumulativeScopeArtifactFilter.java | 4 +--- .../resolver/filter/ExclusionSetFilter.java| 4 +--- .../resolver/filter/IncludesArtifactFilter.java| 2 +- .../resolver/filter/ScopeArtifactFilter.java | 4 +--- .../apache/maven/bridge/MavenRepositorySystem.java | 5 ++--- .../maven/classrealm/DefaultClassRealmManager.java | 4 ++-- .../internal/DefaultBeanConfigurator.java | 12 +-- .../internal/EnhancedConfigurationConverter.java | 8 +++ .../maven/execution/BuildResumptionData.java | 21 +++--- .../execution/DefaultBuildResumptionAnalyzer.java | 3 +-- .../DefaultBuildResumptionDataRepository.java | 2 +- .../org/apache/maven/execution/MavenSession.java | 2 +- .../apache/maven/execution/ProjectActivation.java | 21 +- .../scope/internal/MojoExecutionScope.java | 4 ++-- .../maven/extension/internal/CoreExports.java | 3 +-- .../maven/graph/DefaultProjectDependencyGraph.java | 3 +-- .../org/apache/maven/graph/ProjectSelector.java| 6 -- .../DefaultRepositorySystemSessionFactory.java | 2 +- .../internal/aether/LoggingRepositoryListener.java | 4 ++-- .../aether/ReverseTreeRepositoryListener.java | 4 ++-- .../maven/internal/aether/TypeRegistryAdapter.java | 4 ++-- .../apache/maven/internal/impl/AbstractNode.java | 4 ++-- .../maven/internal/impl/AbstractSession.java | 16 +++--- .../maven/internal/impl/DefaultArtifact.java | 2 +- .../internal/impl/DefaultArtifactManager.java | 4 ++-- .../DefaultBuildResumptionAnalyzerTest.java| 8 +++ .../src/main/java/org/apache/maven/di/Key.java | 4 ++-- .../org/apache/maven/di/impl/InjectorImplTest.java | 12 +-- src/mdo/java/WrapperProperties.java| 4 ++-- 36 files changed, 92 insertions(+), 133 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java index 2f49928e62..71c2abc7bb 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java @@ -69,8 +69,8 @@ public final class Features { } private static boolean doGet(Object val, boolean def) { -if (val instanceof Boolean) { -return (Boolean) val; +if (val instanceof Boolean value) { +return value; } else if (val != null) { return Boolean.parseBoolean(val.toString()); } else { diff --git a/api/maven-api-model/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo index 319341d31d..7594f7618b 100644 --- a/api/maven-api-model/src/main/mdo/maven.mdo +++ b/api/maven-api-model/src/main/mdo/maven.mdo @@ -2465,8 +2465,7 @@ * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object other) { -if (other instanceof Plugin) { -Plugin otherPlugin = (Plugin) other; +if (other instanceof Plugin otherPlugin) { return getKey().equals(otherPlugin.getKey()); } return false; diff --git a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo index 6a9bd87860..a2c8abcb1e 100644 --- a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo +++ b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo @@ -186,10 +186,9 @@ public boolean equals(Object other) { if (this == other) { return true; -} else if (!(other instanceof ToolchainModel)) { +} else if (!(other instanceof ToolchainModel that)) { return false; } else { -ToolchainModel that = (ToolchainModel) other; return java.util.Objects.equals(this.getType(), that.getType()) && java.util.Objects.equals(this.getProvides(), that.getProvides()); } diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.ja
(maven) branch code-enhancement-jdk17 created (now dbd5893b1f)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch code-enhancement-jdk17 in repository https://gitbox.apache.org/repos/asf/maven.git at dbd5893b1f Improved. This branch includes the following new commits: new df8c8d0e14 Enhancements JDK17 new 480c5c1175 Fixed. new dbd5893b1f Improved. The 3 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.
(maven) 03/03: Improved.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-enhancement-jdk17 in repository https://gitbox.apache.org/repos/asf/maven.git commit dbd5893b1fd89db6a6cce91fcaac95986351ad7a Author: Karl Heinz Marbaise AuthorDate: Thu Mar 7 17:47:55 2024 +0100 Improved. --- .../transform/DefaultArtifactTransformationManager.java | 3 +-- maven-core/src/main/java/org/apache/maven/ReactorReader.java | 5 ++--- .../src/main/java/org/apache/maven/RepositoryUtils.java | 9 - .../artifact/resolver/filter/ExclusionArtifactFilter.java | 3 +-- .../main/java/org/apache/maven/execution/MavenSession.java| 9 - .../java/org/apache/maven/execution/ProjectActivation.java| 5 ++--- .../aether/DefaultRepositorySystemSessionFactory.java | 2 +- .../java/org/apache/maven/internal/impl/AbstractNode.java | 2 -- .../java/org/apache/maven/internal/impl/AbstractSession.java | 3 +-- .../maven/internal/impl/DefaultChecksumAlgorithmService.java | 2 +- .../apache/maven/internal/impl/DefaultDependencyResolver.java | 2 +- .../src/main/java/org/apache/maven/internal/impl/Utils.java | 3 +-- .../transformation/impl/DefaultConsumerPomBuilder.java| 7 +++ .../java/org/apache/maven/lifecycle/DefaultLifecycles.java| 2 +- .../internal/DefaultLifecycleTaskSegmentCalculator.java | 3 +-- .../org/apache/maven/lifecycle/internal/ProjectBuildList.java | 2 +- .../maven/model/plugin/DefaultLifecycleBindingsInjector.java | 3 +-- .../maven/plugin/internal/DefaultPluginValidationManager.java | 3 +-- .../java/org/apache/maven/project/DefaultProjectBuilder.java | 2 +- .../src/main/java/org/apache/maven/project/ProjectSorter.java | 11 --- .../apache/maven/resolver/MavenChainedWorkspaceReader.java| 4 ++-- .../org/apache/maven/session/scope/internal/SessionScope.java | 3 +-- .../java/org/apache/maven/graph/DefaultGraphBuilderTest.java | 4 ++-- .../test/java/org/apache/maven/graph/ProjectSelectorTest.java | 3 ++- .../src/test/java/org/apache/maven/internal/impl/TestApi.java | 3 +-- .../src/main/java/org/apache/maven/di/impl/InjectorImpl.java | 4 ++-- .../src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java | 6 +++--- src/mdo/model-v3.vm | 10 +- 28 files changed, 50 insertions(+), 68 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java index 8eef94e9f3..b046adce9f 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java @@ -25,7 +25,6 @@ import javax.inject.Singleton; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.artifact.Artifact; @@ -50,7 +49,7 @@ public class DefaultArtifactTransformationManager implements ArtifactTransformat this.artifactTransformations = Stream.of("release", "latest", "snapshot") .map(artifactTransformations::get) .filter(Objects::nonNull) -.collect(Collectors.toList()); +.toList(); } public void transformForResolve(Artifact artifact, RepositoryRequest request) diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 2f3e197c8c..e288ded3e7 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -31,7 +31,6 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.api.services.Lookup; @@ -115,7 +114,7 @@ class ReactorReader implements MavenWorkspaceReader { .values() .stream() .map(MavenProject::getVersion) -.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList)); +.toList(); if (!versions.isEmpty()) { return versions; } @@ -126,7 +125,7 @@ class ReactorReader implements MavenWorkspaceReader { .stream() .filter(p -> Objects.nonNull(findArtifact(p, artifact))) .map(MavenProject::getVersion) -.collect(Collectors.collectingAndThen(Collectors.toList(
(maven) 02/03: Fixed.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-enhancement-jdk17 in repository https://gitbox.apache.org/repos/asf/maven.git commit 480c5c11753f66910a2c9e87a8d73d57fafac540 Author: Karl Heinz Marbaise AuthorDate: Thu Mar 7 17:18:32 2024 +0100 Fixed. --- .../maven/execution/DefaultBuildResumptionAnalyzerTest.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java index 2cbd91b80f..651cf45f55 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java @@ -18,6 +18,7 @@ */ package org.apache.maven.execution; +import java.util.List; import java.util.Optional; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -50,7 +51,7 @@ class DefaultBuildResumptionAnalyzerTest { Optional result = analyzer.determineBuildResumptionData(executionResult); assertThat(result.isPresent(), is(true)); -assertThat(result.get().remainingProjects(), is(asList("test:B"))); +assertThat(result.get().remainingProjects(), is(List.of("test:B"))); } @Test @@ -74,7 +75,7 @@ class DefaultBuildResumptionAnalyzerTest { Optional result = analyzer.determineBuildResumptionData(executionResult); assertThat(result.isPresent(), is(true)); -assertThat(result.get().remainingProjects(), is(asList("test:B"))); +assertThat(result.get().remainingProjects(), is(List.of("test:B"))); } @Test @@ -88,7 +89,7 @@ class DefaultBuildResumptionAnalyzerTest { Optional result = analyzer.determineBuildResumptionData(executionResult); assertThat(result.isPresent(), is(true)); -assertThat(result.get().remainingProjects(), is(asList("test:B", "test:C"))); +assertThat(result.get().remainingProjects(), is(List.of("test:B", "test:C"))); } @Test @@ -102,7 +103,7 @@ class DefaultBuildResumptionAnalyzerTest { Optional result = analyzer.determineBuildResumptionData(executionResult); assertThat(result.isPresent(), is(true)); -assertThat(result.get().remainingProjects(), is(asList("test:B", "test:D"))); +assertThat(result.get().remainingProjects(), is(List.of("test:B", "test:D"))); } private MavenProject createMavenProject(String artifactId) {
(maven-site) branch master updated: Fixed Release date for Apache Maven 4.0.0 alpha 12
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new ab7cafc9 Fixed Release date for Apache Maven 4.0.0 alpha 12 ab7cafc9 is described below commit ab7cafc99d3f3bf2814bc323c9ee50af68a5f52c Author: Karl Heinz Marbaise AuthorDate: Wed Jan 24 18:00:39 2024 +0100 Fixed Release date for Apache Maven 4.0.0 alpha 12 --- content/markdown/docs/history.md.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/markdown/docs/history.md.vm b/content/markdown/docs/history.md.vm index 0cda11e7..279416b2 100644 --- a/content/markdown/docs/history.md.vm +++ b/content/markdown/docs/history.md.vm @@ -81,7 +81,7 @@ Date format is: -MM-DD -#release( "2023-12-22" "4.0.0-alpha-12" "https://lists.apache.org/thread/8nq1mssngrol0zzotpyyll2rdm8f77ob; "true" "Java 8" "9" ) +#release( "2024-01-12" "4.0.0-alpha-12" "https://lists.apache.org/thread/8nq1mssngrol0zzotpyyll2rdm8f77ob; "true" "Java 8" "9" ) #release( "2023-12-22" "4.0.0-alpha-10" "https://lists.apache.org/thread/8nq1mssngrol0zzotpyyll2rdm8f77ob; "" "" "" ) #release( "2023-12-12" "4.0.0-alpha-9" "https://lists.apache.org/thread/z8tyggwfdskgd78s8pljbg0kqq3bogty; "" "" "" ) #release( "2023-10-20" "4.0.0-alpha-8" "https://lists.apache.org/thread/2wctg0oy6xynlxmpg4730mkm892s6hyf; "" "" "" )
(maven-invoker-plugin) 01/01: - Removed negative logic - Removed unused code - Improved code.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit 7abb1c3655c5b2515b48917fcfaff99256ae6bf9 Author: Karl Heinz Marbaise AuthorDate: Thu Jan 4 23:25:07 2024 +0100 - Removed negative logic - Removed unused code - Improved code. --- .../maven/plugins/invoker/SelectorUtils.java | 48 +- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java b/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java index 00b5400..ded4fad 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java +++ b/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java @@ -73,17 +73,10 @@ class SelectorUtils { } static boolean isOsFamily(List families, boolean defaultMatch) { -if (families != null && !families.isEmpty()) { -for (String family : families) { -if (Os.isFamily(family)) { -return true; -} -} - -return false; -} else { +if (families == null || families.isEmpty()) { return defaultMatch; } +return families.stream().anyMatch(Os::isFamily); } /** @@ -139,10 +132,6 @@ class SelectorUtils { return null; } -static boolean isMavenVersion(String mavenSpec) { -return isMavenVersion(mavenSpec, getMavenVersion()); -} - static boolean isMavenVersion(String mavenSpec, String actualVersion) { List includes = new ArrayList<>(); List excludes = new ArrayList<>(); @@ -157,15 +146,6 @@ class SelectorUtils { return System.getProperty("java.version", ""); } -static String getJreVersion(File javaHome) { -// @todo detect actual version -return null; -} - -static boolean isJreVersion(String jreSpec) { -return isJreVersion(jreSpec, getJreVersion()); -} - static boolean isJreVersion(String jreSpec, String actualJreVersion) { List includes = new ArrayList<>(); List excludes = new ArrayList<>(); @@ -176,33 +156,27 @@ class SelectorUtils { return isJreVersion(jreVersion, includes, true) && !isJreVersion(jreVersion, excludes, false); } -static boolean isJreVersion(List jreVersion, List versionPatterns, boolean defaultMatch) { -if (versionPatterns != null && !versionPatterns.isEmpty()) { -for (String versionPattern : versionPatterns) { -if (isJreVersion(jreVersion, versionPattern)) { -return true; -} -} - -return false; -} else { +static boolean isJreVersion(List jreVersions, List versionPatterns, boolean defaultMatch) { +if (versionPatterns == null || versionPatterns.isEmpty()) { return defaultMatch; } + +return versionPatterns.stream().anyMatch(versionPattern -> isJreVersion(jreVersions, versionPattern)); } -static boolean isJreVersion(List jreVersion, String versionPattern) { +static boolean isJreVersion(List jreVersions, String versionPattern) { List checkVersion = parseVersion(versionPattern); if (versionPattern.endsWith("+")) { // 1.5+ <=> [1.5,) -return compareVersions(jreVersion, checkVersion) >= 0; +return compareVersions(jreVersions, checkVersion) >= 0; } else if (versionPattern.endsWith("-")) { // 1.5- <=> (,1.5) -return compareVersions(jreVersion, checkVersion) < 0; +return compareVersions(jreVersions, checkVersion) < 0; } else { // 1.5 <=> [1.5,1.6) -return checkVersion.size() <= jreVersion.size() -&& checkVersion.equals(jreVersion.subList(0, checkVersion.size())); +return checkVersion.size() <= jreVersions.size() +&& checkVersion.equals(jreVersions.subList(0, checkVersion.size())); } }
(maven-invoker-plugin) branch code-improvements updated (eb82005 -> 7abb1c3)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git discard eb82005 - Removed negative logic - Removed unused code - Improved code. add 8dc8168 Switch to defaults for GHA maven verify new 7abb1c3 - Removed negative logic - Removed unused code - Improved code. 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 (eb82005) \ N -- N -- N refs/heads/code-improvements (7abb1c3) 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 1 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/workflows/maven-verify.yml | 1 - 1 file changed, 1 deletion(-)
(maven-invoker-plugin) branch code-improvements created (now eb82005)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git at eb82005 - Removed negative logic - Removed unused code - Improved code. This branch includes the following new commits: new eb82005 - Removed negative logic - Removed unused code - Improved code. The 1 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.
(maven-invoker-plugin) 01/01: - Removed negative logic - Removed unused code - Improved code.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit eb820058fd63d1e8052dc3c24d225429a48785e1 Author: Karl Heinz Marbaise AuthorDate: Thu Jan 4 23:25:07 2024 +0100 - Removed negative logic - Removed unused code - Improved code. --- .../maven/plugins/invoker/SelectorUtils.java | 48 +- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java b/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java index 00b5400..ded4fad 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java +++ b/src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java @@ -73,17 +73,10 @@ class SelectorUtils { } static boolean isOsFamily(List families, boolean defaultMatch) { -if (families != null && !families.isEmpty()) { -for (String family : families) { -if (Os.isFamily(family)) { -return true; -} -} - -return false; -} else { +if (families == null || families.isEmpty()) { return defaultMatch; } +return families.stream().anyMatch(Os::isFamily); } /** @@ -139,10 +132,6 @@ class SelectorUtils { return null; } -static boolean isMavenVersion(String mavenSpec) { -return isMavenVersion(mavenSpec, getMavenVersion()); -} - static boolean isMavenVersion(String mavenSpec, String actualVersion) { List includes = new ArrayList<>(); List excludes = new ArrayList<>(); @@ -157,15 +146,6 @@ class SelectorUtils { return System.getProperty("java.version", ""); } -static String getJreVersion(File javaHome) { -// @todo detect actual version -return null; -} - -static boolean isJreVersion(String jreSpec) { -return isJreVersion(jreSpec, getJreVersion()); -} - static boolean isJreVersion(String jreSpec, String actualJreVersion) { List includes = new ArrayList<>(); List excludes = new ArrayList<>(); @@ -176,33 +156,27 @@ class SelectorUtils { return isJreVersion(jreVersion, includes, true) && !isJreVersion(jreVersion, excludes, false); } -static boolean isJreVersion(List jreVersion, List versionPatterns, boolean defaultMatch) { -if (versionPatterns != null && !versionPatterns.isEmpty()) { -for (String versionPattern : versionPatterns) { -if (isJreVersion(jreVersion, versionPattern)) { -return true; -} -} - -return false; -} else { +static boolean isJreVersion(List jreVersions, List versionPatterns, boolean defaultMatch) { +if (versionPatterns == null || versionPatterns.isEmpty()) { return defaultMatch; } + +return versionPatterns.stream().anyMatch(versionPattern -> isJreVersion(jreVersions, versionPattern)); } -static boolean isJreVersion(List jreVersion, String versionPattern) { +static boolean isJreVersion(List jreVersions, String versionPattern) { List checkVersion = parseVersion(versionPattern); if (versionPattern.endsWith("+")) { // 1.5+ <=> [1.5,) -return compareVersions(jreVersion, checkVersion) >= 0; +return compareVersions(jreVersions, checkVersion) >= 0; } else if (versionPattern.endsWith("-")) { // 1.5- <=> (,1.5) -return compareVersions(jreVersion, checkVersion) < 0; +return compareVersions(jreVersions, checkVersion) < 0; } else { // 1.5 <=> [1.5,1.6) -return checkVersion.size() <= jreVersion.size() -&& checkVersion.equals(jreVersion.subList(0, checkVersion.size())); +return checkVersion.size() <= jreVersions.size() +&& checkVersion.equals(jreVersions.subList(0, checkVersion.size())); } }
(maven-invoker-plugin) branch master updated (f61e240 -> 0d2d871)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git from f61e240 [MINVOKER-352] - Remove usage commons-lang3 add 0d2d871 Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-invoker-plugin) branch master updated: [MINVOKER-352] - Remove usage commons-lang3
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git The following commit(s) were added to refs/heads/master by this push: new f61e240 [MINVOKER-352] - Remove usage commons-lang3 f61e240 is described below commit f61e240ed7eed015aac82fc9e121922febb43b16 Author: Karl Heinz Marbaise AuthorDate: Mon Jan 1 13:58:53 2024 +0100 [MINVOKER-352] - Remove usage commons-lang3 --- pom.xml| 5 - .../maven/plugins/invoker/AbstractInvokerMojo.java | 13 ++- .../maven/plugins/invoker/InvokerProperties.java | 9 .../maven/plugins/invoker/SelectorUtils.java | 25 ++ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 65120e4..c40407d 100644 --- a/pom.xml +++ b/pom.xml @@ -206,11 +206,6 @@ under the License. runtime - - org.apache.commons - commons-lang3 - 3.12.0 - org.codehaus.plexus plexus-utils diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java index 2632020..14ddb73 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java +++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java @@ -43,12 +43,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Model; @@ -1020,8 +1020,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { String projectDir = pomFile.getParent(); String parentPath = "../pom.xml"; -if (model.getParent() != null -&& StringUtils.isNotEmpty(model.getParent().getRelativePath())) { +if (model.getParent() != null && isNotEmpty(model.getParent().getRelativePath())) { parentPath = model.getParent().getRelativePath(); } String parent = relativizePath(new File(projectDir, parentPath), projectsRoot); @@ -1044,6 +1043,10 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { } } +private boolean isNotEmpty(String s) { +return Objects.nonNull(s) && !s.isEmpty(); +} + /** * Copies the specified projects to the directory given by {@link #cloneProjectsTo}. A project may either be denoted * by a path to a POM file or merely by a path to a base directory. During cloning, the POM files will be filtered. @@ -2031,7 +2034,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { private List calculateIncludes() { if (invokerTest != null) { -String[] testRegexes = StringUtils.split(invokerTest, ","); +String[] testRegexes = invokerTest.split(",+"); return Arrays.stream(testRegexes) .map(String::trim) .filter(s -> !s.isEmpty()) @@ -2049,7 +2052,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { List excludes; if (invokerTest != null) { -String[] testRegexes = StringUtils.split(invokerTest, ","); +String[] testRegexes = invokerTest.split(",+"); excludes = Arrays.stream(testRegexes) .map(String::trim) .filter(s -> !s.isEmpty()) diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java index a315c55..15e246d 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java @@ -31,7 +31,6 @@ import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.shared.invoker.InvocationRequest; /** @@ -43,7 +42,7 @@ class InvokerProperties { private static final String SELECTOR_PREFIX = "selector."; private static final Pattern ENVIRONMENT_VARIABLES_PATTERN = - Pattern.compile("invoker\\.environmentVariables\\.([A-Za-z][^.]+)(\\.([0-9]+))?"); + Pattern.compile("invoker\\.environmentVariables\\.([A-Za-z][^.]+)(\\.(\\d+))?"); // default values from Mojo configuration private Boolean defaultDebug; @@ -154,7 +153,
(maven-invoker-plugin) 01/01: [MINVOKER-352] - Remove usage commons-lang3
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MINVOKER-352 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit 84b2692f66cadfb467166a2650199746eb39f8bb Author: Karl Heinz Marbaise AuthorDate: Mon Jan 1 13:58:53 2024 +0100 [MINVOKER-352] - Remove usage commons-lang3 --- pom.xml| 5 - .../maven/plugins/invoker/AbstractInvokerMojo.java | 13 ++- .../maven/plugins/invoker/InvokerProperties.java | 9 .../maven/plugins/invoker/SelectorUtils.java | 25 ++ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 65120e4..c40407d 100644 --- a/pom.xml +++ b/pom.xml @@ -206,11 +206,6 @@ under the License. runtime - - org.apache.commons - commons-lang3 - 3.12.0 - org.codehaus.plexus plexus-utils diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java index 2632020..14ddb73 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java +++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java @@ -43,12 +43,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Model; @@ -1020,8 +1020,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { String projectDir = pomFile.getParent(); String parentPath = "../pom.xml"; -if (model.getParent() != null -&& StringUtils.isNotEmpty(model.getParent().getRelativePath())) { +if (model.getParent() != null && isNotEmpty(model.getParent().getRelativePath())) { parentPath = model.getParent().getRelativePath(); } String parent = relativizePath(new File(projectDir, parentPath), projectsRoot); @@ -1044,6 +1043,10 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { } } +private boolean isNotEmpty(String s) { +return Objects.nonNull(s) && !s.isEmpty(); +} + /** * Copies the specified projects to the directory given by {@link #cloneProjectsTo}. A project may either be denoted * by a path to a POM file or merely by a path to a base directory. During cloning, the POM files will be filtered. @@ -2031,7 +2034,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { private List calculateIncludes() { if (invokerTest != null) { -String[] testRegexes = StringUtils.split(invokerTest, ","); +String[] testRegexes = invokerTest.split(",+"); return Arrays.stream(testRegexes) .map(String::trim) .filter(s -> !s.isEmpty()) @@ -2049,7 +2052,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { List excludes; if (invokerTest != null) { -String[] testRegexes = StringUtils.split(invokerTest, ","); +String[] testRegexes = invokerTest.split(",+"); excludes = Arrays.stream(testRegexes) .map(String::trim) .filter(s -> !s.isEmpty()) diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java index a315c55..15e246d 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java @@ -31,7 +31,6 @@ import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.shared.invoker.InvocationRequest; /** @@ -43,7 +42,7 @@ class InvokerProperties { private static final String SELECTOR_PREFIX = "selector."; private static final Pattern ENVIRONMENT_VARIABLES_PATTERN = - Pattern.compile("invoker\\.environmentVariables\\.([A-Za-z][^.]+)(\\.([0-9]+))?"); + Pattern.compile("invoker\\.environmentVariables\\.([A-Za-z][^.]+)(\\.(\\d+))?"); // default values from Mojo configuration private Boolean defaultDebug; @@ -154,7 +153,7 @@ class InvokerProperties { * @param defaultMavenExecutable a default value */ public void setDefaultMavenExecutable(String default
(maven-invoker-plugin) branch MINVOKER-352 created (now 84b2692)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINVOKER-352 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git at 84b2692 [MINVOKER-352] - Remove usage commons-lang3 This branch includes the following new commits: new 84b2692 [MINVOKER-352] - Remove usage commons-lang3 The 1 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.
(maven-invoker-plugin) branch code-improvements deleted (was cb814ee)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was cb814ee Small code improvments. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-invoker-plugin) branch master updated (f9bb666 -> cb814ee)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git from f9bb666 Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 add cb814ee Small code improvments. No new revisions were added by this update. Summary of changes: src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java | 4 ++-- src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java | 2 +- src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-)
(maven-invoker-plugin) 01/01: Small code improvments.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit cb814ee9011b4c65f4e2ea3b6e38d43787b79d2d Author: Karl Heinz Marbaise AuthorDate: Sun Dec 31 16:02:41 2023 +0100 Small code improvments. --- src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java | 4 ++-- src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java | 2 +- src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java index f4e510e..a315c55 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java @@ -88,7 +88,7 @@ class InvokerProperties { private enum SelectorProperty { JAVA_VERSION(".java.version"), MAVEN_VERSION(".maven.version"), -OS_FAMLY(".os.family"); +OS_FAMILY(".os.family"); private final String suffix; @@ -281,7 +281,7 @@ class InvokerProperties { * @since 3.0.0 */ public String getOsFamily(int index) { -return this.properties.getProperty(SELECTOR_PREFIX + index + SelectorProperty.OS_FAMLY, getOsFamily()); +return this.properties.getProperty(SELECTOR_PREFIX + index + SelectorProperty.OS_FAMILY, getOsFamily()); } public Collection getToolchains() { diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java index a2e879b..c132712 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerToolchain.java @@ -29,7 +29,7 @@ import java.util.Map; public class InvokerToolchain { private final String type; -private Map provides = new HashMap<>(); +private final Map provides = new HashMap<>(); public InvokerToolchain(String type) { this.type = type; diff --git a/src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java b/src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java index 3e2c374..704e214 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java +++ b/src/main/java/org/apache/maven/plugins/invoker/JobExecutor.java @@ -18,6 +18,7 @@ */ package org.apache.maven.plugins.invoker; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ class JobExecutor { public void forEach(ThrowableJobConsumer jobConsumer) { // group and sort jobs by ordinal Map> groupedJobs = jobs.stream() -.sorted((j1, j2) -> Integer.compare(j2.getOrdinal(), j1.getOrdinal())) +.sorted(Comparator.comparing(BuildJob::getOrdinal).reversed()) .collect(Collectors.groupingBy(BuildJob::getOrdinal, LinkedHashMap::new, Collectors.toList())); ExecutorService executorService = Executors.newFixedThreadPool(threadsCount);
(maven-invoker-plugin) branch code-improvements created (now cb814ee)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch code-improvements in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git at cb814ee Small code improvments. This branch includes the following new commits: new cb814ee Small code improvments. The 1 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.
(maven-invoker) branch master updated: Removed overwriting of surefire plugin version.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker.git The following commit(s) were added to refs/heads/master by this push: new 13b7857 Removed overwriting of surefire plugin version. 13b7857 is described below commit 13b7857f0bdf3a3d2c5c98f4f0c963be12e12cff Author: Karl Heinz Marbaise AuthorDate: Sun Dec 31 15:55:35 2023 +0100 Removed overwriting of surefire plugin version. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf364b5..297a759 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,6 @@ under the License. 8 -2.22.2 2022-04-05T18:45:23Z
(maven-invoker-plugin) branch master updated (8b48295 -> f9bb666)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git from 8b48295 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 add f9bb666 Bump org.apache.maven.shared:maven-shared-utils from 3.4.1 to 3.4.2 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-invoker-plugin) branch master updated (d3a7592 -> 8b48295)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git from d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 add 8b48295 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-invoker) branch master updated: Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker.git The following commit(s) were added to refs/heads/master by this push: new 30a4e72 Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70) 30a4e72 is described below commit 30a4e726dee3d05b88114c12311e472e2a414ddd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sat Dec 30 13:46:32 2023 +0100 Bump org.apache.maven.shared:maven-shared-components from 39 to 41 (#70) Bumps [org.apache.maven.shared:maven-shared-components](https://github.com/apache/maven-parent) from 39 to 41. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-shared-components dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d69da99..bf364b5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.shared maven-shared-components -39 +41
(maven-invoker-plugin) branch MINVOKER-350 deleted (was d3a7592)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-invoker-plugin) branch master updated (fd33352 -> d3a7592)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git from fd33352 Add .checkstyle to .gitignore add d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(maven-invoker-plugin) branch MINVOKER-350 updated (d145a37 -> d3a7592)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git discard d145a37 [MINVOKER-350] - Upgrade maven-plugin parent to 41 add fd33352 Add .checkstyle to .gitignore new d3a7592 [MINVOKER-350] - Upgrade maven-plugin parent to 41 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 (d145a37) \ N -- N -- N refs/heads/MINVOKER-350 (d3a7592) 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 1 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: .gitignore | 1 + 1 file changed, 1 insertion(+)
(maven-invoker-plugin) 01/01: [MINVOKER-350] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit d3a7592143f48d260536b0d8acfa9f9d878c7d7c Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 09:58:18 2023 +0100 [MINVOKER-350] - Upgrade maven-plugin parent to 41 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4882f42..32446b1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -39 +41 @@ -396,7 +396,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - 3.5.0 ${project.build.directory}/it setup
(maven) branch MNG-7989 deleted (was 23d13fb322)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7989 in repository https://gitbox.apache.org/repos/asf/maven.git was 23d13fb322 [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven) branch master updated (437f34f8dc -> 23d13fb322)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git from 437f34f8dc [MNG-7957] Checksum API (backed by Resolver) (#1359) add 23d13fb322 [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/maven/cli/MavenCli.java | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-)
(maven) 01/01: [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-7989 in repository https://gitbox.apache.org/repos/asf/maven.git commit 23d13fb322b8d66f03f02ece57d75e154f847367 Author: Karl Heinz Marbaise AuthorDate: Fri Dec 22 19:12:21 2023 +0100 [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true. --- .../src/main/java/org/apache/maven/cli/MavenCli.java | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 98bd4092d4..67e458d829 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1347,13 +1347,16 @@ public class MavenCli { return; } -boolean runningOnCI = isRunningOnCI(cliRequest.getSystemProperties()); -if (runningOnCI) { -slf4jLogger.info("Making this build non-interactive, because the environment variable CI equals \"true\"." -+ " Disable this detection by removing that variable or adding --force-interactive."); -request.setInteractiveMode(false); -} else if (commandLine.hasOption(BATCH_MODE) || commandLine.hasOption(NON_INTERACTIVE)) { +if (commandLine.hasOption(BATCH_MODE) || commandLine.hasOption(NON_INTERACTIVE)) { request.setInteractiveMode(false); +} else { +boolean runningOnCI = isRunningOnCI(cliRequest.getSystemProperties()); +if (runningOnCI) { +slf4jLogger.info( +"Making this build non-interactive, because the environment variable CI equals \"true\"." ++ " Disable this detection by removing that variable or adding --force-interactive."); +request.setInteractiveMode(false); +} } }
(maven) branch MNG-7989 created (now 23d13fb322)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7989 in repository https://gitbox.apache.org/repos/asf/maven.git at 23d13fb322 [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true. This branch includes the following new commits: new 23d13fb322 [MNG-7989] - Making this build non-interactive, because the environment variable CI equals true. The 1 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.
(maven-install-plugin) branch upgrade-parent-and-mvn4 updated (beb0056 -> f440d22)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch upgrade-parent-and-mvn4 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git discard beb0056 Updated Parent / Added plexus-xml dep. new f440d22 Updated Parent / Added plexus-xml dep. 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 (beb0056) \ N -- N -- N refs/heads/upgrade-parent-and-mvn4 (f440d22) 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 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-install-plugin) 01/01: Updated Parent / Added plexus-xml dep.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch upgrade-parent-and-mvn4 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git commit f440d22b821a8fcb69df392333f23c308b1da62f Author: Karl Heinz Marbaise AuthorDate: Mon Dec 18 15:52:54 2023 +0100 Updated Parent / Added plexus-xml dep. --- pom.xml| 14 ++ .../non-changed-artifact/{verify.groovy => .mvn/.gitkeep} | 12 src/it/non-changed-artifact/verify.groovy | 1 - 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 1f4d7c1..1f2f418 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -39 +41 @@ -80,13 +80,13 @@ 3.1.0 -3.10.1 +3.11.0 3.1.0 3.3.0 -3.7.0 +3.10.2 3.3.0 3.2.1 -3.0.0-M7 +3.2.3 2023-03-21T14:31:18Z @@ -134,6 +134,12 @@ org.codehaus.plexus plexus-utils + + org.codehaus.plexus + plexus-xml + 4.0.3 + provided + diff --git a/src/it/non-changed-artifact/verify.groovy b/src/it/non-changed-artifact/.mvn/.gitkeep similarity index 58% copy from src/it/non-changed-artifact/verify.groovy copy to src/it/non-changed-artifact/.mvn/.gitkeep index 0be1085..042f3ce 100644 --- a/src/it/non-changed-artifact/verify.groovy +++ b/src/it/non-changed-artifact/.mvn/.gitkeep @@ -16,15 +16,3 @@ * specific language governing permissions and limitations * under the License. */ - -File buildLog = new File( basedir, 'build.log' ) -assert buildLog.exists() - -def logText = buildLog.text - -artifactPath = new File( basedir, 'target/minstall-39-1.0-SNAPSHOT.jar' ).canonicalPath -copyArtifactPath = new File( basedir, '../../local-repo/org/apache/maven/plugins/install/its/minstall-39/1.0-SNAPSHOT/minstall-39-1.0-SNAPSHOT.jar' ).canonicalPath - -assert 2 == logText.count( "[INFO] Installing ${artifactPath} to ${copyArtifactPath}" ) -assert 1 == logText.count( "[DEBUG] Skipped re-installing ${artifactPath} to ${copyArtifactPath}, seems unchanged" ) - diff --git a/src/it/non-changed-artifact/verify.groovy b/src/it/non-changed-artifact/verify.groovy index 0be1085..e20ebea 100644 --- a/src/it/non-changed-artifact/verify.groovy +++ b/src/it/non-changed-artifact/verify.groovy @@ -27,4 +27,3 @@ copyArtifactPath = new File( basedir, '../../local-repo/org/apache/maven/plugins assert 2 == logText.count( "[INFO] Installing ${artifactPath} to ${copyArtifactPath}" ) assert 1 == logText.count( "[DEBUG] Skipped re-installing ${artifactPath} to ${copyArtifactPath}, seems unchanged" ) -
(maven-install-plugin) branch upgrade-parent-and-mvn4 created (now beb0056)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch upgrade-parent-and-mvn4 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git at beb0056 Updated Parent / Added plexus-xml dep. This branch includes the following new commits: new beb0056 Updated Parent / Added plexus-xml dep. The 1 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.
(maven-install-plugin) 01/01: Updated Parent / Added plexus-xml dep.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch upgrade-parent-and-mvn4 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git commit beb0056b6a84bb7feac305cf2e701a5895e19282 Author: Karl Heinz Marbaise AuthorDate: Mon Dec 18 15:52:54 2023 +0100 Updated Parent / Added plexus-xml dep. --- pom.xml | 16 +++- .../{verify.groovy => .mvn/.gitkeep} | 12 src/it/non-changed-artifact/verify.groovy| 1 - 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 1f4d7c1..2441a57 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -39 +41 @@ -80,13 +80,13 @@ 3.1.0 -3.10.1 +3.11.0 3.1.0 3.3.0 -3.7.0 +3.10.2 3.3.0 3.2.1 -3.0.0-M7 +3.2.3 2023-03-21T14:31:18Z @@ -134,8 +134,14 @@ org.codehaus.plexus plexus-utils + + org.codehaus.plexus + plexus-xml + 4.0.3 + provided + - + org.apache.maven.plugin-tools maven-plugin-annotations diff --git a/src/it/non-changed-artifact/verify.groovy b/src/it/non-changed-artifact/.mvn/.gitkeep similarity index 58% copy from src/it/non-changed-artifact/verify.groovy copy to src/it/non-changed-artifact/.mvn/.gitkeep index 0be1085..042f3ce 100644 --- a/src/it/non-changed-artifact/verify.groovy +++ b/src/it/non-changed-artifact/.mvn/.gitkeep @@ -16,15 +16,3 @@ * specific language governing permissions and limitations * under the License. */ - -File buildLog = new File( basedir, 'build.log' ) -assert buildLog.exists() - -def logText = buildLog.text - -artifactPath = new File( basedir, 'target/minstall-39-1.0-SNAPSHOT.jar' ).canonicalPath -copyArtifactPath = new File( basedir, '../../local-repo/org/apache/maven/plugins/install/its/minstall-39/1.0-SNAPSHOT/minstall-39-1.0-SNAPSHOT.jar' ).canonicalPath - -assert 2 == logText.count( "[INFO] Installing ${artifactPath} to ${copyArtifactPath}" ) -assert 1 == logText.count( "[DEBUG] Skipped re-installing ${artifactPath} to ${copyArtifactPath}, seems unchanged" ) - diff --git a/src/it/non-changed-artifact/verify.groovy b/src/it/non-changed-artifact/verify.groovy index 0be1085..e20ebea 100644 --- a/src/it/non-changed-artifact/verify.groovy +++ b/src/it/non-changed-artifact/verify.groovy @@ -27,4 +27,3 @@ copyArtifactPath = new File( basedir, '../../local-repo/org/apache/maven/plugins assert 2 == logText.count( "[INFO] Installing ${artifactPath} to ${copyArtifactPath}" ) assert 1 == logText.count( "[DEBUG] Skipped re-installing ${artifactPath} to ${copyArtifactPath}, seems unchanged" ) -
(maven-site) branch master updated: Maven Project Info Reports Plugin Version 3.5.0
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new a545dc83 Maven Project Info Reports Plugin Version 3.5.0 a545dc83 is described below commit a545dc83a8878251fe70f4118f4b711869427769 Author: Karl Heinz Marbaise AuthorDate: Sun Dec 3 11:15:58 2023 +0100 Maven Project Info Reports Plugin Version 3.5.0 --- content/apt/plugins/index.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt index 51298af3..55ee0de9 100644 --- a/content/apt/plugins/index.apt +++ b/content/apt/plugins/index.apt @@ -127,7 +127,7 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-pmd-plugin/} <<>>}} | B+R| 3.21.2 | 2023-11-02 | Generate a PMD report. | {{{https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git}Git}} / {{{https://github.com/apache/maven-pmd-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPMD}Jira MPMD}} *--++--++--+++ -| {{{/plugins/maven-project-info-reports-plugin/} <<>>}} | R | 3.4.5 | 2023-06-03 | Generate standard project reports. | {{{https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git}Git}} / {{{https://github.com/apache/maven-project-info-reports-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPIR}Jira MPIR}} +| {{{/plugins/maven-project-info-reports-plugin/} <<>>}} | R | 3.5.0 | 2023-11-17 | Generate standard project reports. | {{{https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git}Git}} / {{{https://github.com/apache/maven-project-info-reports-plugin/}GitHub}} | {{{https://issues.apache.org/jira/browse/MPIR}Jira MPIR}} *--++--++--+++ | {{{/surefire/maven-surefire-report-plugin/} <<>>}} | R | 3.2.2| 2023-11-03 | Generate a report based on the results of unit tests. | {{{https://gitbox.apache.org/repos/asf/maven-surefire.git}Git}} / {{{https://github.com/apache/maven-surefire/}GitHub}} | {{{https://issues.apache.org/jira/browse/SUREFIRE}Jira SUREFIRE}} *--++--++--+++
(maven-jar-plugin) branch MJAR-299 deleted (was 0cbcfd4)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJAR-299 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git was 0cbcfd4 [MJAR-299] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-jar-plugin) branch master updated (de65c39 -> 0cbcfd4)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git from de65c39 [MJAR-297] Update Parent to 40 add 0cbcfd4 [MJAR-299] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-javadoc-plugin) branch MJAVADOC-779 deleted (was 692d7a8a)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJAVADOC-779 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git was 692d7a8a [MJAVADOC-779] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-javadoc-plugin) branch master updated (386d4ea2 -> 692d7a8a)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git from 386d4ea2 Remove dead link add 692d7a8a [MJAVADOC-779] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: null-null.jar | Bin 0 -> 92898 bytes pom.xml | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 null-null.jar
(maven) branch master updated (ba8cbd9685 -> b08b62f8de)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git from ba8cbd9685 [MNG-7932] - Upgrade maven-parent to v41 in maven-bom add b08b62f8de [MNG-7940] - Maven embedder CLI output contains nulls. No new revisions were added by this update. Summary of changes: .../maven/cli/CLIManagerDocumentationTest.java | 52 -- 1 file changed, 38 insertions(+), 14 deletions(-)
(maven) branch MNG-7940 deleted (was b08b62f8de)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7940 in repository https://gitbox.apache.org/repos/asf/maven.git was b08b62f8de [MNG-7940] - Maven embedder CLI output contains nulls. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven) 01/01: [MNG-7940] - Maven embedder CLI output contains nulls.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-7940 in repository https://gitbox.apache.org/repos/asf/maven.git commit b08b62f8de059d155dc05cea308dec0a0b2946b6 Author: Karl Heinz Marbaise AuthorDate: Sat Nov 18 14:15:19 2023 +0100 [MNG-7940] - Maven embedder CLI output contains nulls. --- .../maven/cli/CLIManagerDocumentationTest.java | 52 -- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java index 2397f1fa0a..bae804f080 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -30,6 +29,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; +import static java.util.Objects.nonNull; + /** * Pseudo test to generate documentation fragment about supported CLI options. TODO such documentation generation code * should not be necessary as unit test but should be run during site generation (Velocity? Doxia macro?) @@ -48,27 +49,45 @@ class CLIManagerDocumentationTest { private static class CLIManagerExtension extends CLIManager { public Collection getOptions() { List optList = new ArrayList<>(options.getOptions()); -Collections.sort(optList, new OptionComparator()); +optList.sort(new OptionComparator()); return optList; } } String getOptionsAsHtml() { StringBuilder sb = new StringBuilder(512); -boolean a = true; +boolean odd = true; sb.append( "OptionsDescription"); for (Option option : new CLIManagerExtension().getOptions()) { -a = !a; -sb.append("-"); -sb.append(option.getOpt()); -sb.append(",--"); -sb.append(option.getLongOpt()); -sb.append(""); + +sb.append(""); + +sb.append(""); + +if (nonNull(option.getOpt())) { +sb.append("-"); +sb.append(option.getOpt()); +sb.append(""); +} + +if (nonNull(option.getLongOpt())) { +if (nonNull(option.getOpt())) { +sb.append(", "); +} +sb.append("--"); +sb.append(option.getLongOpt()); +sb.append(""); +} + if (option.hasArg()) { if (option.hasArgName()) { sb.append(" ").append(option.getArgName()).append(""); @@ -76,9 +95,14 @@ class CLIManagerDocumentationTest { sb.append(' '); } } -sb.append(""); +sb.append(""); + +sb.append(""); +sb.append(""); sb.append(option.getDescription()); -sb.append(""); +sb.append(""); + +sb.append(""); sb.append(LS); } sb.append("");
(maven) branch MNG-7940 created (now b08b62f8de)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7940 in repository https://gitbox.apache.org/repos/asf/maven.git at b08b62f8de [MNG-7940] - Maven embedder CLI output contains nulls. This branch includes the following new commits: new b08b62f8de [MNG-7940] - Maven embedder CLI output contains nulls. The 1 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.
(maven) branch MNG-7938 created (now c6e1b0d441)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7938 in repository https://gitbox.apache.org/repos/asf/maven.git at c6e1b0d441 [MNG-7938] - Upgrade plexus classworlds to 2.7.0 This branch includes the following new commits: new c6e1b0d441 [MNG-7938] - Upgrade plexus classworlds to 2.7.0 The 1 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.
(maven) 01/01: [MNG-7938] - Upgrade plexus classworlds to 2.7.0
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-7938 in repository https://gitbox.apache.org/repos/asf/maven.git commit c6e1b0d441cb10cf02d0e0c70ea24ca530a6047f Author: Karl Heinz Marbaise AuthorDate: Sat Nov 18 10:27:15 2023 +0100 [MNG-7938] - Upgrade plexus classworlds to 2.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 722d4e142c..a6977609a7 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ under the License. 9.6 1.14.9 2.0 -2.6.0 +2.7.0 1.5.0 2.11.0 5.1.0
(maven-dependency-plugin) branch MDEP-890 created (now f0188665)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MDEP-890 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git at f0188665 [MDEP-890] - Upgrade sisu plexus deps related to Maven version. This branch includes the following new commits: new f0188665 [MDEP-890] - Upgrade sisu plexus deps related to Maven version. The 1 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.
(maven-dependency-plugin) 01/01: [MDEP-890] - Upgrade sisu plexus deps related to Maven version.
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MDEP-890 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git commit f018866592b652e58569679061d949b090a85b2b Author: Karl Heinz Marbaise AuthorDate: Fri Nov 17 22:35:39 2023 +0100 [MDEP-890] - Upgrade sisu plexus deps related to Maven version. --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dea87485..910a93af 100644 --- a/pom.xml +++ b/pom.xml @@ -99,17 +99,17 @@ under the License. - - + org.eclipse.sisu org.eclipse.sisu.inject -0.3.0.M1 +0.9.0.M2 +no_asm org.eclipse.sisu org.eclipse.sisu.plexus -0.3.0.M1 +0.9.0.M2
(maven-jdeprscan-plugin) 01/01: [MJDEPRSCAN-10] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJDEPRSCAN-10 in repository https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git commit a6430992125d264435cf137dfdbfc6dc1dc3578e Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 16:43:12 2023 +0100 [MJDEPRSCAN-10] - Upgrade maven-plugin parent to 41 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 530526f..27be723 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -40 +41 @@ -119,7 +119,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin -3.6.0 src/it/projects
(maven-jdeprscan-plugin) branch MJDEPRSCAN-10 created (now a643099)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJDEPRSCAN-10 in repository https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git at a643099 [MJDEPRSCAN-10] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new a643099 [MJDEPRSCAN-10] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-ear-plugin) branch MEAR-328 updated (3586779 -> eafbdee)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MEAR-328 in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git discard 3586779 [MEAR-328] - Upgrade maven-plugin parent to 41 new eafbdee [MEAR-328] - Upgrade maven-plugin parent to 41 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 (3586779) \ N -- N -- N refs/heads/MEAR-328 (eafbdee) 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 1 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: pom.xml| 76 +- .../maven/plugins/ear/AbstractEarModule.java | 876 +++ .../apache/maven/plugins/ear/AbstractEarMojo.java | 820 +++--- .../maven/plugins/ear/AbstractXmlWriter.java | 135 +- .../apache/maven/plugins/ear/AppClientModule.java | 149 +- .../maven/plugins/ear/ApplicationXmlWriter.java| 581 ++--- .../plugins/ear/ApplicationXmlWriterContext.java | 402 +-- .../maven/plugins/ear/EarExecutionContext.java | 221 +- .../org/apache/maven/plugins/ear/EarModule.java| 289 ++- .../apache/maven/plugins/ear/EarModuleFactory.java | 326 ++- .../java/org/apache/maven/plugins/ear/EarMojo.java | 2030 +++ .../maven/plugins/ear/EarPluginException.java | 145 +- .../apache/maven/plugins/ear/EjbClientModule.java | 120 +- .../org/apache/maven/plugins/ear/EjbModule.java| 153 +- .../java/org/apache/maven/plugins/ear/EjbRef.java | 93 +- .../org/apache/maven/plugins/ear/EnvEntry.java | 307 ++- .../plugins/ear/GenerateApplicationXmlMojo.java| 1013 .../org/apache/maven/plugins/ear/HarModule.java| 171 +- .../org/apache/maven/plugins/ear/JarModule.java| 245 +- .../maven/plugins/ear/JbossAppXmlWriter.java | 387 ++- .../maven/plugins/ear/JbossConfiguration.java | 710 +++--- .../apache/maven/plugins/ear/JbossEarModule.java | 93 +- .../org/apache/maven/plugins/ear/ParModule.java| 118 +- .../org/apache/maven/plugins/ear/RarModule.java| 161 +- .../org/apache/maven/plugins/ear/ResourceRef.java | 111 +- .../org/apache/maven/plugins/ear/SarModule.java| 198 +- .../org/apache/maven/plugins/ear/SecurityRole.java | 270 +- .../plugins/ear/UnknownArtifactTypeException.java | 113 +- .../org/apache/maven/plugins/ear/WebModule.java| 275 +- .../org/apache/maven/plugins/ear/WsrModule.java| 118 +- .../maven/plugins/ear/util/ArtifactRepository.java | 294 +-- .../ear/util/ArtifactTypeMappingService.java | 347 ++- .../maven/plugins/ear/util/EarMavenArchiver.java | 292 +-- .../plugins/ear/util/InvalidJavaEEVersion.java | 130 +- .../maven/plugins/ear/util/JavaEEVersion.java | 434 ++-- .../maven/plugins/ear/AbstractEarTestBase.java | 163 +- .../apache/maven/plugins/ear/EarModuleTest.java| 108 +- .../org/apache/maven/plugins/ear/EnvEntryTest.java | 207 +- .../maven/plugins/ear/it/AbstractEarPluginIT.java | 1277 +- .../org/apache/maven/plugins/ear/it/EarMojoIT.java | 2682 ++-- .../plugins/ear/stub/ArtifactHandlerTestStub.java | 152 +- .../plugins/ear/util/ArtifactRepositoryTest.java | 222 +- .../ear/util/ArtifactTypeMappingServiceTest.java | 462 ++-- .../plugins/ear/util/EarMavenArchiverTest.java | 171 +- .../maven/plugins/ear/util/JavaEEVersionTest.java | 266 +- .../plugins/ear/util/ResourceEntityResolver.java | 87 +- 46 files changed, 8977 insertions(+), 9023 deletions(-)
(maven-deploy-plugin) 01/01: [MDEPLOY-313] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MDEPLOY-313 in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git commit fb8eda5e784c5e9ee969d20ad894ebfb34b39114 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 16:35:48 2023 +0100 [MDEPLOY-313] - Upgrade maven-plugin parent to 41 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fc75b7c..20137fd 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -39 +41 @@ -77,7 +77,7 @@ under the License. 3.1.0 -3.10.1 +3.11.0 3.1.0 3.1.0 3.3.0
(maven-deploy-plugin) branch MDEPLOY-313 created (now fb8eda5)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MDEPLOY-313 in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git at fb8eda5 [MDEPLOY-313] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new fb8eda5 [MDEPLOY-313] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-help-plugin) branch master updated (4e13566 -> 8098d42)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git from 4e13566 [MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#99) add 8098d42 [MPH-211] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-help-plugin) branch MPH-211 deleted (was 8098d42)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MPH-211 in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git was 8098d42 [MPH-211] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-jlink-plugin) 01/01: [MJLINK-76] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJLINK-76 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git commit cc5b3c6a3278043443c142aaf219902e1a4b3d1f Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 10:18:46 2023 +0100 [MJLINK-76] - Upgrade maven-plugin parent to 41 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 41a56ec..1708d19 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -39 +41 @@ -228,7 +228,6 @@ org.apache.maven.plugins maven-invoker-plugin -3.5.1 ${project.build.directory}/local-repo
(maven-jlink-plugin) branch MJLINK-76 created (now cc5b3c6)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJLINK-76 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git at cc5b3c6 [MJLINK-76] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new cc5b3c6 [MJLINK-76] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-jdeps-plugin) 01/01: [MJDEPS-31] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJDEPS-31 in repository https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git commit 0577ffa76c0f8a8c73622b01dfffdf904c17dd13 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 10:15:41 2023 +0100 [MJDEPS-31] - Upgrade maven-plugin parent to 41 --- pom.xml| 26 +- .../plugins/jdeps/AbstractJDKInternalsMojo.java| 101 +- .../maven/plugins/jdeps/AbstractJDepsMojo.java | 1231 +--- .../maven/plugins/jdeps/JDKInternalsMojo.java | 145 +-- .../maven/plugins/jdeps/TestJDKInternalsMojo.java | 168 +-- .../plugins/jdeps/consumers/JDepsConsumer.java | 204 ++-- .../plugins/jdeps/consumers/JDepsConsumerTest.java | 211 ++-- 7 files changed, 1045 insertions(+), 1041 deletions(-) diff --git a/pom.xml b/pom.xml index 70c09c6..afe1b26 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins maven-plugins -34 +41 @@ -37,15 +35,21 @@ under the License. The JDeps Plugin uses the jdeps tool to analyze classes for internal API calls. 2015 + + + Andrea Nenni + + + ${mavenVersion} - + scm:git:https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git - https://github.com/apache/maven-jdeps-plugin/tree/${project.scm.tag} HEAD + https://github.com/apache/maven-jdeps-plugin/tree/${project.scm.tag} JIRA @@ -64,16 +68,10 @@ under the License. 3.0 -7 +8 2020-04-07T21:04:00Z - - - Andrea Nenni - - - org.apache.maven.plugin-tools @@ -106,7 +104,7 @@ under the License. commons-lang3 3.5 - + junit diff --git a/src/main/java/org/apache/maven/plugins/jdeps/AbstractJDKInternalsMojo.java b/src/main/java/org/apache/maven/plugins/jdeps/AbstractJDKInternalsMojo.java index cc43d99..24e312a 100644 --- a/src/main/java/org/apache/maven/plugins/jdeps/AbstractJDKInternalsMojo.java +++ b/src/main/java/org/apache/maven/plugins/jdeps/AbstractJDKInternalsMojo.java @@ -1,43 +1,58 @@ -package org.apache.maven.plugins.jdeps; - -/* - * 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 java.nio.file.Path; -import java.util.Set; - -import org.apache.maven.plugin.MojoFailureException; -import org.codehaus.plexus.util.cli.Commandline; - -/** - * Abstract Mojo for verifying code with jdkinternals - * - * @author Robert Scholte - */ -public abstract class AbstractJDKInternalsMojo extends AbstractJDepsMojo -{ - -@Override -protected void addJDepsOptions( Commandline cmd, Set dependenciesToAnalyze ) -throws MojoFailureException -{ -super.addJDepsOptions( cmd, dependenciesToAnalyze ); -cmd.createArg().setValue( "-jdkinternals" ); -} -} +/* + * 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.plugins.jdeps; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contr
(maven-jdeps-plugin) branch MJDEPS-31 created (now 0577ffa)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJDEPS-31 in repository https://gitbox.apache.org/repos/asf/maven-jdeps-plugin.git at 0577ffa [MJDEPS-31] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 0577ffa [MJDEPS-31] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-javadoc-plugin) 01/01: [MJAVADOC-779] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJAVADOC-779 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit 692d7a8a9918efd24633a44f0f3d4dfd22d0fec4 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 10:10:58 2023 +0100 [MJAVADOC-779] - Upgrade maven-plugin parent to 41 --- null-null.jar | Bin 0 -> 92898 bytes pom.xml | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/null-null.jar b/null-null.jar new file mode 100644 index ..2adaecf0 Binary files /dev/null and b/null-null.jar differ diff --git a/pom.xml b/pom.xml index e0cfdb86..64071fc3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -40 +41 @@ -498,7 +498,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin -3.6.0 ${project.build.directory}/local-repo src/it/projects
(maven-javadoc-plugin) branch MJAVADOC-779 created (now 692d7a8a)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJAVADOC-779 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git at 692d7a8a [MJAVADOC-779] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 692d7a8a [MJAVADOC-779] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-jar-plugin) 01/01: [MJAR-299] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJAR-299 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git commit 0cbcfd42e26207331cc3ad831a3888cb04591f07 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 10:01:59 2023 +0100 [MJAR-299] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5eff713..1082146 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -40 +41
(maven-jar-plugin) branch MJAR-299 created (now 0cbcfd4)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MJAR-299 in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git at 0cbcfd4 [MJAR-299] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 0cbcfd4 [MJAR-299] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-invoker-plugin) 01/01: [MINVOKER-350] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git commit d145a370708640f6dcc9f6a14323435619bde2a6 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 09:58:18 2023 +0100 [MINVOKER-350] - Upgrade maven-plugin parent to 41 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4882f42..32446b1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -39 +41 @@ -396,7 +396,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - 3.5.0 ${project.build.directory}/it setup
(maven-invoker-plugin) branch MINVOKER-350 created (now d145a37)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINVOKER-350 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git at d145a37 [MINVOKER-350] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new d145a37 [MINVOKER-350] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-help-plugin) branch MPH-211 created (now 8098d42)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MPH-211 in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git at 8098d42 [MPH-211] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 8098d42 [MPH-211] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-help-plugin) 01/01: [MPH-211] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MPH-211 in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git commit 8098d42b2f1582fcb2f5f1dcacc90e7da1997a18 Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 09:46:07 2023 +0100 [MPH-211] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a632f2..b616eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -39 +41
(maven-ear-plugin) branch MEAR-328 created (now 3586779)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MEAR-328 in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git at 3586779 [MEAR-328] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 3586779 [MEAR-328] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-ear-plugin) 01/01: [MEAR-328] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MEAR-328 in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git commit 3586779be1fd74ec1b1b7d5070d013ee2aba1c0d Author: Karl Heinz Marbaise AuthorDate: Tue Nov 14 09:40:57 2023 +0100 [MEAR-328] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc8d7ba..21f885d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ maven-plugins org.apache.maven.plugins -37 +41
(maven-artifact-plugin) branch MARTIFACT-56 deleted (was 94f0ad4)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MARTIFACT-56 in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git was 94f0ad4 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-artifact-plugin) branch master updated: [MARTIFACT-56] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git The following commit(s) were added to refs/heads/master by this push: new 94f0ad4 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 94f0ad4 is described below commit 94f0ad4cb33524a5dbd4a9904cbfe2124480c105 Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 21:20:01 2023 +0100 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f348c6e..1637163 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -40 +41
(maven-artifact-plugin) 01/01: [MARTIFACT-56] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MARTIFACT-56 in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git commit 94f0ad4cb33524a5dbd4a9904cbfe2124480c105 Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 21:20:01 2023 +0100 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f348c6e..1637163 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-plugins -40 +41
(maven-artifact-plugin) branch MARTIFACT-56 created (now 94f0ad4)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MARTIFACT-56 in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git at 94f0ad4 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 94f0ad4 [MARTIFACT-56] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-compiler-plugin) branch MCOMPILER-557 deleted (was a322465)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MCOMPILER-557 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git was a322465 [MCOMPILER-557] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-compiler-plugin) branch master updated (6d9a66e -> a322465)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git from 6d9a66e [MCOMPILER-554] Update plexus-java to 1.2.0 add a322465 [MCOMPILER-557] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven) branch MNG-7932 deleted (was a68443f4e9)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7932 in repository https://gitbox.apache.org/repos/asf/maven.git was a68443f4e9 [MNG-7932] - Upgrade maven-parent to v41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven) branch master updated (c613d7ab4b -> a68443f4e9)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git from c613d7ab4b Upgrade Build Requirements + Minimum JDK11 + Minimum Maven 3.6.3 add a68443f4e9 [MNG-7932] - Upgrade maven-parent to v41 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven-acr-plugin) branch MACR-57 deleted (was 5ee9659)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MACR-57 in repository https://gitbox.apache.org/repos/asf/maven-acr-plugin.git was 5ee9659 [MACR-57] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-acr-plugin) branch master updated (9fc5dee -> 5ee9659)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-acr-plugin.git from 9fc5dee Bump plexus-archiver from 4.6.3 to 4.7.0 add 5ee9659 [MACR-57] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(maven-compiler-plugin) 01/01: [MCOMPILER-557] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MCOMPILER-557 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git commit a322465885f6443062b3fb99aeab16ac09e419cc Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 21:03:12 2023 +0100 [MCOMPILER-557] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b90b36..f0f049d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -40 +41
(maven-compiler-plugin) branch MCOMPILER-557 created (now a322465)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MCOMPILER-557 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git at a322465 [MCOMPILER-557] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new a322465 [MCOMPILER-557] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-acr-plugin) branch MACR-57 created (now 5ee9659)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MACR-57 in repository https://gitbox.apache.org/repos/asf/maven-acr-plugin.git at 5ee9659 [MACR-57] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new 5ee9659 [MACR-57] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-acr-plugin) 01/01: [MACR-57] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MACR-57 in repository https://gitbox.apache.org/repos/asf/maven-acr-plugin.git commit 5ee96593f58ac1a97aab4c69d4c398186cb76a4a Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 20:58:06 2023 +0100 [MACR-57] - Upgrade maven-plugin parent to 41 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index daca152..324d4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -39 +41 @@ -151,7 +151,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin - 3.5.1 clean
(maven-assembly-plugin) branch MASSEMBLY-1007 deleted (was a700d0e1)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MASSEMBLY-1007 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git was a700d0e1 [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-assembly-plugin) branch master updated (00a986e6 -> a700d0e1)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git from 00a986e6 [MASSEMBLY-1000] ITs - cleanups add a700d0e1 [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(maven) branch MNG-7932 created (now a68443f4e9)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-7932 in repository https://gitbox.apache.org/repos/asf/maven.git at a68443f4e9 [MNG-7932] - Upgrade maven-parent to v41 This branch includes the following new commits: new a68443f4e9 [MNG-7932] - Upgrade maven-parent to v41 The 1 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.
(maven) 01/01: [MNG-7932] - Upgrade maven-parent to v41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-7932 in repository https://gitbox.apache.org/repos/asf/maven.git commit a68443f4e93de27fa72f08c462b2937244ab96d4 Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 20:47:38 2023 +0100 [MNG-7932] - Upgrade maven-parent to v41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6e251ab93..dd21b95578 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.maven maven-parent -40 +41
(maven-assembly-plugin) branch MASSEMBLY-1007 created (now a700d0e1)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MASSEMBLY-1007 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git at a700d0e1 [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41 This branch includes the following new commits: new a700d0e1 [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41 The 1 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.
(maven-assembly-plugin) 01/01: [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MASSEMBLY-1007 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git commit a700d0e16aefbe866793c8eca5b0693ffcf643a0 Author: Karl Heinz Marbaise AuthorDate: Mon Nov 13 20:42:43 2023 +0100 [MASSEMBLY-1007] - Upgrade maven-plugin parent to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68777ec9..f757c4b3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -40 +41