This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch explicit-module-path
in repository https://gitbox.apache.org/repos/asf/maven.git
discard eafb3d1e8a Small cleanup
discard b4caaeb25d [MNG-8015] Control the type of path where each dependency
can be placed
add 70509586f8 [MNG-8046] Upgrade github action version from v3 to v4
(#1405)
add 0c529f830a [MNG-8053] Profile activation by packaging in the POM
(#1410)
add 972b074656 [MNG-8039] Don't change resolved artifact by
DefaultProjectBuilder
add 7b60c8d7dc [MNG-8054] Ability to force build number (#1414)
add 54c1b2f28a [MNG-8029] improve documentation about mirror settings
add 969a6ffbb2 Move API first (as needed by other modules)
add ff5fa9e4e5 [MNG-8057] Upgrade Modello to 2.3.0 (#1418)
add a31c145ae9 [MNG-8006] Switch property contributors to use a lazy
lookup (#1419)
add cf438ca624 [MNG-8059] Paths everywhere (#1413)
add 83949a7384 Use isEmpty instead of length (#1420)
add ab6ec5bd74 [MNG-7976] Investigate MNG-6127 IT instability (#1422)
add cf60940497 [MNG-5726] Support regular expression matching in profile
activation for (#1421)
add 3c2f8ebdb7 Use v4 api to resolve project dependencies (#1409)
add 5307bcba09 Use SessionData to store ProjectIndex (#1423)
add ce15193394 Fix concurrent cache access (#1425)
add a9934f91fd Extract JLine support into its own module (#1426)
add 24eee1f8e6 Add a SpiService marker interface (#1427)
add 456890d40b Missing annotations on api (#1428)
add a3e8da805c Make LifecycleStarter pluggable (#1424)
add a27873629f [MNG-8024] Make WrapperProperties and WrapperList
serializable (#1433)
add 0c8a124b64 [MNG-8015] Control the type of path where each dependency
can be placed
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 (eafb3d1e8a)
\
N -- N -- N refs/heads/explicit-module-path (0c8a124b64)
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.
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 12 +-
.github/workflows/maven_build_itself.yml | 4 +-
apache-maven/src/site/site.xml | 5 -
.../main/java/org/apache/maven/api/Dependency.java | 8 ++
.../java/org/apache/maven/api/ExtensibleEnum.java | 4 +
.../java/org/apache/maven/api/MojoExecution.java | 2 +
.../main/java/org/apache/maven/api/PathType.java | 29 +++++
.../src/main/java/org/apache/maven/api/Plugin.java | 2 +
.../org/apache/maven/api/RemoteRepository.java | 2 +
.../main/java/org/apache/maven/api/Service.java | 1 +
.../main/java/org/apache/maven/api/Session.java | 60 ++++++++-
.../java/org/apache/maven/api/SessionData.java | 59 ++++++++-
.../apache/maven/api/plugin/LifecycleProvider.java | 2 +
.../main/java/org/apache/maven/api/plugin/Log.java | 2 +
.../maven/api/services/ExtensibleEnumRegistry.java | 5 +-
.../maven/api/services/ProjectScopeRegistry.java | 4 +
.../apache/maven/api/services/SettingsBuilder.java | 4 +
.../maven/api/services/SettingsBuilderResult.java | 6 +
.../maven/api/services/SuperPomProvider.java | 2 +
.../maven/api/services/ToolchainsBuilder.java | 2 +
.../api/services/ToolchainsBuilderRequest.java | 6 +
.../api/services/ToolchainsBuilderResult.java | 6 +
.../maven/api/services/VersionRangeResolver.java | 2 +
.../api/services/VersionRangeResolverRequest.java | 4 +
.../api/services/VersionRangeResolverResult.java | 4 +
.../apache/maven/api/services/VersionResolver.java | 2 +
.../maven/api/services/VersionResolverRequest.java | 4 +
.../maven/api/services/VersionResolverResult.java | 4 +
.../org/apache/maven/api/annotations/Consumer.java | 2 +-
api/maven-api-model/src/main/mdo/maven.mdo | 33 +++++
api/maven-api-settings/src/main/mdo/settings.mdo | 27 +++-
.../maven/api/spi/ExtensibleEnumProvider.java | 18 ++-
.../org/apache/maven/api/spi/LanguageProvider.java | 7 ++
.../java/org/apache/maven/api/spi/ModelParser.java | 7 +-
.../apache/maven/api/spi/PathScopeProvider.java | 7 ++
.../apache/maven/api/spi/ProjectScopeProvider.java | 7 ++
.../apache/maven/api/spi/PropertyContributor.java | 6 +-
.../java/org/apache/maven/api/spi/SpiService.java} | 8 +-
.../org/apache/maven/api/spi/TypeProvider.java | 7 ++
.../maven/artifact/versioning/VersionRange.java | 8 +-
maven-artifact/src/site/site.xml | 3 -
.../org/apache/maven/building/DefaultProblem.java | 4 +-
.../maven/building/DefaultProblemCollector.java | 2 +-
.../java/org/apache/maven/building/FileSource.java | 39 ++++--
.../java/org/apache/maven/building/UrlSource.java | 2 +-
maven-builder-support/src/site/site.xml | 3 -
.../org/apache/maven/building/FileSourceTest.java | 4 +-
.../repository/LegacyLocalRepositoryManager.java | 6 +-
.../repository/layout/FlatRepositoryLayout.java | 2 +-
.../repository/metadata/MetadataBridge.java | 6 +
.../maven/project/path/DefaultPathTranslator.java | 2 +-
.../maven/repository/legacy/MavenArtifact.java | 2 +-
maven-compat/src/site/site.xml | 3 -
.../maven/project/ClasspathArtifactResolver.java | 3 +-
.../project/LegacyLocalRepositoryManager.java | 8 +-
.../main/java/org/apache/maven/DefaultMaven.java | 7 +-
.../java/org/apache/maven/RepositoryUtils.java | 13 +-
.../repository/layout/DefaultRepositoryLayout.java | 2 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 11 +-
.../internal/EnhancedConfigurationConverter.java | 4 +-
.../DefaultRepositorySystemSessionFactory.java | 26 ++--
.../aether/PropertyContributorExtender.java | 22 ++--
.../maven/internal/impl/AbstractSession.java | 2 +-
.../internal/impl/DefaultDependencyCollector.java | 43 ++++---
.../internal/impl/DefaultDependencyResolver.java | 68 +---------
.../impl/DefaultDependencyResolverResult.java | 2 +-
.../apache/maven/internal/impl/DefaultProject.java | 3 +-
.../apache/maven/internal/impl/DefaultSession.java | 14 ++-
.../internal/impl/PathModularizationCache.java | 2 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 3 +-
...leStarter.java => DefaultLifecycleStarter.java} | 13 +-
.../internal/LifecycleDependencyResolver.java | 31 ++---
.../lifecycle/internal/LifecycleModuleBuilder.java | 2 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 116 +----------------
.../maven/lifecycle/internal/MojoExecutor.java | 46 ++++---
.../maven/lifecycle/internal/ReactorContext.java | 8 --
.../lifecycle/mapping/DefaultLifecycleMapping.java | 2 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 31 ++---
.../plugin/internal/DefaultMavenPluginManager.java | 6 +
.../maven/project/DefaultProjectBuilder.java | 2 +-
.../maven/project/ExtensionDescriptorBuilder.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../artifact/DefaultProjectArtifactsCache.java | 4 +-
.../org/apache/maven/settings/SettingsUtils.java | 15 +--
.../org/apache/maven/settings/SettingsUtilsV4.java | 4 +
maven-core/src/site/site.xml | 6 -
.../org/apache/maven/internal/impl/TestApi.java | 14 ++-
.../internal/LifecycleModuleBuilderTest.java | 4 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 7 +-
.../project/LegacyLocalRepositoryManager.java | 8 +-
.../maven/repository/TestRepositoryConnector.java | 2 +-
.../internal/DefaultRuntimeInformationTest.java | 2 +-
.../apache/maven/settings/SettingsUtilsTest.java | 2 +
maven-embedder/pom.xml | 4 +
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 4 +-
.../src/main/java/org/fusesource/jansi/Ansi.java | 2 +-
maven-embedder/src/site/site.xml | 7 --
.../java/org/apache/maven/cli/MavenCliTest.java | 2 +-
.../maven/cli/event/ExecutionEventLoggerTest.java | 4 +-
.../transfer/ConsoleMavenTransferListenerTest.java | 2 +-
{maven-di => maven-jline}/pom.xml | 28 +++--
.../maven}/jline/JLineMessageBuilderFactory.java | 6 +-
.../java/org/apache/maven}/jline/MessageUtils.java | 2 +-
.../maven/model/building/ArtifactModelSource.java | 10 ++
.../maven/model/building/DefaultModelBuilder.java | 22 ++--
.../building/DefaultModelBuildingRequest.java | 24 +++-
.../model/building/DefaultModelProcessor.java | 29 +++--
.../building/DefaultTransformerContextBuilder.java | 20 ++-
.../maven/model/building/FileModelSource.java | 25 +++-
.../model/building/FilterModelBuildingRequest.java | 14 ++-
.../model/building/ModelBuildingException.java | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 29 ++++-
.../maven/model/building/ModelProblemUtils.java | 22 ++--
.../inheritance/DefaultInheritanceAssembler.java | 2 +-
.../AbstractStringBasedModelInterpolator.java | 36 +++---
.../model/interpolation/ModelInterpolator.java | 28 +++++
.../PathTranslatingPostProcessor.java | 6 +-
.../interpolation/ProblemDetectingValueSource.java | 2 +-
.../StringVisitorModelInterpolator.java | 8 ++
.../apache/maven/model/io/DefaultModelReader.java | 12 +-
.../apache/maven/model/io/DefaultModelWriter.java | 2 +-
.../org/apache/maven/model/io/ModelReader.java | 14 +++
.../maven/model/locator/DefaultModelLocator.java | 29 ++++-
.../apache/maven/model/locator/ModelLocator.java | 33 ++++-
.../model/path/DefaultModelPathTranslator.java | 14 ++-
.../maven/model/path/DefaultPathTranslator.java | 8 +-
.../maven/model/path/ModelPathTranslator.java | 14 +++
.../apache/maven/model/path/PathTranslator.java | 15 +++
.../activation/JdkVersionProfileActivator.java | 6 +-
.../OperatingSystemProfileActivator.java | 51 +++++---
.../activation/PackagingProfileActivator.java | 62 +++++++++
.../activation/PropertyProfileActivator.java | 2 +-
.../model/validation/DefaultModelValidator.java | 14 +--
.../src/main/java/org/apache/maven/utils/Os.java | 45 ++++---
maven-model-builder/src/site/site.xml | 7 --
.../AbstractModelInterpolatorTest.java | 19 +--
.../OperatingSystemProfileActivatorTest.java | 138 +++++++++++++++++++++
maven-model/src/site/site.xml | 3 -
.../org/apache/maven/model/SerializationTest.java | 14 +++
.../maven/plugin/descriptor/MojoDescriptor.java | 4 +-
maven-plugin-api/src/site/site.xml | 3 -
maven-repository-metadata/src/site/site.xml | 3 -
.../internal/ArtifactDescriptorReaderDelegate.java | 9 +-
.../internal/DefaultArtifactDescriptorReader.java | 4 +-
.../repository/internal/DefaultModelResolver.java | 2 +-
.../internal/DefaultVersionRangeResolver.java | 5 +-
.../internal/DefaultVersionResolver.java | 11 +-
.../repository/internal/LocalSnapshotMetadata.java | 15 ++-
.../internal/LocalSnapshotMetadataGenerator.java | 2 +-
.../maven/repository/internal/MavenMetadata.java | 42 +++++--
.../internal/MavenSessionBuilderSupplier.java | 8 +-
.../repository/internal/MavenSnapshotMetadata.java | 6 +-
.../maven/repository/internal/PluginsMetadata.java | 15 ++-
.../internal/PluginsMetadataGenerator.java | 4 +-
.../repository/internal/RelocatedArtifact.java | 20 ++-
.../internal/RemoteSnapshotMetadata.java | 21 +++-
.../internal/RemoteSnapshotMetadataGenerator.java | 12 +-
.../repository/internal/VersionsMetadata.java | 15 ++-
.../internal/artifact/MavenArtifactProperties.java | 8 ++
.../internal/scopes/MavenSystemScopeHandler.java | 52 +++-----
maven-resolver-provider/src/site/site.xml | 3 -
.../internal/RemoteSnapshotMetadataTest.java | 24 +++-
.../settings/building/DefaultSettingsBuilder.java | 2 +-
.../settings/building/DefaultSettingsProblem.java | 4 +-
.../validation/DefaultSettingsValidator.java | 2 +-
maven-settings-builder/src/site/site.xml | 3 -
maven-settings/src/site/apt/index.apt | 12 ++
maven-settings/src/site/site.xml | 3 -
maven-slf4j-provider/pom.xml | 2 +-
.../org/apache/maven/slf4j/MavenSimpleLogger.java | 23 +++-
.../java/org/slf4j/simple/ExtSimpleLogger.java | 26 ++--
maven-slf4j-provider/src/site/site.xml | 3 -
.../apache/maven/slf4j/MavenSimpleLoggerTest.java | 2 +-
maven-xml-impl/pom.xml | 2 +-
pom.xml | 12 +-
src/mdo/java/WrapperList.java | 8 +-
src/mdo/java/WrapperProperties.java | 7 ++
src/site/site.xml | 11 +-
180 files changed, 1512 insertions(+), 768 deletions(-)
copy
api/{maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
=> maven-api-spi/src/main/java/org/apache/maven/api/spi/SpiService.java} (86%)
copy
maven-core/src/main/java/org/apache/maven/lifecycle/internal/{LifecycleStarter.java
=> DefaultLifecycleStarter.java} (93%)
copy {maven-di => maven-jline}/pom.xml (69%)
rename {maven-embedder/src/main/java/org/apache/maven/cli =>
maven-jline/src/main/java/org/apache/maven}/jline/JLineMessageBuilderFactory.java
(98%)
rename {maven-embedder/src/main/java/org/apache/maven/cli =>
maven-jline/src/main/java/org/apache/maven}/jline/MessageUtils.java (98%)
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java
copy
maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
=>
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenSystemScopeHandler.java
(50%)
copy
maven-core/src/main/java/org/apache/maven/project/CycleDetectedException.java
=> maven-slf4j-provider/src/main/java/org/slf4j/simple/ExtSimpleLogger.java
(65%)
