This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit 06cfd2f [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
add 3709e2e Improve README
add 538de4d [MNG-6888] Remove deprecated command line options
add 94612f9 [MNG-7060] Let build fail fast in case any maven-gpg-plugin
goal is called
add 6e82d87 [MNG-7064] Use HTTPS for schema location in global
settings.xml
add a2d29b2 [MNG-7065] Ugrade global settings.xml to 1.1.0
add 2201698 Apply consistent log argument quoting for sigle- and
multi-valued args
add a6d5e86 Use consistent static final loggers
add e1e2c65 Fix Javadoc errors
add a0c1bf3 Fix checkstyle error
add b877445 [MNG-6909] Convert to JSR330 in tests - maven-core
add 0e34b35 [MNG-6909] Convert to JSR330 in tests - maven-compat
add b7510d6 [MNG-6909] Convert to JSR330 - use sisu plugin
add 9166805 [MNG-6967] Improve the command line output from
maven-artifact. - Clearly separate version from tokens in command line output.
add eb43b9b Fix Checkstyle violation.
add 83dc690 [MNG-7071] Remove the profiles.xml warning, since the
functionality is ignored since Maven 3.
add bb916d0 [MNG-7035] Migrate unit tests to Unit 5
add ceb08cf Test for empty locations and avoid printing them
add 8df10f9 Test for empty value and avoid needless space
add 8defd16 [MNG-7051] Optionally skip non-existing profiles and break on
missing required profiles.
add 1e575a2 [MNG-7068] Active dependency management for Google Guice/Guava
add eae3074 [MNG-7029] Remove super POM release profile
new a9a30f8 [MNG-7020] Remove Maven 2 WagonExcluder backward compat 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 (06cfd2f)
\
N -- N -- N refs/heads/MNG-7020 (a9a30f8)
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:
README.md | 10 +-
apache-maven/src/assembly/maven/conf/settings.xml | 4 +-
.../apache/maven/settings/GlobalSettingsTest.java | 12 +-
.../artifact/versioning/ComparableVersion.java | 3 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 8 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 23 +-
.../artifact/versioning/ComparableVersionIT.java | 12 +-
.../artifact/versioning/ComparableVersionTest.java | 41 +-
.../versioning/DefaultArtifactVersionTest.java | 62 +-
.../artifact/versioning/VersionRangeTest.java | 655 +++++++++++----------
.../org/apache/maven/building/DefaultProblem.java | 8 +-
.../building/DefaultProblemCollectorTest.java | 7 +-
.../apache/maven/building/DefaultProblemTest.java | 8 +-
.../org/apache/maven/building/FileSourceTest.java | 22 +-
.../building/ProblemCollectorFactoryTest.java | 8 +-
.../apache/maven/building/StringSourceTest.java | 6 +-
.../org/apache/maven/building/UrlSourceTest.java | 22 +-
maven-compat/pom.xml | 5 +
.../AbstractArtifactComponentTestCase.java | 92 +--
.../artifact/deployer/ArtifactDeployerTest.java | 17 +-
.../deployer/SimpleArtifactMetadataSource.java | 13 +-
.../factory/DefaultArtifactFactoryTest.java | 23 +-
.../artifact/installer/ArtifactInstallerTest.java | 14 +-
.../artifact/metadata/TestMetadataSource.java | 11 +-
.../repository/MavenArtifactRepositoryTest.java | 7 +-
.../resolver/ArtifactResolutionExceptionTest.java | 6 +-
.../artifact/resolver/ArtifactResolverTest.java | 55 +-
.../resolver/DefaultArtifactResolverTest.java | 26 +-
.../resolver/filter/AndArtifactFilterTest.java | 8 +-
.../resolver/filter/FilterHashEqualsTest.java | 6 +-
.../resolver/filter/OrArtifactFilterTest.java | 8 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 10 +-
.../maven/artifact/testutils/TestFileManager.java | 11 +-
.../transform/TransformationManagerTest.java | 32 +-
.../manager/DefaultProfileManagerTest.java | 21 +-
.../project/AbstractMavenProjectTestCase.java | 27 +-
.../maven/project/ClasspathArtifactResolver.java | 7 +-
.../org/apache/maven/project/ModelUtilsTest.java | 30 +-
.../apache/maven/project/ProjectClasspathTest.java | 54 +-
.../apache/maven/project/TestArtifactResolver.java | 16 +-
.../maven/project/TestMavenRepositorySystem.java | 14 +-
.../apache/maven/project/TestProjectBuilder.java | 7 +-
.../inheritance/t00/ProjectInheritanceTest.java | 4 +
.../inheritance/t01/ProjectInheritanceTest.java | 4 +
.../inheritance/t02/ProjectInheritanceTest.java | 45 +-
.../inheritance/t03/ProjectInheritanceTest.java | 4 +
.../inheritance/t04/ProjectInheritanceTest.java | 16 +-
.../inheritance/t05/ProjectInheritanceTest.java | 14 +-
.../inheritance/t06/ProjectInheritanceTest.java | 16 +-
.../inheritance/t07/ProjectInheritanceTest.java | 19 +-
.../inheritance/t08/ProjectInheritanceTest.java | 15 +-
.../inheritance/t09/ProjectInheritanceTest.java | 36 +-
.../inheritance/t10/ProjectInheritanceTest.java | 18 +-
.../inheritance/t11/ProjectInheritanceTest.java | 9 +-
.../inheritance/t12/ProjectInheritanceTest.java | 7 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 5 +
.../project/path/DefaultPathTranslatorTest.java | 7 +-
.../repository/DefaultMirrorSelectorTest.java | 11 +-
.../repository/LegacyRepositorySystemTest.java | 45 +-
.../maven/repository/MirrorProcessorTest.java | 42 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 26 +-
.../repository/legacy/DefaultWagonManagerTest.java | 187 ++----
.../legacy/LegacyRepositorySystemTest.java | 40 +-
.../maven/repository/legacy/PerLookupWagon.java | 6 +-
.../maven/repository/legacy/StringWagon.java | 8 +-
.../org/apache/maven/repository/legacy/WagonA.java | 9 +-
.../org/apache/maven/repository/legacy/WagonB.java | 9 +-
.../org/apache/maven/repository/legacy/WagonC.java | 9 +-
.../resolver/DefaultArtifactCollectorTest.java | 281 ++++-----
.../conflict/AbstractConflictResolverTest.java | 40 +-
.../conflict/FarthestConflictResolverTest.java | 5 +
.../conflict/NearestConflictResolverTest.java | 5 +
.../conflict/NewestConflictResolverTest.java | 5 +
.../conflict/OldestConflictResolverTest.java | 5 +
.../DefaultClasspathTransformationTest.java | 45 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 29 +-
.../metadata/DefaultGraphConflictResolverTest.java | 91 +--
.../repository/metadata/TestMetadataSource.java | 17 +-
maven-core/pom.xml | 18 +
.../main/java/org/apache/maven/DefaultMaven.java | 142 ++++-
...xception.java => MissingProfilesException.java} | 11 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../execution/DefaultMavenExecutionRequest.java | 36 +-
.../maven/execution/MavenExecutionRequest.java | 40 ++
.../apache/maven/execution/ProfileActivation.java | 201 +++++++
.../apache/maven/graph/DefaultGraphBuilder.java | 2 +-
.../lifecycle/internal/builder/BuilderCommon.java | 22 +-
.../maven/project/DefaultProjectBuilder.java | 37 --
.../org/apache/maven/project/MavenProject.java | 11 +-
.../maven/project/ProjectBuildingException.java | 8 +-
.../project/collector/DefaultProjectsSelector.java | 2 +-
.../collector/MultiModuleCollectionStrategy.java | 14 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 26 +-
.../java/org/apache/maven/DefaultMavenTest.java | 52 +-
.../maven/MavenLifecycleParticipantTest.java | 10 +-
.../src/test/java/org/apache/maven/MavenTest.java | 30 +-
.../maven/ProjectDependenciesResolverTest.java | 31 +-
.../artifact/handler/ArtifactHandlerTest.java | 20 +-
.../filter/ExclusionArtifactFilterTest.java | 8 +-
.../configuration/DefaultBeanConfiguratorTest.java | 21 +-
.../exception/DefaultExceptionHandlerTest.java | 4 +-
.../DefaultBuildResumptionAnalyzerTest.java | 6 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 5 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 8 +-
.../maven/execution/DefaultMavenExecutionTest.java | 8 +-
.../scope/internal/MojoExecutionScopeTest.java | 20 +-
.../maven/graph/DefaultGraphBuilderTest.java | 50 +-
.../graph/DefaultProjectDependencyGraphTest.java | 17 +-
.../aether/ConsumerModelSourceTransformerTest.java | 2 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 50 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 50 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 90 ++-
.../maven/lifecycle/MavenExecutionPlanTest.java | 12 +-
.../internal/BuildListCalculatorTest.java | 13 +-
.../lifecycle/internal/BuilderCommonTest.java | 14 +-
.../internal/ConcurrencyDependencyGraphTest.java | 17 +-
.../internal/LifecycleDependencyResolverTest.java | 18 +-
.../LifecycleExecutionPlanCalculatorTest.java | 4 +
.../LifecycleTaskSegmentCalculatorImplTest.java | 13 +-
.../lifecycle/internal/PhaseRecorderTest.java | 9 +-
.../lifecycle/internal/ProjectBuildListTest.java | 6 +-
.../ConcurrencyDependencyGraphTest.java | 11 +-
.../multithreaded/ThreadOutputMuxerTest.java | 33 +-
.../stub/ProjectDependencyGraphStubTest.java | 24 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 8 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 38 +-
.../maven/plugin/PluginParameterExceptionTest.java | 8 +-
.../PluginParameterExpressionEvaluatorTest.java | 62 +-
.../plugin/internal/DefaultLegacySupportTest.java | 9 +-
.../project/AbstractMavenProjectTestCase.java | 31 +-
.../project/DefaultMavenProjectBuilderTest.java | 172 +++---
.../project/ExtensionDescriptorBuilderTest.java | 29 +-
.../org/apache/maven/project/MavenProjectTest.java | 59 +-
.../apache/maven/project/PomConstructionTest.java | 254 +++++---
.../apache/maven/project/ProjectBuilderTest.java | 31 +-
.../maven/project/ProjectModelResolverTest.java | 120 ++--
.../apache/maven/project/ProjectSorterTest.java | 20 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 17 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 15 +-
.../project/artifact/MavenMetadataSourceTest.java | 37 +-
.../canonical/CanonicalProjectBuilderTest.java | 5 +
.../internal/DefaultRuntimeInformationTest.java | 60 +-
.../settings/PomConstructionWithSettingsTest.java | 45 +-
.../apache/maven/settings/SettingsUtilsTest.java | 10 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +-
.../toolchain/DefaultToolchainManagerTest.java | 8 +-
.../maven/toolchain/DefaultToolchainTest.java | 12 +-
.../toolchain/RequirementMatcherFactoryTest.java | 14 +-
.../building/DefaultToolchainsBuilderTest.java | 10 +-
.../building/ToolchainsBuildingExceptionTest.java | 4 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 4 +-
.../test-pom-and-settings-interpolation/pom.xml | 4 +-
maven-embedder/pom.xml | 30 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 6 -
.../main/java/org/apache/maven/cli/MavenCli.java | 103 ++--
.../SettingsXmlConfigurationProcessor.java | 16 +-
.../maven/cli/event/ExecutionEventLogger.java | 2 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 6 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 8 +-
.../maven/cli/CLIManagerDocumentationTest.java | 5 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 10 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 6 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 4 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 119 ++--
.../maven/cli/event/ExecutionEventLoggerTest.java | 10 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 17 +-
maven-model-builder/pom.xml | 14 +-
.../java/org/apache/maven/feature/Features.java | 10 +-
.../maven/model/building/DefaultModelProblem.java | 7 +-
.../model/building/ModelBuildingException.java | 8 +-
.../apache/maven/model/building/ModelProblem.java | 3 +-
.../model/validation/DefaultModelValidator.java | 2 +
.../resources/org/apache/maven/model/pom-4.0.0.xml | 50 --
.../model/building/ComplexActivationTest.java | 10 +-
.../building/DefaultModelBuilderFactoryTest.java | 6 +-
.../model/building/DefaultModelBuilderTest.java | 6 +-
.../maven/model/building/FileModelSourceTest.java | 12 +-
.../model/building/FileToRawModelMergerTest.java | 8 +-
.../model/building/SimpleProblemCollector.java | 1 -
.../DefaultInheritanceAssemblerTest.java | 71 ++-
.../AbstractModelInterpolatorTest.java | 42 +-
.../interpolation/MavenBuildTimestampTest.java | 8 +-
.../StringSearchModelInterpolatorTest.java | 37 +-
.../StringVisitorModelInterpolatorTest.java | 9 +-
.../maven/model/merge/MavenModelMergerTest.java | 8 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 6 +-
.../activation/AbstractProfileActivatorTest.java | 24 +-
.../activation/JdkVersionProfileActivatorTest.java | 8 +
.../activation/PropertyProfileActivatorTest.java | 11 +
.../validation/DefaultModelValidatorTest.java | 101 +++-
...anagement-status.xml => invalid-profile-id.xml} | 17 +-
.../org/apache/maven/model/ActivationFileTest.java | 11 +-
.../org/apache/maven/model/ActivationOSTest.java | 11 +-
.../apache/maven/model/ActivationPropertyTest.java | 11 +-
.../org/apache/maven/model/ActivationTest.java | 11 +-
.../java/org/apache/maven/model/BuildTest.java | 11 +-
.../org/apache/maven/model/CiManagementTest.java | 11 +-
.../org/apache/maven/model/ContributorTest.java | 11 +-
.../maven/model/DependencyManagementTest.java | 11 +-
.../org/apache/maven/model/DependencyTest.java | 11 +-
.../maven/model/DeploymentRepositoryTest.java | 11 +-
.../java/org/apache/maven/model/DeveloperTest.java | 11 +-
.../maven/model/DistributionManagementTest.java | 11 +-
.../java/org/apache/maven/model/ExclusionTest.java | 11 +-
.../java/org/apache/maven/model/ExtensionTest.java | 11 +-
.../apache/maven/model/IssueManagementTest.java | 11 +-
.../java/org/apache/maven/model/LicenseTest.java | 11 +-
.../org/apache/maven/model/MailingListTest.java | 11 +-
.../java/org/apache/maven/model/ModelTest.java | 11 +-
.../java/org/apache/maven/model/NotifierTest.java | 11 +-
.../org/apache/maven/model/OrganizationTest.java | 11 +-
.../java/org/apache/maven/model/ParentTest.java | 11 +-
.../maven/model/PluginConfigurationTest.java | 11 +-
.../apache/maven/model/PluginContainerTest.java | 11 +-
.../apache/maven/model/PluginExecutionTest.java | 11 +-
.../apache/maven/model/PluginManagementTest.java | 11 +-
.../java/org/apache/maven/model/PluginTest.java | 11 +-
.../org/apache/maven/model/PrerequisitesTest.java | 11 +-
.../java/org/apache/maven/model/ProfileTest.java | 11 +-
.../org/apache/maven/model/RelocationTest.java | 11 +-
.../org/apache/maven/model/ReportPluginTest.java | 11 +-
.../java/org/apache/maven/model/ReportSetTest.java | 11 +-
.../java/org/apache/maven/model/ReportingTest.java | 11 +-
.../apache/maven/model/RepositoryPolicyTest.java | 11 +-
.../org/apache/maven/model/RepositoryTest.java | 11 +-
.../java/org/apache/maven/model/ResourceTest.java | 11 +-
.../test/java/org/apache/maven/model/ScmTest.java | 11 +-
.../test/java/org/apache/maven/model/SiteTest.java | 11 +-
.../apache/maven/model/merge/ModelMergerTest.java | 5 +-
.../descriptor/PluginDescriptorBuilderTest.java | 6 +-
maven-resolver-provider/pom.xml | 19 +
.../internal/AbstractRepositoryTestCase.java | 30 +-
.../DefaultArtifactDescriptorReaderTest.java | 15 +-
.../internal/DefaultModelResolverTest.java | 117 ++--
.../internal/DefaultVersionResolverTest.java | 30 +-
.../internal/MavenRepositorySystemUtilsTest.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 17 +-
.../repository/internal/RepositorySystemTest.java | 20 +-
.../settings/building/DefaultSettingsProblem.java | 7 +-
.../building/SettingsBuildingException.java | 8 +-
.../DefaultSettingsBuilderFactoryTest.java | 6 +-
.../validation/DefaultSettingsValidatorTest.java | 31 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 20 +-
maven-slf4j-wrapper/pom.xml | 5 +
.../maven/logwrapper/LogLevelRecorderTest.java | 10 +-
.../pom.xml | 71 +--
.../main/java/org/apache/maven/test/Parameter.java | 13 +-
.../java/org/apache/maven/test/Parameterized.java | 23 +-
.../apache/maven/test/ParameterizedExtension.java | 182 ++++++
.../java/org/apache/maven/test/Parameters.java | 26 +-
.../java/org/apache/maven/test/PlexusTestCase.java | 325 ++++++++++
.../src/main/java/org/apache/maven/test/Test.java | 15 +-
.../org/apache/maven/wrapper/DownloaderTest.java | 19 +-
.../org/apache/maven/wrapper/InstallerTest.java | 24 +-
.../apache/maven/wrapper/PathAssemblerTest.java | 15 +-
.../apache/maven/wrapper/WrapperExecutorTest.java | 115 ++--
maven-xml/pom.xml | 5 +
.../main/java/org/apache/maven/xml/Factories.java | 5 +-
.../xml/sax/filter/AbstractEventXMLFilter.java | 2 -
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 1 -
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 4 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../apache/maven/xml/sax/SAXEventUtilsTest.java | 7 +-
.../maven/xml/sax/ext/CommentRenormalizerTest.java | 21 +-
.../xml/sax/filter/CiFriendlyXMLFilterTest.java | 9 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 2 +-
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 4 +-
.../sax/filter/ReactorDependencyXMLFilterTest.java | 2 +-
.../xml/sax/filter/RelativePathXMLFilterTest.java | 3 +-
pom.xml | 63 +-
271 files changed, 4391 insertions(+), 3040 deletions(-)
copy
maven-core/src/main/java/org/apache/maven/{lifecycle/internal/builder/BuilderNotFoundException.java
=> MissingProfilesException.java} (75%)
create mode 100644
maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
copy
maven-model-builder/src/test/resources/poms/validation/{distribution-management-status.xml
=> invalid-profile-id.xml} (75%)
copy {maven-model-builder => maven-test-support}/pom.xml (64%)
copy
maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
=> maven-test-support/src/main/java/org/apache/maven/test/Parameter.java (78%)
copy maven-core/src/main/java/org/apache/maven/SessionScoped.java =>
maven-test-support/src/main/java/org/apache/maven/test/Parameterized.java (66%)
create mode 100644
maven-test-support/src/main/java/org/apache/maven/test/ParameterizedExtension.java
copy
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
=> maven-test-support/src/main/java/org/apache/maven/test/Parameters.java (70%)
create mode 100644
maven-test-support/src/main/java/org/apache/maven/test/PlexusTestCase.java
copy
maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
=> maven-test-support/src/main/java/org/apache/maven/test/Test.java (77%)
