You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/12/04 19:45:38 UTC
[maven] branch MNG-6054 updated (5d88a7b -> ac5b3e5)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6054
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 5d88a7b [MNG-6054] Remove super POM plugin management section
add 827224c [MNG-7019] Notify also at start when profile is missing
add 3736be9 Updating version in preparation for Maven 4
add b24c34b [MNG-7041] Update @since, version ranges and other version related strings
add d8ad76b [MNG-5728] Switch the default checksum policy from "warn" to "fail"
add 06c3217 Merge branch 'MNG-5728' of https://gitbox.apache.org/repos/asf/maven
add b6cf710 [MNG-7042] Upgrade Maven Wagon to 3.4.2
add 26f1e81 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add 2bdc0c5 remove unused imports
add 251ba22 Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
add 95ee890 [MNG-5728] Switch the default checksum policy from "warn" to "fail"
new ac5b3e5 [MNG-6054] Remove super POM plugin management section
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 (5d88a7b)
\
N -- N -- N refs/heads/MNG-6054 (ac5b3e5)
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:
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +++-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../AbstractArtifactComponentTestCase.java | 25 ++++++++++++++++++++++
.../repository/legacy/DefaultWagonManagerTest.java | 5 +++++
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 ++
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +++++++++----------
.../org/apache/maven/project/ReactorModelPool.java | 4 ++--
.../DefaultConsumerPomXMLFilterFactory.java | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
.../java/org/apache/maven/feature/Features.java | 4 ++--
.../building/AbstractModelSourceTransformer.java | 2 +-
.../maven/model/building/ArtifactModelSource.java | 2 +-
.../building/BuildModelSourceTransformer.java | 2 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 2 +-
.../building/DefaultModelSourceTransformer.java | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 4 ++--
.../apache/maven/model/building/ModelCache.java | 4 ++--
.../model/building/ModelSourceTransformer.java | 2 +-
.../maven/model/building/TransformerContext.java | 2 +-
.../maven/model/building/TransformerException.java | 2 +-
maven-model/pom.xml | 2 +-
maven-model/src/main/mdo/maven.mdo | 7 +++---
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorUtils.java | 18 +++++++++++++++-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 2 +-
maven-xml/pom.xml | 2 +-
.../main/java/org/apache/maven/xml/Factories.java | 2 +-
.../java/org/apache/maven/xml/sax/SAXEvent.java | 2 +-
.../org/apache/maven/xml/sax/SAXEventFactory.java | 2 +-
.../org/apache/maven/xml/sax/SAXEventUtils.java | 2 +-
.../maven/xml/sax/ext/CommentRenormalizer.java | 2 +-
.../xml/sax/filter/AbstractEventXMLFilter.java | 2 +-
.../maven/xml/sax/filter/AbstractSAXFilter.java | 2 +-
.../maven/xml/sax/filter/BuildPomXMLFilter.java | 2 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 2 +-
.../xml/sax/filter/BuildPomXMLFilterListener.java | 2 +-
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 2 +-
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 2 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 2 +-
.../apache/maven/xml/sax/filter/DependencyKey.java | 2 +-
.../maven/xml/sax/filter/FastForwardFilter.java | 2 +-
.../maven/xml/sax/filter/ModulesXMLFilter.java | 2 +-
.../maven/xml/sax/filter/ParentXMLFilter.java | 2 +-
.../xml/sax/filter/ReactorDependencyXMLFilter.java | 2 +-
.../xml/sax/filter/RelativePathXMLFilter.java | 2 +-
.../maven/xml/sax/filter/RelativeProject.java | 2 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 2 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 2 +-
pom.xml | 4 ++--
62 files changed, 126 insertions(+), 77 deletions(-)
[maven] 01/01: [MNG-6054] Remove super POM plugin management section
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6054
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ac5b3e5804c8ba568ce88f24156c283f346b781a
Author: Christian Schulte <sc...@apache.org>
AuthorDate: Sat Nov 12 20:20:11 2016 +0100
[MNG-6054] Remove super POM plugin management section
---
.../apache/maven/project/PomConstructionTest.java | 2 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 22 ----------------------
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 81ba219..a078a81 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -1496,7 +1496,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" );
- assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
+ assertEquals( 8, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
}
public void testDistributionManagement()
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index e61d110..cc55dac 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -76,28 +76,6 @@ under the License.
<filtering>true</filtering>
</testResource>
</testResources>
- <pluginManagement>
- <!-- NOTE: These plugins will be removed from future versions of the super POM -->
- <!-- They are kept for the moment as they are very unlikely to conflict with lifecycle mappings (MNG-4453) -->
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>