You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/10/14 22:12:35 UTC
[maven] 02/04: Merge branch 'master' into MNG-6656
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 585cb56349cec781db4b6fd01f21fb6ce5f21adf
Merge: 24955e7 3f3d775
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Oct 13 16:18:39 2019 +0200
Merge branch 'master' into MNG-6656
# Conflicts:
# maven-core/pom.xml
maven-core/pom.xml | 5 ++
.../maven/ProjectDependenciesResolverTest.java | 5 +-
.../maven/execution/DefaultMavenExecutionTest.java | 16 ++++--
.../lifecycle/internal/ProjectBuildListTest.java | 13 +++--
.../project/AbstractMavenProjectTestCase.java | 4 +-
.../project/DefaultMavenProjectBuilderTest.java | 18 +++---
.../project/ExtensionDescriptorBuilderTest.java | 8 ++-
.../apache/maven/project/PomConstructionTest.java | 35 ++++++-----
.../apache/maven/project/ProjectBuilderTest.java | 12 +++-
.../maven/project/ProjectModelResolverTest.java | 13 ++---
.../apache/maven/project/ProjectSorterTest.java | 67 ++++++++++++----------
.../maven/toolchain/DefaultToolchainTest.java | 24 ++++----
.../main/java/org/apache/maven/cli/MavenCli.java | 22 +------
.../java/org/apache/maven/cli/ResolveFile.java | 49 ++++++++++++++++
.../SettingsXmlConfigurationProcessor.java | 23 +-------
pom.xml | 12 ++++
16 files changed, 193 insertions(+), 133 deletions(-)
diff --cc maven-core/pom.xml
index c814a95,73c53c4..724e502
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@@ -141,10 -137,10 +141,15 @@@ under the License
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
++ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-assertj</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --cc pom.xml
index 805cb06,c7ac485..f569590
--- a/pom.xml
+++ b/pom.xml
@@@ -425,11 -420,22 +425,23 @@@ under the License
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <version>${powermockVersion}</version>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <version>${xmlunitVersion}</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--bootstrap-start-comment-->
</dependencyManagement>