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 2017/12/23 11:24:11 UTC
[maven-release] branch master updated (39708b0 -> 426e542)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.
from 39708b0 [MRELEASE-993] Use shallow checkout per default (git scm)
new 77c0096 Manage dependencies
new 426e542 Upgrade to XMLUnit 2.x
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:
maven-release-api/pom.xml | 1 -
maven-release-manager/pom.xml | 17 +---
.../release/phase/AbstractReleaseTestCase.java | 92 ++++++++++------------
.../phase/GenerateReleasePomsPhaseTest.java | 2 +-
.../phase/RewritePomsForDevelopmentPhaseTest.java | 2 +-
maven-release-plugin/pom.xml | 16 ----
.../maven-release-oddeven-policy/pom.xml | 9 +--
pom.xml | 71 +++++++++++++++++
8 files changed, 119 insertions(+), 91 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-release] 01/02: Manage dependencies
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 77c0096220f64e466c1b4ab705351c41cbe6f260
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Dec 23 11:35:38 2017 +0100
Manage dependencies
---
maven-release-api/pom.xml | 1 -
maven-release-manager/pom.xml | 12 ----
maven-release-plugin/pom.xml | 16 ------
.../maven-release-oddeven-policy/pom.xml | 9 ++-
pom.xml | 66 ++++++++++++++++++++++
5 files changed, 70 insertions(+), 34 deletions(-)
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index 068b257..2de416d 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 3dc7af5..eb07338 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -81,27 +81,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -133,25 +128,21 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-providers-standard</artifactId>
- <version>${scmVersion}</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
- <version>1.8</version> <!-- watch it!! Don't use 1.8.1 or 1.9, unittests will fail!! -->
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>${scmVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn-commons</artifactId>
- <version>${scmVersion}</version>
</dependency>
<dependency>
@@ -162,19 +153,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
- <version>${scmVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index e543696..30daa5a 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -42,21 +42,10 @@
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -71,27 +60,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>${scmVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/maven-release-policies/maven-release-oddeven-policy/pom.xml b/maven-release-policies/maven-release-oddeven-policy/pom.xml
index 06806e7..77d3923 100644
--- a/maven-release-policies/maven-release-oddeven-policy/pom.xml
+++ b/maven-release-policies/maven-release-oddeven-policy/pom.xml
@@ -42,14 +42,14 @@
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -61,7 +61,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 40451d5..fe7048b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,10 +135,70 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>${scmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.8</version> <!-- watch it!! With a newer version, unittests will fail!! -->
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-providers-standard</artifactId>
+ <version>${scmVersion}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svn-commons</artifactId>
+ <version>${scmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-test</artifactId>
+ <version>${scmVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.15</version>
@@ -149,6 +209,12 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-release] 02/02: Upgrade to XMLUnit 2.x
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 426e542483fc9d8ecea20395015230bfa81947f1
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Dec 23 12:23:58 2017 +0100
Upgrade to XMLUnit 2.x
---
maven-release-manager/pom.xml | 5 +-
.../release/phase/AbstractReleaseTestCase.java | 92 ++++++++++------------
.../phase/GenerateReleasePomsPhaseTest.java | 2 +-
.../phase/RewritePomsForDevelopmentPhaseTest.java | 2 +-
pom.xml | 5 ++
5 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index eb07338..1ec7b17 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -171,9 +171,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.3</version>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 8372533..1cd260c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -1,5 +1,6 @@
package org.apache.maven.shared.release.phase;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +20,7 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import java.io.File;
@@ -65,13 +67,13 @@ import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.Difference;
-import org.custommonkey.xmlunit.DifferenceListener;
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Comparison;
+import org.xmlunit.diff.ComparisonResult;
+import org.xmlunit.diff.Diff;
+import org.xmlunit.diff.DifferenceEvaluator;
/**
* Base class for some release tests.
@@ -291,68 +293,54 @@ public abstract class AbstractReleaseTestCase
File actualFile = project.getFile();
File expectedFile = new File( actualFile.getParentFile(), "expected-pom" + expectedFileSuffix + ".xml" );
- comparePomFiles( expectedFile, actualFile, normalizeLineEndings );
+ comparePomFiles( expectedFile, actualFile, normalizeLineEndings, false );
}
protected void comparePomFiles( File expectedFile, File actualFile )
throws IOException
{
- comparePomFiles( expectedFile, actualFile, true );
+ comparePomFiles( expectedFile, actualFile, true, false );
}
- protected void comparePomFiles( File expectedFile, File actualFile, boolean normalizeLineEndings )
+ protected void comparePomFiles( File expectedFile, File actualFile, boolean normalizeLineEndings, boolean ignoreComments )
throws IOException
{
- Reader expected = null;
- Reader actual = null;
- try
+ StringBuffer sb = new StringBuffer( "Check the transformed POM " + actualFile );
+ sb.append( SystemUtils.LINE_SEPARATOR );
+
+ final String remoteRepositoryURL = getRemoteRepositoryURL();
+
+ DiffBuilder diffBuilder = DiffBuilder.compare( expectedFile ).withTest( actualFile );
+ if ( normalizeLineEndings )
+ {
+ diffBuilder = diffBuilder.normalizeWhitespace();
+ }
+ if ( ignoreComments )
{
- expected = ReaderFactory.newXmlReader( expectedFile );
- actual = ReaderFactory.newXmlReader( actualFile );
-
- StringBuffer sb = new StringBuffer( "Check the transformed POM " + actualFile );
- sb.append( SystemUtils.LINE_SEPARATOR );
-
- final String remoteRepositoryURL = getRemoteRepositoryURL();
-
- XMLUnit.setNormalizeWhitespace( true );
-
- Diff diff = XMLUnit.compareXML( expected, actual );
-
- diff.overrideDifferenceListener( new DifferenceListener()
+ diffBuilder.ignoreComments();
+ }
+ diffBuilder.withDifferenceEvaluator( new DifferenceEvaluator()
+ {
+ @Override
+ public ComparisonResult evaluate( Comparison comparison, ComparisonResult outcome )
{
-
- public void skippedComparison( Node arg0, Node arg1 )
+ if ( "${remoterepo}".equals( comparison.getControlDetails().getValue() ) &&
+ remoteRepositoryURL.equals( comparison.getTestDetails().getValue() ) )
{
- //do nothing
+ return ComparisonResult.EQUAL;
}
-
- public int differenceFound( Difference difference )
+ else
{
- if ( "${remoterepo}".equals( difference.getControlNodeDetail().getValue() ) &&
- remoteRepositoryURL.equals( difference.getTestNodeDetail().getValue() ) )
- {
- return DifferenceListener.RETURN_IGNORE_DIFFERENCE_NODES_IDENTICAL;
- }
- else
- {
- return DifferenceListener.RETURN_ACCEPT_DIFFERENCE;
- }
+ return outcome;
}
- });
- diff.appendMessage( sb );
-
- XMLAssert.assertXMLIdentical( diff, true );
- }
- catch ( SAXException e )
- {
- fail( e.getMessage() );
- }
- finally
- {
- IOUtil.close( expected );
- IOUtil.close( actual );
- }
+ }
+ } );
+
+ Diff diff = diffBuilder.build();
+
+ sb.append( diff.toString() );
+
+ assertFalse( sb.toString(), diff.hasDifferences() );
}
private String getRemoteRepositoryURL()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index e5f17cb..93c09c7 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -309,6 +309,6 @@ public class GenerateReleasePomsPhaseTest
File expectedFile =
new File( actualFile.getParentFile(), "expected-release-pom" + expectedFileSuffix + ".xml" );
- comparePomFiles( expectedFile, actualFile, normalizeLineEndings );
+ comparePomFiles( expectedFile, actualFile, normalizeLineEndings, true );
}
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index 1cc60f4..d00aca3 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -401,7 +401,7 @@ public class RewritePomsForDevelopmentPhaseTest
File actualFile = new File( pomFile.getParentFile(), pomFile.getName() + ".next" );
File expectedFile = new File( actualFile.getParentFile(), "expected-pom.xml" );
- comparePomFiles( expectedFile, actualFile, true );
+ comparePomFiles( expectedFile, actualFile, true, false );
}
}
diff --git a/pom.xml b/pom.xml
index fe7048b..4798b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,6 +219,11 @@
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
</dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.