You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/03/10 07:27:05 UTC
[maven] branch MNG-7413 updated (9d663aa -> 23e1f5c)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7413
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit 9d663aa [MNG-7413] fix typo
omit ca01efa [MNG-7413] fix anchor for XML elements with same name but not content
add 2bb1228 [MNG-7407] Introduce a ModelVersionProcessor component to make CI Friendly Versions pluggable
add a5acd3e [MNG-7395] Support interpolation in extensions.xml
add 395411f [MNG-7417] Several classes do not set properties properly for building requests
add d29af90 [MNG-7402] BuildListCalculator never detaches the classloader
add 05e96da [MNG-5180] Versioning's snapshot version list is not included in metadata merge
add f0caf9c [MNG-6960] Use RuntimeInformation instead of reading properties
add 572d526 [MNG-7428] Upgrade Maven Parent to 35
add cfeea9d Remove unused imports
add 3599d34 [maven-release-plugin] prepare release maven-3.8.5
add 0a6f12f [maven-release-plugin] prepare for next development iteration
add 78ca83e Bump version to 3.9.0-SNAPSHOT
add 52b7186 [MNG-6399] Lift JDK minimum to JDK 8
add 453c173 [MNG-7247] Upgrade Maven Resolver to 1.7.2
add 6ddb751 Remove unnecessary plugin dependency
add e820dbb [MNG-6878] Upgrade Guice to 4.2.3
add e1b46e2 [MNG-7068] Active dependency management for Google Guice/Guava
add 7d6f281 [MNG-6826] Remove condition check for JDK8+ in FileSizeFormatTest
add 6b7beb4 [MNG-7019] Notify also at start when profile is missing
add a55300a [MNG-6972] Allow access to org.apache.maven.graph
add 1954d51 [MNG-7391] add execution strategy+runner required by Maven Build Cache
add 14ca723 [MNG-7350] Introduce a factory for ModelCache
new 7bfa92d [MNG-7413] fix anchor for XML elements with same name but not content
new 23e1f5c [MNG-7413] fix typo
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 (9d663aa)
\
N -- N -- N refs/heads/MNG-7413 (23e1f5c)
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:
apache-maven/pom.xml | 2 +-
...=> unrecognized-javax.annotation-api-1.3.2.txt} | 0
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 10 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../DefaultRepositorySystemSessionFactory.java | 31 +--
.../apache/maven/lifecycle/DefaultLifecycles.java | 5 +-
.../lifecycle/internal/BuildListCalculator.java | 16 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 24 +-
.../maven/lifecycle/internal/MojoExecutor.java | 25 +-
.../plugin/DefaultMojosExecutionStrategy.java | 24 +-
.../MojoExecutionRunner.java} | 23 +-
.../MojosExecutionStrategy.java} | 35 ++-
.../plugin/internal/DefaultMavenPluginManager.java | 15 ++
.../maven/project/DefaultProjectBuilder.java | 24 +-
.../project/artifact/MavenMetadataSource.java | 1 +
.../main/resources/META-INF/maven/extension.xml | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 7 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 8 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 13 +-
.../apache/maven/project/PomConstructionTest.java | 22 +-
maven-embedder/pom.xml | 60 ++---
.../internal/BootstrapCoreExtensionManager.java | 41 ++-
.../maven/cli/transfer/FileSizeFormatTest.java | 21 +-
maven-model-builder/pom.xml | 12 +-
.../model/building/DefaultModelBuilderFactory.java | 12 +-
.../AbstractStringBasedModelInterpolator.java | 32 +--
.../DefaultModelVersionProcessor.java | 69 +++++
.../ModelVersionProcessor.java} | 29 ++-
.../model/validation/DefaultModelValidator.java | 27 +-
.../StringSearchModelInterpolatorTest.java | 5 +-
.../validation/DefaultModelValidatorTest.java | 3 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 7 +-
.../src/main/mdo/metadata.mdo | 50 +++-
.../artifact/repository/metadata/MetadataTest.java | 290 +++++++++++++++++++++
maven-resolver-provider/pom.xml | 16 +-
.../internal/DefaultArtifactDescriptorReader.java | 31 ++-
.../internal/DefaultModelCacheFactory.java | 21 +-
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../repository/internal/MavenAetherModule.java | 80 ------
.../internal/MavenRepositorySystemUtils.java | 3 +
.../repository/internal/MavenResolverModule.java | 1 +
.../{package-info.java => ModelCacheFactory.java} | 18 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 76 ++++--
52 files changed, 813 insertions(+), 399 deletions(-)
rename apache-maven/src/main/appended-resources/licenses/{unrecognized-javax.annotation-api-1.2.txt => unrecognized-javax.annotation-api-1.3.2.txt} (100%)
copy maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java => maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java (60%)
copy maven-core/src/main/java/org/apache/maven/{lifecycle/NoGoalSpecifiedException.java => plugin/MojoExecutionRunner.java} (67%)
copy maven-core/src/main/java/org/apache/maven/{execution/ProjectExecutionListener.java => plugin/MojosExecutionStrategy.java} (52%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
copy maven-model-builder/src/main/java/org/apache/maven/model/{path/ModelUrlNormalizer.java => interpolation/ModelVersionProcessor.java} (55%)
create mode 100644 maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
copy maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java => maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java (70%)
delete mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
copy maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/{package-info.java => ModelCacheFactory.java} (77%)
[maven] 02/02: [MNG-7413] fix typo
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7413
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 23e1f5c2f206eacb6ec8f6d41d767beb16486bd1
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Feb 14 07:54:11 2022 +0100
[MNG-7413] fix typo
---
maven-model/src/main/mdo/maven.mdo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 115bcde..00bf3d5 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1941,7 +1941,7 @@
<name>DeploymentRepository</name>
<superClass>Repository</superClass>
<version>4.0.0+</version>
- <description>Deployment Repository contains the information needed for deploying to the remote
+ <description>Deployment repository contains the information needed for deploying to the remote
repository, which adds uniqueVersion property to usual repositories for download.</description>
<fields>
<field>
[maven] 01/02: [MNG-7413] fix anchor for XML elements with same name but not content
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7413
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7bfa92d2d63f9a6ae70d5c86e43d15b061e7b82e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Feb 13 17:49:56 2022 +0100
[MNG-7413] fix anchor for XML elements with same name but not content
---
maven-model/src/main/mdo/maven.mdo | 18 +++++++++---------
pom.xml | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 5242d30..115bcde 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -43,8 +43,8 @@
| definition of these types
|
-->
-<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd"
+<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
xml.namespace="http://maven.apache.org/POM/${version}"
xml.schemaLocation="https://maven.apache.org/xsd/maven-${version}.xsd">
<id>maven</id>
@@ -642,11 +642,11 @@
</field>
</fields>
</class>
- <class>
+ <class xdoc.anchorName="profile_build">
<name>BuildBase</name>
<version>3.0.0+</version>
<superClass>PluginConfiguration</superClass>
- <description>Generic informations for a build.</description>
+ <description>Build configuration in a profile.</description>
<fields>
<field>
<name>defaultGoal</name>
@@ -1937,12 +1937,12 @@
</fields>
</class>
- <class>
+ <class xdoc.anchorName="deployment_repository">
<name>DeploymentRepository</name>
<superClass>Repository</superClass>
<version>4.0.0+</version>
- <description>Repository contains the information needed for deploying to the remote
- repository.</description>
+ <description>Deployment Repository contains the information needed for deploying to the remote
+ repository, which adds uniqueVersion property to usual repositories for download.</description>
<fields>
<field>
<name>uniqueVersion</name>
@@ -2807,13 +2807,13 @@
</class>
-->
<!-- /BuildProfile support -->
- <class xml.tagName="plugin" java.clone="deep">
+ <class xml.tagName="plugin" xdoc.anchorName="report_plugin" java.clone="deep">
<name>ReportPlugin</name>
<version>4.0.0+</version>
<superClass>ConfigurationContainer</superClass>
<description>
<![CDATA[
- The <code><plugin></code> element contains informations required for a report plugin.
+ The <code><plugin></code> element in <code><reporting><plugins></code> contains informations required for a report plugin.
]]>
</description>
<fields>
diff --git a/pom.xml b/pom.xml
index 0815f33..3911315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<wagonVersion>3.5.1</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
- <modelloVersion>1.11</modelloVersion>
+ <modelloVersion>2.0.0</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.7.2</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>