diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 7619dabfd9..e6b179a31e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -86,10 +86,10 @@ public class MavenITmng3642DynamicResourcesTest */ verifier.resetStreams(); - File first = new File( testDir, "target/test-classes/one.txt" ); - assertTrue( "First resource file was not present: " + first, first.exists() ); - - File second = new File( testDir, "target/test-classes/two.txt" ); - assertTrue( "Second resource file was not present: " + second, second.exists() ); + File first = new File( testDir, "target/test-classes/one.txt" ); + assertTrue( "First resource file was not present: " + first, first.exists() ); + + File second = new File( testDir, "target/test-classes/two.txt" ); + assertTrue( "Second resource file was not present: " + second, second.exists() ); } } diff --git a/its/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml b/its/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml index 7156c541f8..e84e30b960 100644 --- a/its/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml +++ b/its/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.geronimo.specs geronimo-jcdi_2.0_spec - 1.3 + 1.3 org.apache.groovy diff --git a/its/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml b/its/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml index f037419af2..cdd6050456 100644 --- a/its/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml +++ b/its/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml @@ -66,17 +66,17 @@ under the License. org.apache.maven.shared - maven-common-artifact-filters + maven-common-artifact-filters 3.1.0 org.apache.maven.shared - maven-artifact-transfer + maven-artifact-transfer 0.11.0 org.ow2.asm - asm + asm 7.2 diff --git a/its/core-it-suite/src/test/resources/it0038/pom.xml b/its/core-it-suite/src/test/resources/it0038/pom.xml index c912f1572a..91e56d0ea2 100644 --- a/its/core-it-suite/src/test/resources/it0038/pom.xml +++ b/its/core-it-suite/src/test/resources/it0038/pom.xml @@ -29,7 +29,7 @@ under the License. Maven Integration Test :: it0038 - Test building project from outside the project directory using '-f' option + Test building project from outside the project directory using '-f' option diff --git a/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml index 05707d7c16..04908333b8 100644 --- a/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml @@ -21,19 +21,19 @@ - org.apache.maven.plugins - maven-verifier-plugin - - src/test/verifier/verifications-test.xml - - - - verify - - verify - - - + org.apache.maven.plugins + maven-verifier-plugin + + src/test/verifier/verifications-test.xml + + + + verify + + verify + + + diff --git a/its/core-it-suite/src/test/resources/mng-0773/settings.xml b/its/core-it-suite/src/test/resources/mng-0773/settings.xml index e7d77bbda8..c2d23147c8 100644 --- a/its/core-it-suite/src/test/resources/mng-0773/settings.xml +++ b/its/core-it-suite/src/test/resources/mng-0773/settings.xml @@ -1,19 +1,19 @@ - - - test-repo - - - test-repo - file:../../test-repo - - - - + + + test-repo + + + test-repo + file:../../test-repo + + + + - - test-repo - - + + test-repo + + diff --git a/its/core-it-suite/src/test/resources/mng-2196/pom.xml b/its/core-it-suite/src/test/resources/mng-2196/pom.xml index dfe2fc923f..9c2d865b83 100644 --- a/its/core-it-suite/src/test/resources/mng-2196/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2196/pom.xml @@ -8,7 +8,7 @@ Maven Integration Test :: MNG-2196 - Verify that multimodule builds where one project references another as + Verify that multimodule builds where one project references another as a parent can build, even if that parent is not correctly referenced by <relativePath/> and is not in the local repository. diff --git a/its/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java b/its/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java index 91a16b84a9..1073f806a3 100644 --- a/its/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java +++ b/its/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java @@ -4,9 +4,9 @@ import junit.framework.TestCase; public class Issue2289 { - public static void main(final String[] args) - { - TestCase tc = new TestCase("Dummy") {}; - System.exit(tc == null ? -1 : 0); - } + public static void main(final String[] args) + { + TestCase tc = new TestCase("Dummy") {}; + System.exit(tc == null ? -1 : 0); + } } diff --git a/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml index 7e887262aa..0f49ea374f 100644 --- a/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml @@ -28,19 +28,19 @@ - org.apache.maven.plugins - maven-verifier-plugin - - src/test/verifier/verifications-test.xml - - - - verify - - verify - - - + org.apache.maven.plugins + maven-verifier-plugin + + src/test/verifier/verifications-test.xml + + + + verify + + verify + + + diff --git a/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java b/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java index 367a7a5e0f..5fd389e491 100644 --- a/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java +++ b/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java @@ -11,6 +11,6 @@ public class App { public static void main( String[] args ) { - List stuff = new ArrayList(); + List stuff = new ArrayList(); } } diff --git a/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java b/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java index 39d3ceb77a..c886881026 100644 --- a/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java +++ b/its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java @@ -11,6 +11,6 @@ public class Diamond { public static void main( String[] args ) { - List stuff = new ArrayList<>(); + List stuff = new ArrayList<>(); } } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module1/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/module1/pom.xml index 8b20132f56..9d230df4bc 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/module1/pom.xml @@ -4,12 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.codehaus.jira.mng.XXX - parent - 1-SNAPSHOT - - + + org.codehaus.jira.mng.XXX + parent + 1-SNAPSHOT + + 4.0.0 org.codehaus.jira.mng.XXX mng-module1-XXX @@ -26,12 +26,12 @@ jmock jmock - compile + compile junit junit - compile + compile diff --git a/its/core-it-suite/src/test/resources/mng-3259/module1/src/main/java/mng/XStreamTestCase.java b/its/core-it-suite/src/test/resources/mng-3259/module1/src/main/java/mng/XStreamTestCase.java index d1acb804d5..10c430f9d7 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module1/src/main/java/mng/XStreamTestCase.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module1/src/main/java/mng/XStreamTestCase.java @@ -6,18 +6,19 @@ import org.jmock.MockObjectTestCase; public abstract class XStreamTestCase extends MockObjectTestCase { - private XStream xstream; + private XStream xstream; - public void setUp() - { - xstream = new XStream(); - } + public void setUp() + { + xstream = new XStream(); + } - public void testToXml() { - String xml = xstream.toXML(getObject()); - assertEquals(getXML(), xml); - } + public void testToXml() + { + String xml = xstream.toXML(getObject()); + assertEquals(getXML(), xml); + } - protected abstract Object getObject(); - protected abstract String getXML(); + protected abstract Object getObject(); + protected abstract String getXML(); } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module2/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/module2/pom.xml index 72ce2bdcfb..255a5ec2e0 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/module2/pom.xml @@ -4,12 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.codehaus.jira.mng.XXX - parent - 1-SNAPSHOT - - + + org.codehaus.jira.mng.XXX + parent + 1-SNAPSHOT + + 4.0.0 org.codehaus.jira.mng.XXX mng-module2-XXX @@ -23,10 +23,10 @@ com.thoughtworks.xstream xstream - + - org.codehaus.jira.mng.XXX - mng-module1-XXX + org.codehaus.jira.mng.XXX + mng-module1-XXX diff --git a/its/core-it-suite/src/test/resources/mng-3259/module2/src/main/java/mng/Module2.java b/its/core-it-suite/src/test/resources/mng-3259/module2/src/main/java/mng/Module2.java index 75716db858..10cce09287 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module2/src/main/java/mng/Module2.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module2/src/main/java/mng/Module2.java @@ -4,5 +4,5 @@ import com.thoughtworks.xstream.XStream; public class Module2 { - XStream xstream; + XStream xstream; } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module3/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/module3/pom.xml index acfcb0b676..d2ef0200f4 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/module3/pom.xml @@ -4,12 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.codehaus.jira.mng.XXX - parent - 1-SNAPSHOT - - + + org.codehaus.jira.mng.XXX + parent + 1-SNAPSHOT + + 4.0.0 org.codehaus.jira.mng.XXX mng-module3-XXX @@ -18,32 +18,32 @@ Module-3 XXX - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + - - - org.codehaus.jira.mng.XXX - mng-module2-XXX - - - - org.codehaus.jira.mng.XXX - mng-module1-XXX - - + + + org.codehaus.jira.mng.XXX + mng-module2-XXX + + + + org.codehaus.jira.mng.XXX + mng-module1-XXX + + diff --git a/its/core-it-suite/src/test/resources/mng-3259/module3/src/main/java/mng/Module3.java b/its/core-it-suite/src/test/resources/mng-3259/module3/src/main/java/mng/Module3.java index e06fc87bd3..5de0a84c40 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module3/src/main/java/mng/Module3.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module3/src/main/java/mng/Module3.java @@ -2,5 +2,5 @@ package mng; public class Module3 extends Module2 { - public static String MODULE = "3"; + public static String MODULE = "3"; } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module3/src/test/java/mng/Module3TestUtil.java b/its/core-it-suite/src/test/resources/mng-3259/module3/src/test/java/mng/Module3TestUtil.java index b3b5890b14..1db1abf30a 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module3/src/test/java/mng/Module3TestUtil.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module3/src/test/java/mng/Module3TestUtil.java @@ -6,9 +6,9 @@ import com.thoughtworks.xstream.io.xml.DomDriver; public class Module3TestUtil { - public static String getCalendarAsXML(Calendar cal) - { - XStream xstream = new XStream(new DomDriver()); - return xstream.toXML(cal); - } + public static String getCalendarAsXML(Calendar cal) + { + XStream xstream = new XStream(new DomDriver()); + return xstream.toXML(cal); + } } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module4/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/module4/pom.xml index 259f37cb2c..9c35719eea 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module4/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/module4/pom.xml @@ -4,12 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.codehaus.jira.mng.XXX - parent - 1-SNAPSHOT - - + + org.codehaus.jira.mng.XXX + parent + 1-SNAPSHOT + + 4.0.0 org.codehaus.jira.mng.XXX mng-module4-XXX @@ -18,42 +18,42 @@ Module-4 XXX - - - - maven-ejb-plugin - - true - - **/*Bean.class - - - false - - true - true - true - - - - - - + + + + maven-ejb-plugin + + true + + **/*Bean.class + + + false + + true + true + true + + + + + + - - - org.codehaus.jira.mng.XXX - mng-module3-XXX - - - jboss - jboss-j2ee - - - - org.codehaus.jira.mng.XXX - mng-module1-XXX - - + + + org.codehaus.jira.mng.XXX + mng-module3-XXX + + + jboss + jboss-j2ee + + + + org.codehaus.jira.mng.XXX + mng-module1-XXX + + diff --git a/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4.java b/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4.java index 5d8347fe2c..dab8c1b8d8 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4.java @@ -10,6 +10,6 @@ import javax.ejb.EJBObject; */ public interface Module4 extends EJBObject { - public boolean doIt() throws RemoteException; + public boolean doIt() throws RemoteException; } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4Bean.java b/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4Bean.java index 40c5de6d69..fb91a3eb79 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4Bean.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module4/src/main/java/mng/Module4Bean.java @@ -9,28 +9,28 @@ import javax.ejb.SessionContext; */ public class Module4Bean implements SessionBean { - public void ejbCreate() throws CreateException - { - } + public void ejbCreate() throws CreateException + { + } - public void ejbRemove() - { - } + public void ejbRemove() + { + } - public void ejbActivate() - { - } + public void ejbActivate() + { + } - public void ejbPassivate() - { - } + public void ejbPassivate() + { + } - public void setSessionContext(SessionContext sessionContext) - { - } + public void setSessionContext(SessionContext sessionContext) + { + } - public boolean doIt() - { - return true; - } + public boolean doIt() + { + return true; + } } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module5/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/module5/pom.xml index f7020d2381..c8f18272cc 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module5/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/module5/pom.xml @@ -4,56 +4,56 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.codehaus.jira.mng.XXX - parent - 1-SNAPSHOT - - - 4.0.0 - org.codehaus.jira.mng.XXX - mng-module5-XXX - jar - Module-5 XXX - 1.0-SNAPSHOT - + + org.codehaus.jira.mng.XXX + parent + 1-SNAPSHOT + + + 4.0.0 + org.codehaus.jira.mng.XXX + mng-module5-XXX + jar + Module-5 XXX + 1.0-SNAPSHOT + - - - jboss - jboss-j2ee - - - org.codehaus.jira.mng.XXX - mng-module3-XXX - - - com.thoughtworks.xstream - xstream - - - - - org.codehaus.jira.mng.XXX - mng-module4-XXX - ejb-client - - - com.thoughtworks.xstream - xstream - - - - - - org.codehaus.jira.mng.XXX - mng-module1-XXX - - - org.codehaus.jira.mng.XXX - mng-module3-XXX - test-jar - - + + + jboss + jboss-j2ee + + + org.codehaus.jira.mng.XXX + mng-module3-XXX + + + com.thoughtworks.xstream + xstream + + + + + org.codehaus.jira.mng.XXX + mng-module4-XXX + ejb-client + + + com.thoughtworks.xstream + xstream + + + + + + org.codehaus.jira.mng.XXX + mng-module1-XXX + + + org.codehaus.jira.mng.XXX + mng-module3-XXX + test-jar + + diff --git a/its/core-it-suite/src/test/resources/mng-3259/module5/src/main/java/mng/Module5.java b/its/core-it-suite/src/test/resources/mng-3259/module5/src/main/java/mng/Module5.java index b7bd62c138..4fb0b26716 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module5/src/main/java/mng/Module5.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module5/src/main/java/mng/Module5.java @@ -2,5 +2,5 @@ package mng; public class Module5 { - private Module4 m4; + private Module4 m4; } diff --git a/its/core-it-suite/src/test/resources/mng-3259/module5/src/test/java/mng/Module5Test.java b/its/core-it-suite/src/test/resources/mng-3259/module5/src/test/java/mng/Module5Test.java index e120dfaa25..01971660f1 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/module5/src/test/java/mng/Module5Test.java +++ b/its/core-it-suite/src/test/resources/mng-3259/module5/src/test/java/mng/Module5Test.java @@ -4,17 +4,20 @@ import java.util.Calendar; public class Module5Test extends XStreamTestCase { - private Calendar cal = Calendar.getInstance(); + private Calendar cal = Calendar.getInstance(); - protected Object getObject() { - return cal; - } + protected Object getObject() + { + return cal; + } - protected String getXML() { - return Module3TestUtil.getCalendarAsXML(cal); - } + protected String getXML() + { + return Module3TestUtil.getCalendarAsXML( cal ); + } - public void testJMockAvailable() { - assertNotNull(mock(Module4.class)); - } + public void testJMockAvailable() + { + assertNotNull( mock( Module4.class ) ); + } } diff --git a/its/core-it-suite/src/test/resources/mng-3259/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-3259/parent/pom.xml index 068f7f748f..5f12e3c5b1 100644 --- a/its/core-it-suite/src/test/resources/mng-3259/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3259/parent/pom.xml @@ -12,90 +12,90 @@ 1-SNAPSHOT 2007 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.3 - - once - ${basedir} - false - false - - - - - + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.3 + + once + ${basedir} + false + false + + + + + - org.codehaus.jira.mng.XXX - mng-module1-XXX + org.codehaus.jira.mng.XXX + mng-module1-XXX 1.0-SNAPSHOT - test + test - org.codehaus.jira.mng.XXX - mng-module2-XXX + org.codehaus.jira.mng.XXX + mng-module2-XXX 1.0-SNAPSHOT - org.codehaus.jira.mng.XXX - mng-module3-XXX + org.codehaus.jira.mng.XXX + mng-module3-XXX 1.0-SNAPSHOT - - org.codehaus.jira.mng.XXX - mng-module3-XXX - test-jar - test + + org.codehaus.jira.mng.XXX + mng-module3-XXX + test-jar + test 1.0-SNAPSHOT - + - org.codehaus.jira.mng.XXX - mng-module4-XXX + org.codehaus.jira.mng.XXX + mng-module4-XXX 1.0-SNAPSHOT - ejb + ejb - org.codehaus.jira.mng.XXX - mng-module4-XXX + org.codehaus.jira.mng.XXX + mng-module4-XXX 1.0-SNAPSHOT - ejb-client + ejb-client - - jboss - jboss-j2ee - 3.2.3 - provided - + + jboss + jboss-j2ee + 3.2.3 + provided + - xpp3 + xpp3 xpp3_min 1.1.3.4.O - com.thoughtworks.xstream + com.thoughtworks.xstream xstream 1.4.15 - jmock + jmock jmock 1.2.0 - test + test - - junit - junit - 3.8.2 - test - - + + junit + junit + 3.8.2 + test + + diff --git a/its/core-it-suite/src/test/resources/mng-3372/dependency-tree/pom.xml b/its/core-it-suite/src/test/resources/mng-3372/dependency-tree/pom.xml index dd1b61fb99..a6c51e4c61 100644 --- a/its/core-it-suite/src/test/resources/mng-3372/dependency-tree/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3372/dependency-tree/pom.xml @@ -1,1031 +1,1031 @@ - 4.0.0 - org.apache.maven.its.mng3372 - dependency-tree - 1 + 4.0.0 + org.apache.maven.its.mng3372 + dependency-tree + 1 - - - org.apache.maven - maven-core - 2.0.8 - - - - + + org.freemarker + freemarker + 2.3.11 + + + org.objectweb.howl + howl + 1.0.1-1 + + + org.objectweb.fractal + fractal + 2.0.1 + + + org.objectweb.tribe + tribe + 0.4 + + + p6spy + p6spy + 1.3 + + --> + diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java index 027cdbd617..a713f691a1 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java index d2f3c7f838..1c1abf17a4 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java index 027cdbd617..a713f691a1 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java index d2f3c7f838..1c1abf17a4 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml index 76bda67471..3fa623c0ce 100644 --- a/its/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml @@ -25,9 +25,9 @@ test - org.apache.maven - maven-core - 2.0.9 + org.apache.maven + maven-core + 2.0.9 diff --git a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml index 9fe7eed76c..f667c1b0d7 100644 --- a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml @@ -20,19 +20,19 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 - org.apache.maven.reporting - maven-reporting-api - 2.0.9 + org.apache.maven.reporting + maven-reporting-api + 2.0.9 - org.apache.maven.reporting - maven-reporting-impl - 2.0.4.1 + org.apache.maven.reporting + maven-reporting-impl + 2.0.4.1 diff --git a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml index fc6b363f83..a815228317 100644 --- a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml @@ -20,9 +20,9 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 diff --git a/its/core-it-suite/src/test/resources/mng-3693/projects/app/pom.xml b/its/core-it-suite/src/test/resources/mng-3693/projects/app/pom.xml index baafcbb2f7..45d38c66b1 100644 --- a/its/core-it-suite/src/test/resources/mng-3693/projects/app/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3693/projects/app/pom.xml @@ -18,9 +18,9 @@ test - org.apache.maven.its.mng3693 - dep - 1 + org.apache.maven.its.mng3693 + dep + 1 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml index 1919320af2..14ef7e8931 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml @@ -20,9 +20,9 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 diff --git a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java index 250f37caa3..25fc70e462 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java +++ b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java @@ -30,24 +30,24 @@ import org.apache.maven.project.MavenProject; public class MyMojo extends AbstractMojo { - - /** - * Not used, just an offset to place reactorProjects in the middle. - * @parameter default-value="${project.build.directory}" - */ - private String outputDirectory; - + + /** + * Not used, just an offset to place reactorProjects in the middle. + * @parameter default-value="${project.build.directory}" + */ + private String outputDirectory; + /** * @parameter expression="${reactorProjects}" * @required */ private List reactorProjects; - /** - * Not used, just an offset to place reactorProjects in the middle. - * @parameter default-value="${project.build.directory}" - */ - private String outputDirectory2; + /** + * Not used, just an offset to place reactorProjects in the middle. + * @parameter default-value="${project.build.directory}" + */ + private String outputDirectory2; public void execute() throws MojoExecutionException diff --git a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml index 2f42e3be27..f8026c34fe 100644 --- a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml @@ -20,14 +20,14 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 - org.apache.maven.reporting - maven-reporting-impl - 2.0.4.1 + org.apache.maven.reporting + maven-reporting-impl + 2.0.4.1 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml index 2e753cc833..645a13a4d0 100644 --- a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml @@ -19,9 +19,9 @@ test - org.apache.maven - maven-core - 2.0.9 + org.apache.maven + maven-core + 2.0.9 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml index d4cafa12af..9a1041b16e 100644 --- a/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml @@ -18,9 +18,9 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml index d72983ce98..d908073745 100644 --- a/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3710/pom-inheritance/projects/middle/pom.xml @@ -11,7 +11,7 @@ 1 pom - child + child diff --git a/its/core-it-suite/src/test/resources/mng-3716/projects/pom.xml b/its/core-it-suite/src/test/resources/mng-3716/projects/pom.xml index a683728bb9..5e5d57f885 100644 --- a/its/core-it-suite/src/test/resources/mng-3716/projects/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3716/projects/pom.xml @@ -6,7 +6,7 @@ 1 pom - child1 - child2 + child1 + child2 diff --git a/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml index 8404582d33..94ae526328 100644 --- a/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml @@ -19,9 +19,9 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3723/projects/pom.xml b/its/core-it-suite/src/test/resources/mng-3723/projects/pom.xml index aedef98e5b..8a14f65e75 100644 --- a/its/core-it-suite/src/test/resources/mng-3723/projects/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3723/projects/pom.xml @@ -6,6 +6,6 @@ 1 pom - child + child diff --git a/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml index d41c102bd8..83b985004d 100644 --- a/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml @@ -19,9 +19,9 @@ test - org.apache.maven - maven-project - 2.0.9 + org.apache.maven + maven-project + 2.0.9 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml index 6de740d41f..5456a11b62 100644 --- a/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml @@ -24,9 +24,9 @@ test - org.apache.maven.reporting - maven-reporting-impl - 2.0.4.1 + org.apache.maven.reporting + maven-reporting-impl + 2.0.4.1 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml b/its/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml index 1d6c07da2d..b42a08e8fb 100644 --- a/its/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml @@ -6,8 +6,8 @@ 1 pom - maven-mng3743-check-plugin - maven-mng3743-report-plugin - mng3743-lifecycle + maven-mng3743-check-plugin + maven-mng3743-report-plugin + mng3743-lifecycle diff --git a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml b/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml index da8d2a31a5..df396ecec2 100644 --- a/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml @@ -36,7 +36,7 @@ under the License. - + org.apache.maven.its.mng3814 maven-mng3814b-plugin 1.0 @@ -47,7 +47,7 @@ under the License. - + org.apache.maven.its.mng3814 maven-mng3814b-plugin 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom index a03fc9af74..694241d6bd 100644 --- a/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom +++ b/its/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom @@ -4,11 +4,11 @@ org.apache.maven.its.mng4148 module 1.0.0 - - - org.apache.maven.its.mng4148 - dep - ${depVersion} - - + + + org.apache.maven.its.mng4148 + dep + ${depVersion} + + diff --git a/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java index 027cdbd617..a713f691a1 100644 --- a/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java +++ b/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java index d2f3c7f838..1c1abf17a4 100644 --- a/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java @@ -1,20 +1,20 @@ /* - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. */ package org.apache.maven.its.mng3506; diff --git a/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java b/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java index 81ca4296ae..89a876461f 100644 --- a/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java +++ b/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java @@ -23,7 +23,7 @@ public class App { public static void main( String[] args ) { - Importing.main( args ); + Importing.main( args ); System.out.println( "Hello World!" ); } } diff --git a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml index a544e8f02b..fc9eae4105 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml index 8be7a1f57f..829c384b02 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml index a544e8f02b..fc9eae4105 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml index 8be7a1f57f..829c384b02 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml index 78ab4e9fca..959944e129 100755 --- a/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml @@ -1,26 +1,26 @@ - - bugs.maven.issue - master - x-SNAPSHOT - + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + bugs.maven.issue + master + x-SNAPSHOT + - 4.0.0 - application - 1-SNAPSHOT - jar - Issue Application - + 4.0.0 + application + 1-SNAPSHOT + jar + Issue Application + - - - bugs.maven.issue - delegate - - + + + bugs.maven.issue + delegate + + diff --git a/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml index 4840108a46..ff0ec0e91b 100755 --- a/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - delegate - 2-SNAPSHOT + delegate + 2-SNAPSHOT jar Issue EJB Delegate @@ -19,9 +19,9 @@ bugs.maven.issue - ejb - client - ejb-client + ejb + client + ejb-client diff --git a/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml index a684defb45..12f5b12874 100755 --- a/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml @@ -1,43 +1,43 @@ - - bugs.maven.issue - master - x-SNAPSHOT - + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + bugs.maven.issue + master + x-SNAPSHOT + - 4.0.0 - ejb - 2-SNAPSHOT - ejb - Issue EJB - + 4.0.0 + ejb + 2-SNAPSHOT + ejb + Issue EJB + - - - - - maven-ejb-plugin - - - - true - - - - - - - + + + + + maven-ejb-plugin + + + + true + + + + + + + - - - commons-lang - commons-lang - - + + + commons-lang + commons-lang + + diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom index 44429b2cf1..6a0c0b1bc7 100755 --- a/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom +++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom @@ -1,28 +1,28 @@ - - bugs.maven.issue - master - 1 - + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + bugs.maven.issue + master + 1 + - 4.0.0 - delegate - 1 - jar - Issue EJB Delegate - + 4.0.0 + delegate + 1 + jar + Issue EJB Delegate + - - - bugs.maven.issue - ejb - client - ejb-client - - + + + bugs.maven.issue + ejb + client + ejb-client + + diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom index 7c5703595d..51f520c1ff 100755 --- a/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom +++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom @@ -1,43 +1,43 @@ - - bugs.maven.issue - master - 1 - + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + bugs.maven.issue + master + 1 + - 4.0.0 - ejb - 1 - ejb - Issue EJB - + 4.0.0 + ejb + 1 + ejb + Issue EJB + - - - - - maven-ejb-plugin - - - - true - - - - - - - + + + + + maven-ejb-plugin + + + + true + + + + + + + - - - commons-lang - commons-lang - - + + + commons-lang + commons-lang + + diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom index 5de9921d0e..3b0b082b0e 100644 --- a/its/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom +++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom @@ -1,256 +1,256 @@ - 4.0.0 + 4.0.0 - - bugs.maven.issue - master - pom + + bugs.maven.issue + master + pom - - Master Project - 1 - Master project with global settings. + + Master Project + 1 + Master project with global settings. - - - 2.2.1 - + + + 2.2.1 + - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${version.org.apache.maven.plugins.assembly} - true - - false - true - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - true - - ${java.version.source} - ${java.version.target} - ${project.build.sourceEncoding} - false - true - true - - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency} - true - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-ear-plugin - ${version.org.apache.maven.plugins.ear} - - / - ${project.name} - - false - - true - true - - - - - - org.apache.maven.plugins - maven-ejb-plugin - ${version.org.apache.maven.plugins.ejb} - - true - ${java.ejb.version} - - META-INF/*.xml - **/ejb/*Bean.class - - - false - - true - false - true - true - - - - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - - false - - ${*} - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - attach-sources - package - - jar-no-fork - - - - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - true - - - once - -Xms64m -Xmx128m - ${basedir} - false - random - false - - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${version.org.apache.maven.plugins.assembly} + true + + false + true + + + + org.apache.maven.plugins + maven-clean-plugin + ${version.org.apache.maven.plugins.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + true + + ${java.version.source} + ${java.version.target} + ${project.build.sourceEncoding} + false + true + true + + + + org.apache.maven.plugins + maven-dependency-plugin + ${version.org.apache.maven.plugins.dependency} + true + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.org.apache.maven.plugins.deploy} + + + org.apache.maven.plugins + maven-ear-plugin + ${version.org.apache.maven.plugins.ear} + + / + ${project.name} + + false + + true + true + + + + + + org.apache.maven.plugins + maven-ejb-plugin + ${version.org.apache.maven.plugins.ejb} + + true + ${java.ejb.version} + + META-INF/*.xml + **/ejb/*Bean.class + + + false + + true + false + true + true + + + + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + false + + true + true + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + false + + ${*} + + + + + org.apache.maven.plugins + maven-source-plugin + ${version.org.apache.maven.plugins.source} + + + attach-sources + package + + jar-no-fork + + + + + + false + + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + true + + + once + -Xms64m -Xmx128m + ${basedir} + false + random + false + + - - org.codehaus.mojo - build-helper-maven-plugin - ${version.org.codehaus.mojo.build-helper-plugin} - true - - - - + + org.codehaus.mojo + build-helper-maven-plugin + ${version.org.codehaus.mojo.build-helper-plugin} + true + + + + - - - - bugs.maven.issue - application - ${version.application} - - - bugs.maven.issue - delegate - ${version.delegate} - - - - bugs.maven.issue - ejb - ${version.ejb} - client - ejb-client - + + + + bugs.maven.issue + application + ${version.application} + + + bugs.maven.issue + delegate + ${version.delegate} + + + + bugs.maven.issue + ejb + ${version.ejb} + client + ejb-client + - - commons-lang - commons-lang - ${version.commons-lang} - - - + + commons-lang + commons-lang + ${version.commons-lang} + + + - - - - - - 1.6 - 1.6 - 2.1 + + + + + + 1.6 + 1.6 + 2.1 - - - - 2.2.1 - 2.4.1 - 2.3.2 - 2.3 - 2.7 - 2.6 - 2.3 - 2.3.1 - 2.3.2 - 2.5 - 2.1.2 - 2.9 + + + + 2.2.1 + 2.4.1 + 2.3.2 + 2.3 + 2.7 + 2.6 + 2.3 + 2.3.1 + 2.3.2 + 2.5 + 2.1.2 + 2.9 - 1.7 + 1.7 - - - - 1-SNAPSHOT - 1 - 1 + + + + 1-SNAPSHOT + 1 + 1 - 2.4 + 2.4 - iso-8859-1 - + iso-8859-1 + diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom index 0de53bcc6f..5d5999f28b 100644 --- a/its/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom +++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom @@ -1,256 +1,256 @@ - 4.0.0 + 4.0.0 - - bugs.maven.issue - master - pom + + bugs.maven.issue + master + pom - - Master Project - x-SNAPSHOT - Master project with global settings. + + Master Project + x-SNAPSHOT + Master project with global settings. - - - 2.2.1 - + + + 2.2.1 + - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${version.org.apache.maven.plugins.assembly} - true - - false - true - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - true - - ${java.version.source} - ${java.version.target} - ${project.build.sourceEncoding} - false - true - true - - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency} - true - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-ear-plugin - ${version.org.apache.maven.plugins.ear} - - / - ${project.name} - - false - - true - true - - - - - - org.apache.maven.plugins - maven-ejb-plugin - ${version.org.apache.maven.plugins.ejb} - - true - ${java.ejb.version} - - META-INF/*.xml - **/ejb/*Bean.class - - - false - - true - false - true - true - - - - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - - false - - ${*} - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - attach-sources - package - - jar-no-fork - - - - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - true - - - once - -Xms64m -Xmx128m - ${basedir} - false - random - false - - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${version.org.apache.maven.plugins.assembly} + true + + false + true + + + + org.apache.maven.plugins + maven-clean-plugin + ${version.org.apache.maven.plugins.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + true + + ${java.version.source} + ${java.version.target} + ${project.build.sourceEncoding} + false + true + true + + + + org.apache.maven.plugins + maven-dependency-plugin + ${version.org.apache.maven.plugins.dependency} + true + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.org.apache.maven.plugins.deploy} + + + org.apache.maven.plugins + maven-ear-plugin + ${version.org.apache.maven.plugins.ear} + + / + ${project.name} + + false + + true + true + + + + + + org.apache.maven.plugins + maven-ejb-plugin + ${version.org.apache.maven.plugins.ejb} + + true + ${java.ejb.version} + + META-INF/*.xml + **/ejb/*Bean.class + + + false + + true + false + true + true + + + + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + false + + true + true + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + false + + ${*} + + + + + org.apache.maven.plugins + maven-source-plugin + ${version.org.apache.maven.plugins.source} + + + attach-sources + package + + jar-no-fork + + + + + + false + + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + true + + + once + -Xms64m -Xmx128m + ${basedir} + false + random + false + + - - org.codehaus.mojo - build-helper-maven-plugin - ${version.org.codehaus.mojo.build-helper-plugin} - true - - - - + + org.codehaus.mojo + build-helper-maven-plugin + ${version.org.codehaus.mojo.build-helper-plugin} + true + + + + - - - - bugs.maven.issue - application - ${version.application} - - - bugs.maven.issue - delegate - ${version.delegate} - - - - bugs.maven.issue - ejb - ${version.ejb} - client - ejb-client - + + + + bugs.maven.issue + application + ${version.application} + + + bugs.maven.issue + delegate + ${version.delegate} + + + + bugs.maven.issue + ejb + ${version.ejb} + client + ejb-client + - - commons-lang - commons-lang - ${version.commons-lang} - - - + + commons-lang + commons-lang + ${version.commons-lang} + + + - - - - - - 1.6 - 1.6 - 2.1 + + + + + + 1.6 + 1.6 + 2.1 - - - - 2.2.1 - 2.4.1 - 2.3.2 - 2.3 - 2.7 - 2.6 - 2.3 - 2.3.1 - 2.3.2 - 2.5 - 2.1.2 - 2.9 + + + + 2.2.1 + 2.4.1 + 2.3.2 + 2.3 + 2.7 + 2.6 + 2.3 + 2.3.1 + 2.3.2 + 2.5 + 2.1.2 + 2.9 - 1.7 + 1.7 - - - - 1-SNAPSHOT - 1 - 2-SNAPSHOT + + + + 1-SNAPSHOT + 1 + 2-SNAPSHOT - 2.6 + 2.6 - iso-8859-1 - + iso-8859-1 + diff --git a/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml index 3008959760..6bee01a6e1 100644 --- a/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml @@ -59,11 +59,11 @@ under the License. resolve-one-dependency - compile - ${project.groupId} - dependency - ${project.version} - wsdl + compile + ${project.groupId} + dependency + ${project.version} + wsdl diff --git a/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml index b61243b158..364afbb708 100644 --- a/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml @@ -44,38 +44,38 @@ under the License. createWsdl - - org.apache.maven.its.plugins - maven-it-plugin-artifact - 2.1-SNAPSHOT - - - attach-artifacts - generate-resources - - attach - - - notmuch.wsdl - wsdl - - - - install - generate-resources - - pom.xml - - pom.xml - - - set - attach-pom - install - - - - + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + + attach-artifacts + generate-resources + + attach + + + notmuch.wsdl + wsdl + + + + install + generate-resources + + pom.xml + + pom.xml + + + set + attach-pom + install + + + + diff --git a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java index 03eb201053..519c5b13f8 100644 --- a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java +++ b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java @@ -24,10 +24,11 @@ import org.apache.maven.its.mng5581.lifecyclemappingdelegate.basic.BasicClass; import org.junit.Assert; import org.junit.Test; -public class ModuleBTest { - - @Test - public void testBasic() { - Assert.assertNotNull(new BasicClass().toString()); - } +public class ModuleBTest +{ + @Test + public void testBasic() + { + Assert.assertNotNull(new BasicClass().toString()); + } } diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml index 1f8961164c..8104eb18ff 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml index 5ba7ab2fea..b64336a958 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml index b0b7f41eb5..84845954f5 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml index 9ce20e6a94..3a501b6efd 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml index 1f8961164c..8104eb18ff 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml index 5ba7ab2fea..b64336a958 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml @@ -39,7 +39,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml index b0b7f41eb5..84845954f5 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml @@ -47,7 +47,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml index 92b590aef9..8f0f72118b 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml @@ -44,7 +44,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml index 2135ffa3b1..195303d8c7 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml @@ -44,7 +44,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent-1/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent-1/pom.xml index 6d8ff0ae9a..319f66d682 100644 --- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent-1/pom.xml @@ -8,7 +8,7 @@ pom - true + true diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent-1/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent-1/pom.xml index 365b88f2bf..ed7b0ef930 100644 --- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent-1/pom.xml @@ -8,7 +8,7 @@ pom - + diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent-1/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent-1/pom.xml index 3a804460fa..8c460bf745 100644 --- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent-1/pom.xml @@ -8,7 +8,7 @@ pom - true + true diff --git a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml index e9ac53d817..608fc55ac9 100644 --- a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml @@ -22,11 +22,11 @@ under the License. 4.0.0 - - mng-5895-ci-friendly-usage-with-property - base-project - ${revision} - + + mng-5895-ci-friendly-usage-with-property + base-project + ${revision} + module-1 diff --git a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml index 5a7dabeb29..f2ac11cfd9 100644 --- a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml @@ -1,33 +1,33 @@ + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - mng-5895-ci-friendly-usage-with-property - base-project - ${revision} - - module-2 + + mng-5895-ci-friendly-usage-with-property + base-project + ${revision} + + module-2 - - - mng-5895-ci-friendly-usage-with-property - module-1 - ${project.version} - - + + + mng-5895-ci-friendly-usage-with-property + module-1 + ${project.version} + + diff --git a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml index b6da84b8ba..9c0aabf2f0 100644 --- a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml @@ -1,56 +1,56 @@ + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - mng-5895-ci-friendly-usage-with-property - base-project - ${revision} - - module-3 + + mng-5895-ci-friendly-usage-with-property + base-project + ${revision} + + module-3 - - - mng-5895-ci-friendly-usage-with-property - module-2 - ${project.version} - - + + + mng-5895-ci-friendly-usage-with-property + module-2 + ${project.version} + + - - org.apache.maven.plugins - maven-assembly-plugin - - - assemblies - package - - single - - - - jar-with-prod.xml - - - - - + + org.apache.maven.plugins + maven-assembly-plugin + + + assemblies + package + + single + + + + jar-with-prod.xml + + + + + - - + + diff --git a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml index 842a0167e2..e3d34da11f 100644 --- a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml @@ -29,7 +29,7 @@ under the License. pom - 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml b/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml index fe4baff346..d82ea652ea 100644 --- a/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml @@ -22,11 +22,11 @@ under the License. 4.0.0 - - mng-6057-check-reactor-order - base-project - ${revision} - + + mng-6057-check-reactor-order + base-project + ${revision} + module-1 pom diff --git a/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml index d33c1c96d5..d82b1b947e 100644 --- a/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml @@ -23,11 +23,11 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - mng-6057-check-reactor-order - base-project - ${revision} - + + mng-6057-check-reactor-order + base-project + ${revision} + module-2 diff --git a/its/core-it-suite/src/test/resources/mng-6071/pom.xml b/its/core-it-suite/src/test/resources/mng-6071/pom.xml index 53e0536e89..9704eee08d 100644 --- a/its/core-it-suite/src/test/resources/mng-6071/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6071/pom.xml @@ -31,7 +31,7 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml index b0577aaab5..f08d2152b4 100644 --- a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml @@ -22,11 +22,11 @@ under the License. 4.0.0 - + mng-6090-ci-friendly - base-project - ${revision} - + base-project + ${revision} + module-1 diff --git a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml index 1dae572901..e29d71c5b1 100644 --- a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml @@ -1,33 +1,33 @@ + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - mng-6090-ci-friendly - base-project - ${revision} - - module-2 + + mng-6090-ci-friendly + base-project + ${revision} + + module-2 - - - mng-6090-ci-friendly - module-1 - ${project.version} - - + + + mng-6090-ci-friendly + module-1 + ${project.version} + + diff --git a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml index b137e92885..f3f5ea119a 100644 --- a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml @@ -1,57 +1,57 @@ + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - mng-6090-ci-friendly - base-project - ${revision} - - module-3 + + mng-6090-ci-friendly + base-project + ${revision} + + module-3 - - - mng-6090-ci-friendly - module-2 - ${project.version} - - + + + mng-6090-ci-friendly + module-2 + ${project.version} + + - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.0 - - - assemblies - package - - single - - - - jar-with-prod.xml - - - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + + + assemblies + package + + single + + + + jar-with-prod.xml + + + + + - - + + diff --git a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml index 4f3ec82f21..17627bf099 100644 --- a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml @@ -29,7 +29,7 @@ under the License. pom - 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT module-3 diff --git a/its/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/project/pom.xml b/its/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/project/pom.xml index 66a15c8f41..5b8ac7e0f7 100644 --- a/its/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/project/pom.xml @@ -36,7 +36,7 @@ under the License. - + org.apache.maven.its.mng6240 plugin-extension 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom index ecef8df8b8..8a924235aa 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom @@ -18,9 +18,9 @@ under the License. --> 4.0.0 - org.sonatype.mavenbook.multi - parent - 0.9-MNG6656-SNAPSHOT + org.sonatype.mavenbook.multi + parent + 0.9-MNG6656-SNAPSHOT simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml index e2219e3e51..2fbd5b2032 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml @@ -24,8 +24,8 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.sonatype.mavenbook.multi - parent + org.sonatype.mavenbook.multi + parent simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml index 63e41c431e..4c555bb0c2 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml @@ -42,7 +42,7 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml index 94296f6372..cd90ff061c 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml @@ -42,7 +42,7 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml index 102703fa8f..cdb4a85aa6 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml index 02ddb8d7c6..cdab5b637f 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml @@ -43,7 +43,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml index 36772b6cfe..428eaeb3a6 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml @@ -43,7 +43,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin 2.22.0 - + diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom index 843f219e93..69c705edd9 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom @@ -18,9 +18,9 @@ under the License. --> 4.0.0 - org.sonatype.mavenbook.multi - parent - 0.9-MNG6957-SNAPSHOT + org.sonatype.mavenbook.multi + parent + 0.9-MNG6957-SNAPSHOT simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom index 934ac75f5b..29064fdbcf 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom @@ -18,9 +18,9 @@ under the License. --> 4.0.0 - org.sonatype.mavenbook.multi - simple-parent - 0.9-MNG6957-SNAPSHOT + org.sonatype.mavenbook.multi + simple-parent + 0.9-MNG6957-SNAPSHOT utils-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml index 1d428c00af..40c8b0f3ce 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml @@ -24,8 +24,8 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.sonatype.mavenbook.multi - parent + org.sonatype.mavenbook.multi + parent simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml index d1d0c6ea98..cff9f65a72 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml @@ -24,8 +24,8 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.sonatype.mavenbook.multi - simple-parent + org.sonatype.mavenbook.multi + simple-parent utils-parent pom