This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6512-build-11
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 3a48540 [MNG-6512] PoC - set minimum JDK to 11 to test
compilation/test problems
add 11b8b2d [MNG-6824] ModelMerger is broken Fix modules Apply Java 8
Functions
add 1ad7801 [MNG-6827] Replace deprecated StringUtils#defaultString()
from Plexus Utils
add e3aa406 [MNG-6824] ModelMerger is broken Fixing reportSet.reports,
mailingList.otherArchives, contributor.roles, build.filters, execution.goals,
patternSet.includes, patternSet.excludes
add d251074 [MNG-6065] Create option --fail-on-severity
add 25de698 Removed JDK7 related configuration.
add e48c067 Moved org.slf4j.impl.MavenLoggerFactoryTest to the correct
submodule
add 08397c2 [MNG-6065] Moved org.slf4j.impl.MavenLoggerFactoryTest to the
correct submodule
add 5553ff0 [MNG-5982] Pass user properties to ModelBuildingRequest
add 6d63038 Revert "[MNG-5982] Pass user properties to
ModelBuildingRequest"
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 c89941a Bump maven-parent from 33 to 34
new b0e6837 [MNG-6512] PoC - set minimum JDK to 11 to test
compilation/test problems
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 (3a48540)
\
N -- N -- N refs/heads/MNG-6512-build-11 (b0e6837)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 5 +-
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 | 13 +-
.../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/DefaultLifecycleBindingsInjector.java | 6 +-
.../plugin/internal/DefaultMavenPluginManager.java | 10 +-
.../DefaultPluginDependenciesResolver.java | 11 +-
.../PluginDependencyResolutionListener.java | 10 +-
.../version/PluginVersionResolutionException.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 12 +-
.../DefaultProjectDependenciesResolver.java | 11 +-
.../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 +-
maven-embedder/pom.xml | 8 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 5 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 30 +-
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../maven/cli/event/ExecutionEventLogger.java | 28 +-
.../transfer/AbstractMavenTransferListener.java | 2 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../META-INF/maven/slf4j-configuration.properties | 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 ++
.../inheritance/DefaultInheritanceAssembler.java | 8 +-
.../interpolation/ProblemDetectingValueSource.java | 1 -
.../StringSearchModelInterpolator.java | 32 +-
.../StringVisitorModelInterpolator.java | 32 +-
.../DefaultDependencyManagementInjector.java | 4 +-
.../DefaultPluginManagementInjector.java | 8 +-
.../apache/maven/model/merge/MavenModelMerger.java | 48 +--
.../model/profile/DefaultProfileInjector.java | 16 +-
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../model/validation/DefaultModelValidator.java | 7 +-
.../StringSearchModelInterpolatorTest.java | 20 +-
maven-model/pom.xml | 5 +
.../org/apache/maven/model/merge/ModelMerger.java | 408 +++++--------------
.../apache/maven/model/merge/ModelMergerTest.java | 430 +++++++++++++++++++++
.../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 +-
maven-slf4j-provider/pom.xml | 4 +
.../org/slf4j/impl/MavenFailOnSeverityLogger.java | 142 +++++++
...eLoggerFactory.java => MavenLoggerFactory.java} | 43 ++-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 24 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 4 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 90 +++++
.../pom.xml | 18 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 41 +-
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 17 +-
.../src/site/site.xml | 0
.../maven/logwrapper/LogLevelRecorderTest.java | 37 +-
pom.xml | 26 +-
122 files changed, 1696 insertions(+), 1073 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%)
create mode 100644
maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
create mode 100644
maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenFailOnSeverityLogger.java
rename
maven-slf4j-provider/src/main/java/org/slf4j/impl/{MavenSimpleLoggerFactory.java
=> MavenLoggerFactory.java} (52%)
create mode 100644
maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java
copy {maven-builder-support => maven-slf4j-wrapper}/pom.xml (69%)
copy
maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
=>
maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java
(52%)
copy
maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
=>
maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/MavenSlf4jWrapperFactory.java
(70%)
copy {maven-slf4j-provider => maven-slf4j-wrapper}/src/site/site.xml (100%)
copy
maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
=>
maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java
(55%)
