[01/12] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT 3af028d2c -> b269329c1 (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Removed an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/80438a6b Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/80438a6b Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/80438a6b Branch: refs/heads/DEPMGMT Commit: 80438a6b97389225db0d97aa0ef9bf8ec7b5d2e6 Parents: f6ad650 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Fri Feb 10 18:46:55 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 226 --- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../local-parent/module/pom.xml | 13 -- .../local-parent/pom.xml| 16 -- .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 13 files changed, 311 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80438a6b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..4f1b3aa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -
[02/13] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f9c0d641 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f9c0d641 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f9c0d641 Branch: refs/heads/DEPMGMT Commit: f9c0d641ae362ff59c76bc7eb670c8214917f0c3 Parents: f6ad650 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 23:16:00 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f9c0d641/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void testValidParentVersionRangeWithExclusiveUpperBound()
[2/7] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f9c0d641 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f9c0d641 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f9c0d641 Branch: refs/heads/DEPMGMT-INCLUDE Commit: f9c0d641ae362ff59c76bc7eb670c8214917f0c3 Parents: f6ad650 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 23:16:00 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f9c0d641/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/5] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f9c0d641 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f9c0d641 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f9c0d641 Branch: refs/heads/DEPMGMT-IMPORT Commit: f9c0d641ae362ff59c76bc7eb670c8214917f0c3 Parents: f6ad650 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 23:16:00 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f9c0d641/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f9c0d641 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f9c0d641 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f9c0d641 Branch: refs/heads/MNG-2199 Commit: f9c0d641ae362ff59c76bc7eb670c8214917f0c3 Parents: f6ad650 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 23:16:00 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f9c0d641/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void testValidParentVersionRangeWithExclusiveUpperBound()
[02/13] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6818c452 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6818c452 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6818c452 Branch: refs/heads/DEPMGMT Commit: 6818c45265834b3917a3d75edb918d07a73bacdb Parents: 0bd4395 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 03:25:14 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6818c452/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void testValidParentVersionRangeWithExclusiveUpperBound()
[2/7] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6818c452 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6818c452 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6818c452 Branch: refs/heads/DEPMGMT-INCLUDE Commit: 6818c45265834b3917a3d75edb918d07a73bacdb Parents: 0bd4395 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 03:25:14 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6818c452/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/5] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6818c452 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6818c452 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6818c452 Branch: refs/heads/DEPMGMT-IMPORT Commit: 6818c45265834b3917a3d75edb918d07a73bacdb Parents: 0bd4395 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 03:25:14 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6818c452/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6818c452 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6818c452 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6818c452 Branch: refs/heads/MNG-2199 Commit: 6818c45265834b3917a3d75edb918d07a73bacdb Parents: 0bd4395 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Feb 4 03:25:14 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6818c452/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..2496d38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void testValidParentVersionRangeWithExclusiveUpperBound()
[02/13] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/83066688 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/83066688 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/83066688 Branch: refs/heads/DEPMGMT Commit: 83066688bfd9e2adf6e7679ee98df9aae5dcf35b Parents: 92a11a9 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Thu Feb 2 04:13:41 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/83066688/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..cefbd59 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(,3.2.2),(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/7] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/83066688 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/83066688 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/83066688 Branch: refs/heads/DEPMGMT-INCLUDE Commit: 83066688bfd9e2adf6e7679ee98df9aae5dcf35b Parents: 92a11a9 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Thu Feb 2 04:13:41 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/83066688/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..cefbd59 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(,3.2.2),(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/5] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/83066688 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/83066688 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/83066688 Branch: refs/heads/DEPMGMT-IMPORT Commit: 83066688bfd9e2adf6e7679ee98df9aae5dcf35b Parents: 92a11a9 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Thu Feb 2 04:13:41 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/83066688/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..cefbd59 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(,3.2.2),(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/83066688 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/83066688 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/83066688 Branch: refs/heads/MNG-2199 Commit: 83066688bfd9e2adf6e7679ee98df9aae5dcf35b Parents: 92a11a9 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Thu Feb 2 04:13:41 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 247 +-- .../expression-local/child/pom.xml | 12 + .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 + .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 11 files changed, 335 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/83066688/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..cefbd59 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { +failingMavenVersions( "(,3.2.2),(3.2.2,3.5.0)" ); Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +// All Maven versions not supporting remote parent version ranges will log a warning message whenever +// building a parent fails. The build succeeds without any parent. If that warning message appears in the +// log, parent resolution failed. +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { -verifier.resetStreams(); +if ( verifier != null ) +{ +verifier.resetStreams(); +} } } public void
[1/6] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT-INCLUDE b16408ef1 -> ad581b870 (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/2348fbc3 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2348fbc3 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2348fbc3 Branch: refs/heads/DEPMGMT-INCLUDE Commit: 2348fbc31805560fdd6e1a68dbf7b52e00e0e992 Parents: 63bb518 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Mon Jan 30 19:11:48 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 433 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..8cf74a9 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright
[1/4] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/DEPMGMT-IMPORT 414afe457 -> 11c330f9c (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/2348fbc3 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2348fbc3 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2348fbc3 Branch: refs/heads/DEPMGMT-IMPORT Commit: 2348fbc31805560fdd6e1a68dbf7b52e00e0e992 Parents: 63bb518 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Mon Jan 30 19:11:48 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 433 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..8cf74a9 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014
[3/3] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/2348fbc3 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2348fbc3 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2348fbc3 Branch: refs/heads/MNG-2199 Commit: 2348fbc31805560fdd6e1a68dbf7b52e00e0e992 Parents: 63bb518 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Mon Jan 30 19:11:48 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 433 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2348fbc3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..8cf74a9 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-2199 d41670892 -> 012d21261 (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/012d2126 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/012d2126 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/012d2126 Branch: refs/heads/MNG-2199 Commit: 012d21261f243d4f11160338c8ebcaab173e524a Parents: c4365ab Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Jan 28 04:55:33 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 433 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/012d2126/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/012d2126/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..8cf74a9 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 The Apache
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-2199 e6ca0fb2d -> d41670892 (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/d4167089 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d4167089 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d4167089 Branch: refs/heads/MNG-2199 Commit: d416708928c1213d94505838d71e84a850b25924 Parents: c4365ab Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Fri Jan 27 22:52:09 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 433 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d4167089/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d4167089/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..8cf74a9 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 The Apache
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/e6ca0fb2 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/e6ca0fb2 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/e6ca0fb2 Branch: refs/heads/MNG-2199 Commit: e6ca0fb2d02442855028d6fe8ff91342f7acbd43 Parents: c4365ab Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Fri Jan 27 22:42:42 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 64 ++ ...MavenITmng2199ParentVersionRange350Test.java | 199 +++ .../MavenITmng2199ParentVersionRangeTest.java | 98 + .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 + .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 + .../valid-local/pom.xml | 10 + 14 files changed, 432 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e6ca0fb2/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index a91eeb0..1f83b1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -123,6 +123,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e6ca0fb2/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..d758e07 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,64 @@ +/* + * Copyright 2014 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-2199 161fefad1 -> 07c254517 (forced update) [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/07c25451 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/07c25451 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/07c25451 Branch: refs/heads/MNG-2199 Commit: 07c254517347fdfc46be7d9521b2060f82629b78 Parents: 7e5b365 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Wed Jan 25 23:24:09 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 +++ ...MavenITmng2199ParentVersionRange350Test.java | 187 +++ .../MavenITmng2199ParentVersionRangeTest.java | 90 - .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 ++ .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 ++ .../valid-local/pom.xml | 10 + 14 files changed, 414 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/07c25451/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 5536620..b7e4de0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -121,6 +121,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmng2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/07c25451/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..91dae0e --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 The
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Deprecated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/161fefad Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/161fefad Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/161fefad Branch: refs/heads/MNG-2199 Commit: 161fefad14748c4f8b4f16dc5ed097f1c5fa3f4c Parents: 7e5b365 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Wed Jan 25 23:21:02 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 2 + ...mng2199DeprecatedParentVersionRangeTest.java | 65 +++ ...MavenITmng2199ParentVersionRange350Test.java | 187 +++ .../MavenITmng2199ParentVersionRangeTest.java | 90 - .../expression-local/child/pom.xml | 12 ++ .../expression-local/pom.xml| 10 + .../inherited-local/child/pom.xml | 11 ++ .../inherited-local/pom.xml | 10 + .../invalid-local/child/pom.xml | 12 ++ .../invalid-local/pom.xml | 10 + .../local-fallback-to-remote/child/pom.xml | 18 ++ .../local-fallback-to-remote/pom.xml| 8 + .../valid-local/child/pom.xml | 11 ++ .../valid-local/pom.xml | 10 + 14 files changed, 414 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/161fefad/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 5536620..8006799 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -121,6 +121,8 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng2562Timestamp322Test.class ); suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class ); +suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class ); +suite.addTestSuite( MavenITmnv2199DeprecatedParentVersionRangeTest.class ); suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class ); suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class ); suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/161fefad/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java new file mode 100644 index 000..91dae0e --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2014 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-2199 [created] 20a6125e7 [MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Maven does not fail the build when it cannot resolve a parent but instead logs a warning message. The ITs never checked the log to contain the warning messages but instead asserted the build to fail when a parent cannot be resolved. The only Maven version supporting parent version ranges is Maven 3.2.2 due to this. o Updated an incorrect test case for local parent resolution. Maven ignored the '' in '' elements for local parent resolution. The core has been updated across various versions to eliminate any differences between local and remote parent resolution. When local parent resolution had been updated to match remote parent resolution, an existing IT started to fail testing incorrect behaviour. As soon as the '' is referenced using a version range, the '' element in the project becomes mandatory and does no longer support using an expression any more. This has been that way for remote parent resolution from day one. It has never been supported to inherit a version from a parent when referencing that parent using a version range intentionally. o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/20a6125e Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/20a6125e Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/20a6125e Branch: refs/heads/MNG-2199 Commit: 20a6125e7b6929d8f75ae1a232c252af8fe28cbc Parents: 6c86dc6 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Jan 21 15:49:57 2017 +0100 -- .../MavenITmng2199ParentVersionRangeTest.java | 29 +++- .../local-parent/module/pom.xml | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/20a6125e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..74a94a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -33,7 +33,9 @@ public class MavenITmng2199ParentVersionRangeTest throws Exception { Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-inclusive-upper-bound" ); try { @@ -43,6 +45,9 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); } finally { @@ -54,7 +59,9 @@ public class MavenITmng2199ParentVersionRangeTest throws Exception { Verifier verifier = null; -File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2199-parent-version-range/valid-exclusive-upper-bound" ); +File testDir = +ResourceExtractor.simpleExtractResources( getClass(), + "/mng-2199-parent-version-range/valid-exclusive-upper-bound" ); try { @@ -64,6 +71,11 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", + indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); + } finally { @@ -88,8 +100,9 @@ public class MavenITmng2199ParentVersionRangeTest catch ( final VerificationException e ) {
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
Repository: maven-integration-testing Updated Branches: refs/heads/master d5eb89efc -> 0fa30cec0 [MNG-2199] Support version ranges in parent elements o Updated to account for updated error messages. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/0fa30cec Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/0fa30cec Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/0fa30cec Branch: refs/heads/master Commit: 0fa30cec0400a1175051348b4e4c83ba24bb6b2f Parents: d5eb89e Author: Christian SchulteAuthored: Mon Feb 22 22:07:10 2016 +0100 Committer: Christian Schulte Committed: Mon Feb 22 22:10:15 2016 +0100 -- .../apache/maven/it/MavenITmng2199ParentVersionRangeTest.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0fa30cec/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index b4d7a89..7d77cb7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -130,7 +130,7 @@ public class MavenITmng2199ParentVersionRangeTest final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); int msg = indexOf( lines, - ".*Version must be a constant @ org.apache.maven.its.mng2199:expression:\\$\\{project.parent.version\\}.*" ); + ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*" ); assertTrue( "Expected error message not found.", msg >= 0 ); } @@ -160,7 +160,7 @@ public class MavenITmng2199ParentVersionRangeTest final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); int msg = indexOf( lines, - ".*Version must be a constant @ org.apache.maven.its.mng2199:inherited:\\[unknown-version\\].*" ); + ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*" ); assertTrue( "Expected error message not found.", msg >= 0 ); }
maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
Repository: maven-integration-testing Updated Branches: refs/heads/master 30ecf2e07 -> ed5ffbe5a [MNG-2199] Support version ranges in parent elements o Updated an incorrect test case. The project was invalid but the corresponding validation was missing in Maven. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ed5ffbe5 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ed5ffbe5 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ed5ffbe5 Branch: refs/heads/master Commit: ed5ffbe5afc0be21f750f8cb8c95b6e9a3f3bd0c Parents: 30ecf2e Author: Christian SchulteAuthored: Sun Dec 13 17:10:11 2015 +0100 Committer: Christian Schulte Committed: Sun Dec 13 17:10:11 2015 +0100 -- .../mng-2199-parent-version-range/local-parent/module/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ed5ffbe5/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml -- diff --git a/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml b/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml index 85769ce..fc6931c 100644 --- a/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml +++ b/core-it-suite/src/test/resources/mng-2199-parent-version-range/local-parent/module/pom.xml @@ -9,5 +9,5 @@ local-parent-module - + 1
[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements
[MNG-2199] Support version ranges in parent elements o Updated the ITs to correctly detect parent resolution failures. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a6aca289 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a6aca289 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a6aca289 Branch: refs/heads/master Commit: a6aca2894ab5a2849190cb802052710204081bf5 Parents: fc323c4 Author: Christian SchulteAuthored: Sat Dec 12 19:25:15 2015 +0100 Committer: Christian Schulte Committed: Sat Dec 12 19:33:58 2015 +0100 -- .../apache/maven/it/MavenITmng2199ParentVersionRangeTest.java | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a6aca289/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 16ac91c..a11bc99 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -43,6 +43,9 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); } finally { @@ -64,6 +67,9 @@ public class MavenITmng2199ParentVersionRangeTest verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); + +final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); +assertFalse( "Unxpected error message found.", indexOf( lines, ".*Failed to build parent project.*" ) >= 0 ); } finally {