You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/05 22:38:29 UTC
[maven] branch MNG-6828 updated (73ace0e -> 963bc54)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6828
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 73ace0e [MNG-6828] Make DependencyResolutionResult transient
add f3e6641 [MNG-6841] update plexus-interpolation to 1.26
add 735b72f [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
add 5670dfa [MNG-6842] ProjectBuilderTest uses Guava, but Guava is not defined in dependencies
add f620bb7 [MNG-6844] Remove outdated TODOs
add 3949228 [MNG-6847] Explicit type can be replaced by the diamond operator
add 9989e6a [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows
add 838c196 [MNG-5587] When the build fails emit any errors without the user having to specify -e or -X
add da5d8b8 [MNG-6850] Prevent printing the EXEC_DIR when it's just a disk letter
add a6f113a Bump junit from 4.12 to 4.13
add ce35eff [MNG-6853] - Don't box primitives where it's not needed
add ff9bc4f [MNG-6852] Upgrade maven-source-plugin from 3.2.0 to 3.2.1
add ddb454a [MNG-6831] Replace Anonymous classes by lambdas
add 1697e7a [MNG-6855] Simplify code
add ace32fd [MNG-6855] Simplify code - computeIfAbsent()
add e6c897e [MNG-6855] Simplify some code
add 96e11e1 [MNG-6855] Remove redundant code
add cdb2cd0 [MNG-6071] Normalize relative paths for working directory
add 720e46d Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X"
add 45076f3 Improve license handling
add 35658fd Run Integration Tests with Java 8, 11, 13 and 14
add 716cc1f [MNG-5669] same pom.xml is read multiple times
add b0d2846 [MNG-6859] Build not reproducible when built from source release
new 963bc54 [MNG-6828] Make DependencyResolutionResult transient
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 (73ace0e)
\
N -- N -- N refs/heads/MNG-6828 (963bc54)
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:
Jenkinsfile | 6 +-
apache-maven/pom.xml | 6 +-
apache-maven/src/bin/mvn.cmd | 12 +-
.../main/appended-resources/META-INF/LICENSE.vm | 19 +-
.../licenses/{ASL-2.0.txt => Apache-2.0.txt} | 0
apache-maven/src/main/assembly/component.xml | 1 +
.../apache/maven/settings/GlobalSettingsTest.java | 3 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../MultipleArtifactsNotFoundException.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 6 +-
.../maven/artifact/versioning/VersionRange.java | 4 +-
.../maven/building/DefaultProblemCollector.java | 2 +-
.../java/org/apache/maven/building/FileSource.java | 31 +++
.../org/apache/maven/building/StringSource.java | 36 +++-
.../java/org/apache/maven/building/UrlSource.java | 32 ++-
.../artifact/resolver/DefaultArtifactResolver.java | 14 +-
.../maven/profiles/DefaultProfileManager.java | 19 +-
.../java/org/apache/maven/project/ModelUtils.java | 8 +-
.../DefaultModelInheritanceAssembler.java | 10 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +-
.../metadata/DefaultClasspathTransformation.java | 30 +--
.../maven/repository/metadata/MetadataGraph.java | 14 +-
.../AbstractArtifactComponentTestCase.java | 3 +-
.../resolver/filter/AndArtifactFilterTest.java | 10 +-
.../resolver/filter/OrArtifactFilterTest.java | 10 +-
.../maven/artifact/testutils/TestFileManager.java | 10 +-
.../maven/repository/legacy/StringWagon.java | 11 +-
.../resolver/DefaultArtifactCollectorTest.java | 20 +-
maven-core/pom.xml | 37 +---
.../apache/maven/DuplicateProjectException.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 8 +-
.../metadata/AbstractRepositoryMetadata.java | 3 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +-
.../maven/classrealm/DefaultClassRealmManager.java | 5 +-
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../execution/DefaultMavenExecutionResult.java | 4 +-
.../org/apache/maven/execution/ReactorManager.java | 19 +-
.../scope/internal/MojoExecutionScope.java | 47 ++---
.../graph/FilteredProjectDependencyGraph.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 4 +-
.../internal/DefaultLifecycleMappingDelegate.java | 8 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 11 +-
.../lifecycle/internal/DependencyContext.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 3 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 15 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 2 +-
.../plugin/internal/DefaultMavenPluginManager.java | 10 +-
.../PluginDependencyResolutionListener.java | 10 +-
.../version/PluginVersionResolutionException.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 12 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../org/apache/maven/project/ProjectSorter.java | 8 +-
.../apache/maven/project/ReactorModelCache.java | 78 ++++++-
.../artifact/DefaultMavenMetadataCache.java | 8 +-
.../maven/repository/ArtifactTransferEvent.java | 5 +-
.../maven/session/scope/internal/SessionScope.java | 47 ++---
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 17 +-
.../building/DefaultToolchainsBuildingResult.java | 2 +-
.../artifact/handler/ArtifactHandlerTest.java | 1 -
.../configuration/DefaultBeanConfiguratorTest.java | 20 +-
.../scope/internal/MojoExecutionScopeTest.java | 20 +-
.../lifecycle/internal/BuilderCommonTest.java | 3 +-
.../internal/LifecycleDependencyResolverTest.java | 10 +-
.../internal/stub/CompletionServiceStub.java | 2 +-
.../internal/stub/DefaultLifecyclesStub.java | 1 -
.../lifecycle/internal/stub/MojoExecutorStub.java | 2 +-
.../project/ExtensionDescriptorBuilderTest.java | 11 +-
.../apache/maven/project/ProjectBuilderTest.java | 20 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 8 +-
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../transfer/AbstractMavenTransferListener.java | 2 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../maven/model/building/ArtifactModelSource.java | 27 ++-
.../maven/model/building/DefaultModelBuilder.java | 225 +++++++++++++++------
.../maven/model/building/FileModelSource.java | 9 +-
.../model/building/ModelBuildingEventCatapult.java | 9 +-
.../apache/maven/model/building/ModelCache.java | 29 +++
.../apache/maven/model/building/ModelCacheTag.java | 26 +++
.../interpolation/ProblemDetectingValueSource.java | 1 -
.../StringSearchModelInterpolator.java | 32 ++-
.../StringVisitorModelInterpolator.java | 32 ++-
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../StringSearchModelInterpolatorTest.java | 20 +-
.../internal/DefaultArtifactDescriptorReader.java | 7 +-
.../repository/internal/DefaultModelResolver.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
.../settings/building/DefaultSettingsBuilder.java | 17 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../building/DefaultSettingsProblemCollector.java | 2 +-
.../crypto/DefaultSettingsDecryptionResult.java | 6 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 10 +-
pom.xml | 6 +-
97 files changed, 688 insertions(+), 624 deletions(-)
rename apache-maven/src/main/appended-resources/licenses/{ASL-2.0.txt => Apache-2.0.txt} (100%)
copy maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (69%)
[maven] 01/01: [MNG-6828] Make DependencyResolutionResult transient
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6828
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 963bc54b3d645cdaeb7bf60b7fb33032227b858e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Jan 1 16:37:10 2020 +0100
[MNG-6828] Make DependencyResolutionResult transient
---
.../java/org/apache/maven/project/DependencyResolutionException.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java
index 50e601e..ecd0151 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java
@@ -26,7 +26,7 @@ public class DependencyResolutionException
extends Exception
{
- private DependencyResolutionResult result;
+ private final transient DependencyResolutionResult result;
public DependencyResolutionException( DependencyResolutionResult result, String message, Throwable cause )
{