You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2021/10/18 18:33:58 UTC
[maven] branch MNG-7276 updated (6e25fc3 -> 013642b)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 6e25fc3 Fixed unused import.
discard b5acda4 Cleaned up.
discard 65dbef5 Continued.
discard cdf5971 Continued.
discard d18220d [MNG-7276] - Refactoring - Umbrella
add 3017b85 Refactor MavenSession#getPluginContext to be thread safe (#575)
add e50d65d MNG-7295 - Remove redundant/unused import statements.
add 4fafe44 MNG-7296 - Remove redundant 'if' statement
add c825b97 (doc) Update GH build config - bump 17-ea to 17, use new setup-java@2 action
add ccb76b0 (doc) Update dead link for Github PR docs
add fbb9d95 MNG-7293:fix resource leak due to Files.walk
add b9fb762 [MNG-7292] Unnecessarily escaped character
add d61fcf7 [MNG-7288] Remove redundant local variables
add 16afe06 [MNG-7290] Java8 improvements
add 2579622 fix indentation
add b31f3ae [MNG-7291] Avoid String concatenation in loops (#572)
add 4daa48e [MNG-7287] Simplify assertion with simpler and equivalent calls
add 0080e84 [MNG-7297] Remove redundant type arguments (#581)
add 8852b87 [MNG-7270] Switch to shell alternative to "which"
add ffc2b99 [MNG-6389] Move the toolchains model to a separate artifactId
add 274388f [MNG-7303] - Replace Throwable.initCause() with constructor.
add 4c21e11 [MNG-7298] - Avoid redundant conditions.
add bb0fed9 [MNG-6914] rename .mvn hidden directory in source to mvn
add bf59026 [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
add 5be4192 [MNG-6914] drop tar.gz archives for wrapper install distributions
add b58d8b3 [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared
add ede86ab [MNG-6914] move apache-maven-wrapper to its own separate Maven module
add 2f81b7d [MNG-6914] move assembly descriptors to src/assembly
add f46a913 fix javadoc errors
add 2c37a7a Simplify args help
new 42d212a [MNG-7276] - Refactoring - Umbrella
new 7de078f Continued.
new 45ebd37 Continued.
new 4daeffb Cleaned up.
new 013642b Fixed unused import.
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 (6e25fc3)
\
N -- N -- N refs/heads/MNG-7276 (013642b)
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 5 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.yml | 39 +++++++-----
CONTRIBUTING.md | 2 +-
Jenkinsfile | 6 +-
Jenkinsfile.its | 2 +-
.../pom.xml | 27 +++-----
.../src/assembly}/bin.xml | 22 +++----
.../src/assembly}/script.xml | 26 ++++----
.../src/assembly}/script/download | 0
.../src/assembly}/script/download.cmd | 0
.../shared/mvn}/wrapper/maven-wrapper.properties | 0
.../src/assembly/shared/mvnwDebug | 0
.../src/assembly/shared/mvnwDebug.cmd | 0
.../src/assembly/shared/mvnwlauncher | 2 +-
.../src/assembly/shared/mvnwlauncher.cmd | 2 +-
.../src/assembly}/source.xml | 35 +++++------
.../src/assembly}/source/download | 0
.../src/assembly}/source/download.cmd | 0
.../mvn}/wrapper/MavenWrapperDownloader.java | 0
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 +++++++++++++++++
.../src/site/site.xml | 0
apache-maven/pom.xml | 12 ++--
apache-maven/src/assembly/{maven => }/bin.xml | 2 +-
.../src/assembly/{maven => }/component.xml | 0
apache-maven/src/assembly/{maven => }/dir.xml | 2 +-
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/run | 2 +-
apache-maven/src/assembly/shared/run.cmd | 2 +-
apache-maven/src/assembly/{maven => }/src.xml | 0
.../org/apache/maven/artifact/ArtifactUtils.java | 13 +++-
.../org/apache/maven/artifact/DefaultArtifact.java | 6 +-
.../artifact/repository/ArtifactRepository.java | 19 +++++-
.../MultipleArtifactsNotFoundException.java | 7 ++-
.../maven/artifact/versioning/Restriction.java | 5 +-
.../maven/artifact/versioning/VersionRange.java | 5 +-
.../legacy/metadata/ArtifactMetadata.java | 13 +++-
.../apache/maven/artifact/ArtifactUtilsTest.java | 16 ++---
.../apache/maven/artifact/DefaultArtifactTest.java | 5 +-
.../versioning/DefaultArtifactVersionTest.java | 4 +-
maven-bom/pom.xml | 10 +++
.../apache/maven/building/ProblemCollector.java | 2 +-
.../java/org/apache/maven/building/Source.java | 1 +
.../building/DefaultProblemCollectorTest.java | 3 +-
.../apache/maven/building/DefaultProblemTest.java | 3 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 5 +-
.../maven/artifact/manager/WagonManager.java | 3 +
.../metadata/DefaultRepositoryMetadataManager.java | 2 +-
.../maven/profiles/DefaultProfileManager.java | 6 +-
.../java/org/apache/maven/project/ModelUtils.java | 4 +-
.../StringSearchModelInterpolator.java | 14 +----
.../maven/repository/MetadataResolutionResult.java | 8 +--
.../legacy/DefaultUpdateCheckManager.java | 2 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +--
.../legacy/WagonConfigurationException.java | 4 +-
.../resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../metadata/DefaultGraphConflictResolver.java | 3 +-
.../repository/metadata/MetadataGraphVertex.java | 2 +-
.../deployer/SimpleArtifactMetadataSource.java | 1 -
.../resolver/DefaultArtifactResolverTest.java | 1 -
.../maven/project/TestMavenRepositorySystem.java | 2 -
.../inheritance/t12/ProjectInheritanceTest.java | 3 +-
.../maven/repository/legacy/PerLookupWagon.java | 3 -
maven-core/pom.xml | 14 ++++-
.../maven/AbstractMavenLifecycleParticipant.java | 9 +++
.../org/apache/maven/ArtifactFilterManager.java | 4 ++
.../main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../apache/maven/ProjectDependenciesResolver.java | 8 +++
.../java/org/apache/maven/RepositoryUtils.java | 11 ++--
.../ArtifactMetadataRetrievalException.java | 16 ++++-
.../metadata/AbstractRepositoryMetadata.java | 2 +-
.../metadata/RepositoryMetadataManager.java | 2 +
.../metadata/io/DefaultMetadataReader.java | 4 +-
.../resolver/ArtifactResolutionResult.java | 11 ++--
.../maven/artifact/resolver/ResolutionNode.java | 4 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +--
.../apache/maven/classrealm/ClassRealmRequest.java | 1 +
.../maven/classrealm/DefaultClassRealmManager.java | 2 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../apache/maven/exception/ExceptionSummary.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 39 ++++++------
.../org/apache/maven/execution/ReactorManager.java | 4 +-
.../scope/internal/MojoExecutionScopeModule.java | 4 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 5 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 2 +-
.../lifecycle/internal/DependencyContext.java | 6 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 4 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../maven/plugin/PluginParameterException.java | 8 +--
.../plugin/internal/DefaultMavenPluginManager.java | 6 +-
.../prefix/NoPluginFoundForPrefixException.java | 12 ++--
.../version/PluginVersionNotFoundException.java | 2 +-
.../version/PluginVersionResolutionException.java | 6 +-
.../project/DefaultDependencyResolutionResult.java | 2 +-
.../maven/project/DefaultMavenProjectHelper.java | 4 +-
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../maven/project/ExtensionDescriptorBuilder.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../project/artifact/ActiveProjectArtifact.java | 6 +-
.../artifact/DefaultProjectArtifactsCache.java | 4 +-
.../project/artifact/MavenMetadataSource.java | 6 +-
.../maven/project/artifact/ProjectArtifact.java | 2 +-
.../ArtifactMetadataRetrievalException.java | 16 ++++-
.../maven/session/scope/internal/SessionScope.java | 2 +-
.../session/scope/internal/SessionScopeModule.java | 2 +-
.../settings/DefaultMavenSettingsBuilder.java | 2 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 1 -
.../lifecycle/LifecycleExecutorSubModulesTest.java | 3 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 -
.../internal/LifecycleDependencyResolverTest.java | 5 +-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 2 -
.../org/apache/maven/plugin/PluginManagerTest.java | 2 -
.../apache/maven/project/PomConstructionTest.java | 26 ++++----
.../maven/toolchain/DefaultToolchainTest.java | 48 ++++++++------
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 10 ++-
.../internal/BootstrapCoreExtensionManager.java | 3 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 16 ++---
.../maven/model/building/FileToRawModelMerger.java | 8 +--
.../org/apache/maven/model/building/Result.java | 6 +-
.../profile/activation/FileProfileActivator.java | 6 +-
.../activation/JdkVersionProfileActivator.java | 6 +-
.../OperatingSystemProfileActivator.java | 6 +-
.../activation/PropertyProfileActivator.java | 6 +-
.../StringSearchModelInterpolatorTest.java | 1 -
.../activation/AbstractProfileActivatorTest.java | 1 -
.../validation/DefaultModelValidatorTest.java | 8 +--
.../model/transform/AbstractEventXMLFilter.java | 32 +++++-----
.../maven/model/transform/DependencyKey.java | 7 +--
.../maven/model/transform/sax/SAXEventFactory.java | 10 +--
.../org/apache/maven/model/merge/ModelMerger.java | 2 +-
.../apache/maven/plugin/descriptor/Parameter.java | 2 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 2 +-
.../descriptor/PluginDescriptorBuilderTest.java | 29 +++++----
.../internal/ArtifactDescriptorReaderDelegate.java | 4 +-
.../internal/DefaultVersionResolverTest.java | 2 -
.../maven/settings/io/DefaultSettingsReader.java | 4 +-
maven-toolchain-builder/pom.xml | 70 +++++++++++++++++++++
.../building/DefaultToolchainsBuilder.java | 0
.../building/DefaultToolchainsBuildingRequest.java | 0
.../building/DefaultToolchainsBuildingResult.java | 0
.../toolchain/building/ToolchainsBuilder.java | 0
.../building/ToolchainsBuildingException.java | 0
.../building/ToolchainsBuildingRequest.java | 0
.../building/ToolchainsBuildingResult.java | 0
.../toolchain/io/DefaultToolchainsReader.java | 0
.../toolchain/io/DefaultToolchainsWriter.java | 0
.../toolchain/io/ToolchainsParseException.java | 0
.../maven/toolchain/io/ToolchainsReader.java | 0
.../maven/toolchain/io/ToolchainsWriter.java | 0
.../toolchain/merge/MavenToolchainMerger.java | 0
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 8 +--
.../toolchain/merge/MavenToolchainMergerTest.java | 0
.../org/apache/maven/toolchain/global.xml | 0
.../toolchain/model/toolchains-jdks-extend.xml | 0
.../toolchain/model/toolchains-jdks-extra.xml | 0
.../maven/toolchain/model/toolchains-jdks.xml | 0
.../resources/org/apache/maven/toolchain/user.xml | 0
maven-toolchain-model/pom.xml | 59 +++++++++++++++++
.../src/main/mdo/toolchains.mdo | 0
.../apache/maven/wrapper/DefaultDownloader.java | 6 +-
.../java/org/apache/maven/wrapper/Installer.java | 11 ++--
maven-wrapper/src/site/apt/index.apt | 4 +-
pom.xml | 7 ++-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
170 files changed, 674 insertions(+), 455 deletions(-)
rename apache-maven/maven-wrapper.pom => apache-maven-wrapper/pom.xml (74%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/bin.xml (82%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script.xml (76%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download (100%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/shared/.mvn => apache-maven-wrapper/src/assembly/shared/mvn}/wrapper/maven-wrapper.properties (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug.cmd (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher (54%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher.cmd (54%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source.xml (72%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download (100%)
rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/source/.mvn => apache-maven-wrapper/src/assembly/source/mvn}/wrapper/MavenWrapperDownloader.java (100%)
create mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
copy {apache-maven => apache-maven-wrapper}/src/site/site.xml (100%)
rename apache-maven/src/assembly/{maven => }/bin.xml (93%)
rename apache-maven/src/assembly/{maven => }/component.xml (100%)
rename apache-maven/src/assembly/{maven => }/dir.xml (93%)
rename apache-maven/src/assembly/{maven => }/src.xml (100%)
create mode 100644 maven-toolchain-builder/pom.xml
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java (100%)
rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml (100%)
rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml (100%)
create mode 100644 maven-toolchain-model/pom.xml
rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)
[maven] 05/05: Fixed unused import.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 013642bbcaf4499503db33260d6e0fc57a8a2d69
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Oct 8 15:12:11 2021 +0200
Fixed unused import.
---
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 1c0ba3e..4d55f0d 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -30,7 +30,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
[maven] 04/05: Cleaned up.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4daeffb99a8f24cfd4ce7fbc91bc9a4bbde4ea00
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Oct 8 15:00:57 2021 +0200
Cleaned up.
---
.../main/java/org/apache/maven/DefaultMaven.java | 36 ++++++++++++----------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index c0955a7..1c0ba3e 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -19,6 +19,22 @@ package org.apache.maven;
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.BuildResumptionAnalyzer;
import org.apache.maven.execution.BuildResumptionDataRepository;
@@ -58,20 +74,6 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Stream;
import static java.util.stream.Collectors.toSet;
@@ -250,7 +252,7 @@ public class DefaultMaven
eventCatapult.fire( ExecutionEvent.Type.ProjectDiscoveryStarted, session, null );
- Result<? extends ProjectDependencyGraph> graphResult = buildGraph( session, result );
+ Result<? extends ProjectDependencyGraph> graphResult = buildGraph( session );
if ( graphResult.hasErrors() )
{
@@ -306,7 +308,7 @@ public class DefaultMaven
// not expected that a participant will add or remove projects from the session.
//
- graphResult = buildGraph( session, result );
+ graphResult = buildGraph( session );
if ( graphResult.hasErrors() )
{
@@ -671,7 +673,7 @@ public class DefaultMaven
return index;
}
- private Result<? extends ProjectDependencyGraph> buildGraph( MavenSession session, MavenExecutionResult result )
+ private Result<? extends ProjectDependencyGraph> buildGraph( MavenSession session )
{
Result<? extends ProjectDependencyGraph> graphResult = graphBuilder.build( session );
for ( ModelProblem problem : graphResult.getProblems() )
[maven] 03/05: Continued.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 45ebd3715cf109a59c6be6b3c83e8a920ab49d37
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Oct 8 14:45:26 2021 +0200
Continued.
---
.../main/java/org/apache/maven/ReactorReader.java | 27 +++++++++++++---------
1 file changed, 16 insertions(+), 11 deletions(-)
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 1521b1b..e50eabb 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -325,22 +326,26 @@ class ReactorReader
}
return RepositoryUtils.toArtifacts( project.getAttachedArtifacts() ).stream()
- .filter( artifact -> attachedArtifactComparison( requestedArtifact, artifact ) )
+ .filter( isRequestedArtifact( requestedArtifact ) )
.findFirst()
.orElse( null );
}
- private boolean attachedArtifactComparison( Artifact requested, Artifact attached )
+ /**
+ * We are taking as much as we can from the DefaultArtifact.equals(). The requested artifact has no file, so we want
+ * to remove that from the comparison.
+ *
+ * @param requestArtifact checked against the given artifact.
+ * @return true if equals, false otherwise.
+ */
+ private Predicate<Artifact> isRequestedArtifact( Artifact requestArtifact )
{
- //
- // We are taking as much as we can from the DefaultArtifact.equals(). The requested artifact has no file so
- // we want to remove that from the comparison.
- //
- return requested.getArtifactId().equals( attached.getArtifactId() )
- && requested.getGroupId().equals( attached.getGroupId() )
- && requested.getVersion().equals( attached.getVersion() )
- && requested.getExtension().equals( attached.getExtension() )
- && requested.getClassifier().equals( attached.getClassifier() );
+ return s -> s.getArtifactId().equals( requestArtifact.getArtifactId() )
+ && s.getGroupId().equals( requestArtifact.getGroupId() )
+ && s.getVersion().equals( requestArtifact.getVersion() )
+ && s.getExtension().equals( requestArtifact.getExtension() )
+ && s.getClassifier().equals( requestArtifact.getClassifier() );
+
}
/**
[maven] 01/05: [MNG-7276] - Refactoring - Umbrella
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 42d212a7748d7719ca8066a71ed033d1f38344fe
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Sep 30 19:10:44 2021 +0200
[MNG-7276] - Refactoring - Umbrella
---
.../main/java/org/apache/maven/ReactorReader.java | 73 ++++++++--------------
.../java/org/apache/maven/RepositoryUtils.java | 47 +++++---------
.../resolver/filter/ExclusionArtifactFilter.java | 49 +++++++--------
.../org/apache/maven/execution/MavenSession.java | 12 +---
4 files changed, 69 insertions(+), 112 deletions(-)
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 247632a..07f61e0 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -24,20 +24,19 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
-
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
@@ -49,6 +48,9 @@ import org.eclipse.aether.util.artifact.ArtifactIdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
+import javax.inject.Named;
+
/**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
* jar if it has been built, or only compile output directory if packaging hasn't happened yet.
@@ -72,26 +74,22 @@ class ReactorReader
private final Map<String, List<MavenProject>> projectsByGA;
private final WorkspaceRepository repository;
+ private Function<MavenProject, String> projectIntoKey =
+ s -> ArtifactUtils.key( s.getGroupId(), s.getArtifactId(), s.getVersion() );
+
+ private Function<MavenProject, String> projectIntoVersionlessKey =
+ s -> ArtifactUtils.versionlessKey( s.getGroupId(), s.getArtifactId() );
+
@Inject
ReactorReader( MavenSession session )
{
this.session = session;
- this.projectsByGAV = new HashMap<>( session.getAllProjects().size() * 2 );
- session.getAllProjects().forEach( project ->
- {
- String projectId = ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() );
- this.projectsByGAV.put( projectId, project );
- } );
-
- projectsByGA = new HashMap<>( projectsByGAV.size() * 2 );
- for ( MavenProject project : projectsByGAV.values() )
- {
- String key = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ this.projectsByGAV =
+ session.getAllProjects().stream()
+ .collect( Collectors.toMap( projectIntoKey, Function.identity() ) );
- List<MavenProject> projects = projectsByGA.computeIfAbsent( key, k -> new ArrayList<>( 1 ) );
-
- projects.add( project );
- }
+ this.projectsByGA = projectsByGAV.values().stream()
+ .collect( Collectors.groupingBy( projectIntoVersionlessKey ) );
repository = new WorkspaceRepository( "reactor", new HashSet<>( projectsByGAV.keySet() ) );
}
@@ -128,23 +126,11 @@ class ReactorReader
{
String key = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
- List<MavenProject> projects = projectsByGA.get( key );
- if ( projects == null || projects.isEmpty() )
- {
- return Collections.emptyList();
- }
-
- List<String> versions = new ArrayList<>();
-
- for ( MavenProject project : projects )
- {
- if ( find( project, artifact ) != null )
- {
- versions.add( project.getVersion() );
- }
- }
-
- return Collections.unmodifiableList( versions );
+ return Optional.ofNullable( projectsByGA.get( key ) )
+ .orElse( Collections.emptyList() ).stream()
+ .filter( s -> Objects.nonNull( find( s, artifact ) ) )
+ .map( MavenProject::getVersion )
+ .collect( Collectors.collectingAndThen( Collectors.toList(), Collections::unmodifiableList ) );
}
@Override
@@ -334,15 +320,10 @@ class ReactorReader
return mainArtifact;
}
- for ( Artifact attachedArtifact : RepositoryUtils.toArtifacts( project.getAttachedArtifacts() ) )
- {
- if ( attachedArtifactComparison( requestedArtifact, attachedArtifact ) )
- {
- return attachedArtifact;
- }
- }
-
- return null;
+ return RepositoryUtils.toArtifacts( project.getAttachedArtifacts() ).stream()
+ .filter( artifact -> attachedArtifactComparison( requestedArtifact, artifact ) )
+ .findFirst()
+ .orElse( null );
}
private boolean attachedArtifactComparison( Artifact requested, Artifact attached )
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index bafed36..ce840ee 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -26,6 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@@ -170,32 +172,21 @@ public class RepositoryUtils
Artifact result = toArtifact( artifact );
- List<Exclusion> excl = null;
- if ( exclusions != null )
- {
- excl = new ArrayList<>( exclusions.size() );
- for ( org.apache.maven.model.Exclusion exclusion : exclusions )
- {
- excl.add( toExclusion( exclusion ) );
- }
- }
-
+ List<Exclusion> excl = Optional.ofNullable( exclusions )
+ .orElse( Collections.emptyList() )
+ .stream()
+ .map( RepositoryUtils::toExclusion )
+ .collect( Collectors.toList() );
return new Dependency( result, artifact.getScope(), artifact.isOptional(), excl );
}
public static List<RemoteRepository> toRepos( List<ArtifactRepository> repos )
{
- if ( repos == null )
- {
- return null;
- }
-
- List<RemoteRepository> results = new ArrayList<>( repos.size() );
- for ( ArtifactRepository repo : repos )
- {
- results.add( toRepo( repo ) );
- }
- return results;
+ return Optional.ofNullable( repos )
+ .orElse( Collections.emptyList() )
+ .stream()
+ .map( RepositoryUtils::toRepo )
+ .collect( Collectors.toList() );
}
public static RemoteRepository toRepo( ArtifactRepository repo )
@@ -318,11 +309,8 @@ public class RepositoryUtils
new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getClassifier(), null,
dependency.getVersion(), props, stereotype );
- List<Exclusion> exclusions = new ArrayList<>( dependency.getExclusions().size() );
- for ( org.apache.maven.model.Exclusion exclusion : dependency.getExclusions() )
- {
- exclusions.add( toExclusion( exclusion ) );
- }
+ List<Exclusion> exclusions =
+ dependency.getExclusions().stream().map( RepositoryUtils::toExclusion ).collect( Collectors.toList() );
return new Dependency( artifact,
dependency.getScope(),
@@ -363,12 +351,7 @@ public class RepositoryUtils
public static Collection<Artifact> toArtifacts( Collection<org.apache.maven.artifact.Artifact> artifactsToConvert )
{
- List<Artifact> artifacts = new ArrayList<>();
- for ( org.apache.maven.artifact.Artifact a : artifactsToConvert )
- {
- artifacts.add( toArtifact( a ) );
- }
- return artifacts;
+ return artifactsToConvert.stream().map( RepositoryUtils::toArtifact ).collect( Collectors.toList() );
}
public static WorkspaceRepository getWorkspace( RepositorySystemSession session )
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
index dd50c31..d58c4a7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
@@ -19,11 +19,12 @@ package org.apache.maven.artifact.resolver.filter;
* under the License.
*/
+import java.util.List;
+import java.util.function.Predicate;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
-import java.util.List;
-
/**
* Filter to exclude from a list of artifact patterns.
*/
@@ -38,31 +39,29 @@ public class ExclusionArtifactFilter implements ArtifactFilter
this.exclusions = exclusions;
}
+ private Predicate<Exclusion> sameArtifactId( Artifact artifact )
+ {
+ return exclusion -> exclusion.getArtifactId().equals( artifact.getArtifactId() );
+ }
+
+ private Predicate<Exclusion> sameGroupId( Artifact artifact )
+ {
+ return exclusion -> exclusion.getGroupId().equals( artifact.getGroupId() );
+ }
+
+ private Predicate<Exclusion> groupIdIsWildcard = exclusion -> WILDCARD.equals( exclusion.getGroupId() );
+ private Predicate<Exclusion> artifactIdIsWildcard = exclusion -> WILDCARD.equals( exclusion.getArtifactId() );
+
+ Predicate<Exclusion> groupIdAndArtifactIdIsWildcard = groupIdIsWildcard.and( artifactIdIsWildcard );
+
@Override
public boolean include( Artifact artifact )
{
- for ( Exclusion exclusion : exclusions )
- {
- if ( WILDCARD.equals( exclusion.getGroupId() ) && WILDCARD.equals( exclusion.getArtifactId() ) )
- {
- return false;
- }
- if ( WILDCARD.equals( exclusion.getGroupId() )
- && exclusion.getArtifactId().equals( artifact.getArtifactId() ) )
- {
- return false;
- }
- if ( WILDCARD.equals( exclusion.getArtifactId() )
- && exclusion.getGroupId().equals( artifact.getGroupId() ) )
- {
- return false;
- }
- if ( exclusion.getGroupId().equals( artifact.getGroupId() )
- && exclusion.getArtifactId().equals( artifact.getArtifactId() ) )
- {
- return false;
- }
- }
- return true;
+ return !exclusions.stream().anyMatch(
+ groupIdAndArtifactIdIsWildcard
+ .or( groupIdIsWildcard.and( sameArtifactId( artifact ) ) )
+ .or( artifactIdIsWildcard.and( sameGroupId( artifact ) ) )
+ .or( sameGroupId( artifact ).and( sameArtifactId( artifact ) ) )
+ );
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index c2f0c89..5af1734 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -91,15 +91,9 @@ public class MavenSession
if ( !projects.isEmpty() )
{
this.currentProject = projects.get( 0 );
- this.topLevelProject = currentProject;
- for ( MavenProject project : projects )
- {
- if ( project.isExecutionRoot() )
- {
- topLevelProject = project;
- break;
- }
- }
+ this.topLevelProject =
+ projects.stream().filter( project -> project.isExecutionRoot() ).findFirst()
+ .orElse( currentProject );
}
else
{
[maven] 02/05: Continued.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7de078fa0f1c5f2d4e1de5dd9382f92236f2bed1
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Oct 3 21:42:24 2021 +0200
Continued.
---
.../main/java/org/apache/maven/ReactorReader.java | 8 +++++--
.../maven/extension/internal/CoreExports.java | 14 +++++------
.../lifecycle/mapping/DefaultLifecycleMapping.java | 3 ++-
.../profile/DefaultProfileActivationContext.java | 27 +++++++---------------
4 files changed, 22 insertions(+), 30 deletions(-)
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 07f61e0..1521b1b 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -51,6 +51,10 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+
/**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
* jar if it has been built, or only compile output directory if packaging hasn't happened yet.
@@ -86,10 +90,10 @@ class ReactorReader
this.session = session;
this.projectsByGAV =
session.getAllProjects().stream()
- .collect( Collectors.toMap( projectIntoKey, Function.identity() ) );
+ .collect( toMap( projectIntoKey, identity() ) );
this.projectsByGA = projectsByGAV.values().stream()
- .collect( Collectors.groupingBy( projectIntoVersionlessKey ) );
+ .collect( groupingBy( projectIntoVersionlessKey ) );
repository = new WorkspaceRepository( "reactor", new HashSet<>( projectsByGAV.keySet() ) );
}
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
index d72b3f9..2d976ae 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
@@ -20,14 +20,16 @@ package org.apache.maven.extension.internal;
*/
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toMap;
+
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself and loaded Maven core extensions.
@@ -47,13 +49,9 @@ public class CoreExports
public CoreExports( ClassRealm realm, Set<String> exportedArtifacts, Set<String> exportedPackages )
{
- Map<String, ClassLoader> packages = new LinkedHashMap<>();
- for ( String pkg : exportedPackages )
- {
- packages.put( pkg, realm );
- }
this.artifacts = Collections.unmodifiableSet( new HashSet<>( exportedArtifacts ) );
- this.packages = Collections.unmodifiableMap( new HashMap<>( packages ) );
+ this.packages = exportedPackages.stream().collect(
+ collectingAndThen( toMap( identity(), v -> realm ), Collections::unmodifiableMap ) );
}
/**
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
index e1ff314..4001a97 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;
/**
@@ -57,7 +58,7 @@ public class DefaultLifecycleMapping
public DefaultLifecycleMapping( final List<Lifecycle> lifecycles )
{
this.lifecycleMap = Collections.unmodifiableMap(
- lifecycles.stream().collect( toMap( Lifecycle::getId, l -> l ) )
+ lifecycles.stream().collect( toMap( Lifecycle::getId, identity() ) )
);
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
index 77d92a3..4fb1b26 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
@@ -21,12 +21,13 @@ package org.apache.maven.model.profile;
import java.io.File;
import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toMap;
+
/**
* Describes the environmental context used to determine the activation status of profiles.
*
@@ -230,8 +231,11 @@ public class DefaultProfileActivationContext
{
if ( projectProperties != null )
{
-
- this.projectProperties = Collections.unmodifiableMap( toMap( projectProperties ) );
+ this.projectProperties = projectProperties.entrySet().stream()
+ .collect(
+ collectingAndThen(
+ toMap( k -> String.valueOf( k.getKey() ), v -> String.valueOf( v ) ),
+ Collections::unmodifiableMap ) );
}
else
{
@@ -241,19 +245,4 @@ public class DefaultProfileActivationContext
return this;
}
- private Map<String, String> toMap( Properties properties )
- {
- if ( properties == null )
- {
- return Collections.emptyMap();
- }
- Map<String, String> map = new HashMap<>();
- Enumeration keys = properties.keys();
- while ( keys.hasMoreElements() )
- {
- String key = (String) keys.nextElement();
- map.put( key, properties.getProperty( key ) );
- }
- return map;
- }
}