diff --git a/compat/maven-embedder/src/examples/simple-project/pom.xml b/compat/maven-embedder/src/examples/simple-project/pom.xml index 0f8deb0dadba..d466107ebdaf 100644 --- a/compat/maven-embedder/src/examples/simple-project/pom.xml +++ b/compat/maven-embedder/src/examples/simple-project/pom.xml @@ -26,12 +26,12 @@ under the License. simple-project http://maven.apache.org - - junit - junit - 4.13.1 - test - + + org.junit.jupiter + junit-jupiter-api + 5.14.0 + test + development diff --git a/compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java index f51498061130..a0305a23aa25 100644 --- a/compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java +++ b/compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java @@ -19,39 +19,19 @@ package org.apache.maven.embedder; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } +public class AppTest { /** - * @return the suite of tests being tested + * Rigourous Test :-) */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigorous Test :-) - */ - public void testApp() - { - assertTrue( true ); + @Test + public void testApp() { + assertTrue(true); } } + diff --git a/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java index b1ae1ed5eeb1..ffedfa796fb2 100644 --- a/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java +++ b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java @@ -1,38 +1,18 @@ package org.apache.maven.lifecycle.test; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } +public class AppTest { /** - * @return the suite of tests being tested + * Rigourous Test :-) */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigorous Test :-) - */ - public void testApp() - { - assertTrue( true ); + @Test + public void testApp() { + assertTrue(true); } } + diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml deleted file mode 100644 index 23ed449b710c..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - child - - grandchild1 - jar - grandchild1 - - - - org.apache.maven.its.mng624.depmgmt - grandchild2 - - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index 573876cdc76b..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello " + World.getWorld()); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml deleted file mode 100644 index f0680e98a99a..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - child - - grandchild2 - jar - grandchild2 - diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java deleted file mode 100644 index 21d290aceaaf..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class World { - public static String getWorld() { - return "earth"; - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml deleted file mode 100644 index 9bc2b5248ed4..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - parent - - child - pom - child - - grandchild1 - grandchild2 - - - - - - org.apache.maven.its.mng624.depmgmt - grandchild2 - ${ver} - - - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml deleted file mode 100644 index d3500c58dc74..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.depmgmt - parent - 1 - pom - mng624 parent - - child - - - - - topaz - http://gandalf.topazproject.org/maven2/ - - - - - 1 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml deleted file mode 100644 index 171d352a804d..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child1 - jar - mng624 child1 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml deleted file mode 100644 index 58549c2c94f1..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child1 - jar - mng624 child1 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml deleted file mode 100644 index f1c7b716ceb1..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child2 - - org.apache.maven.its.mng624.opt - grandchild - jar - mng624 grandchild - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml deleted file mode 100644 index 97af85eeece3..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child2 - pom - mng624 child2 - - grandchild - ../grandchild2 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml deleted file mode 100644 index a3b5c28dad43..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child3 - - org.apache.maven.its.mng624.opt - child3child - jar - mng624 child3child - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml deleted file mode 100644 index 36178818a1ba..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child3 - 2 - pom - mng624 child3 - - child3child - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml deleted file mode 100644 index 7dc848c0cddb..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child4 - jar - mng624 child4 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml deleted file mode 100644 index d501768a1b90..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child2 - ../child2/pom.xml - - org.apache.maven.its.mng624.opt - grandchild2 - jar - mng624 grandchild2 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml deleted file mode 100644 index 8223eb3e4173..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.opt - parent - 1 - pom - mng624 parent - - child1 - child2 - child3 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml deleted file mode 100644 index 91da4c3fcb33..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic-parent - ${mng0624ParentPom} - ../parent - - org.apache.maven.its.mng0624 - maven-it-mng0624-main - 1.0 - Maven Integration Test :: mng0624 :: Main - diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java deleted file mode 100644 index 9a42e9418081..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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 mng0624; - -public class Hello { - public void helloWorld() { - System.out.println("Hello World!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java deleted file mode 100644 index 70f6064c7058..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 - * - * 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 mng0624; - -import junit.framework.TestCase; - -public class HelloTest extends TestCase { - public void testHello() throws Exception { - Hello hello = new Hello(); - hello.helloWorld(); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml deleted file mode 100644 index 3a7bbb408fcd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic - ${mng0624pom} - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic-parent - 1.1 - pom - Maven Integration Test :: mng0624 :: Parent - - - junit - junit - 3.8.1 - test - - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml deleted file mode 100644 index c2d2652331a0..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng0624 - maven-it-mng0624-basic - 1.0 - pom - Maven Integration Test :: mng0624 - Test that child can get its parent without specifying a version - - parent - main - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml deleted file mode 100644 index f3b9b7058fad..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.simple - myproject - - child - jar - mng624 simple child - - - - test - - - - maven-antrun-plugin - - - - run - - install - - - hello world - - - - - - - - - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/simple/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/simple/pom.xml deleted file mode 100644 index 5624529f3bb1..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/simple/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.simple - myproject - 1 - pom - mng624 myproject - - - child - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml deleted file mode 100644 index 171d352a804d..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child1 - jar - mng624 child1 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml deleted file mode 100644 index e3b65cbb817e..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child2 - ${ver} - - org.apache.maven.its.mng624 - grandchild - jar - mng624 grandchild - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml deleted file mode 100644 index 1cc4230c70b5..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child2 - pom - mng624 child2 - - grandchild - ../grandchild2 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml deleted file mode 100644 index 43681649a061..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child3 - 2 - - org.apache.maven.its.mng624 - child3child - jar - mng624 child3child - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml deleted file mode 100644 index d3ead2ade8a3..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child3 - 2 - pom - mng624 child3 - - child3child - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml deleted file mode 100644 index bea5ead37a09..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child4 - jar - mng624 child4 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml deleted file mode 100644 index 4b0f02ee6764..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child2 - ${ver} - ../child2/pom.xml - - org.apache.maven.its.mng624 - grandchild2 - jar - mng624 grandchild2 - - diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1cbd..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - * - * 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.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml b/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml deleted file mode 100644 index d04b75090dc8..000000000000 --- a/its/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624 - parent - ${ver} - pom - mng624 parent - - child1 - child2 - child3 - - - - 1 - - diff --git a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java index f870d71efca9..f3de7dbe131e 100644 --- a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java @@ -18,34 +18,4 @@ */ package com.stchome.mavenTest.it0096; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} +public class AppTest {} diff --git a/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml b/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml deleted file mode 100644 index 223e73ab8666..000000000000 --- a/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - 4.0.0 - - org.codehaus.jira.mng.2289 - parent - SNAPSHOT - - mng-issue-2289 - SNAPSHOT - jar - Issue 2289 - - - - - commons-logging - commons-logging - - - - 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 deleted file mode 100644 index 5c7d373ac769..000000000000 --- a/its/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 - * - * 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 mng; - -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); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml b/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml deleted file mode 100644 index ef6d1f6015ae..000000000000 --- a/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - org.codehaus.jira.mng.2289 - parent - pom - Parent POM for issue 2289 - SNAPSHOT - 2006 - - - - - - - - commons-logging - commons-logging - 1.0.1 - - - - - - - - false - - - true - always - - local-snapshot-repo - Local snapshot repository - file:///tmp/repo-m2-snapshot - - - - - - - demo-snapshot - Demo Maven 2 snapshot repository - file:///tmp/repo-m2-snapshot - false - - - diff --git a/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml b/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml deleted file mode 100644 index 59df0fadbf12..000000000000 --- a/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - org.codehaus.jira.mng.2289 - parent - pom - Parent POM for issue 2289 - SNAPSHOT - 2006 - - - - - - - - - commons-logging - commons-logging - 1.0.2 - - - - - - - - false - - - true - always - - local-snapshot-repo - Local snapshot repository - file:///tmp/repo-m2-snapshot - - - - - - - demo-snapshot - Demo Maven 2 snapshot repository - file:///tmp/repo-m2-snapshot - false - - - diff --git a/its/core-it-suite/src/test/resources/mng-2289/test.sh b/its/core-it-suite/src/test/resources/mng-2289/test.sh deleted file mode 100755 index 05fe4670bb5a..000000000000 --- a/its/core-it-suite/src/test/resources/mng-2289/test.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# We want to test that after changing the parent POM which is a SNAPSHOT, it is used for any children. - -dir=`pwd` - -mvn="mvn" -repo="$HOME/maven-repo-local" - -# Remove commons-logging all together -rm -rf $repo/commons-logging -# Deploy the parent POM in our file-based remote repository -( cd parent ; $mvn -f pom1.xml deploy ) -# Run the compile phase for the child project. This will bring down commons-logging 1.0.1 -( cd issue; $mvn compile ) -# Deploy the parent POM with an update version of the commons-logging dependency -> 1.0.2 - -read - -( cd parent ; $mvn -f pom2.xml deploy ) -# Move the original commons-logging deps out of the way -mv $repo/commons-logging $repo/commons-logging-1.0.1 -# Run the child project again and the new version of commons-logging should come down -( cd issue; $mvn compile ) - diff --git a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml index 25a0dc9332ca..aecd6ef2888f 100644 --- a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml @@ -13,9 +13,9 @@ 1.0 - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java index daa8c8adde72..2ee8271063e0 100644 --- a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java @@ -21,9 +21,12 @@ import java.io.PrintWriter; import java.io.StringWriter; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class AppTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class AppTest { + @Test public void testOutput() { App app = new App(); StringWriter actual = new StringWriter(); diff --git a/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/pom.xml index 1312d7a138a1..decf0194551d 100644 --- a/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/pom.xml @@ -9,9 +9,9 @@ http://maven.apache.org - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/src/test/java/org/test/AppTest.java b/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/src/test/java/org/test/AppTest.java index 19f6ffd44092..90e06ec136a0 100644 --- a/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/src/test/java/org/test/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/project/src/test/java/org/test/AppTest.java @@ -18,33 +18,19 @@ */ package org.test; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3485/pom.xml b/its/core-it-suite/src/test/resources/mng-3485/pom.xml index 974894b27622..097d6e223a29 100644 --- a/its/core-it-suite/src/test/resources/mng-3485/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3485/pom.xml @@ -14,9 +14,9 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java b/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java index 4406338fb9d1..dab62171b468 100644 --- a/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java @@ -18,33 +18,19 @@ */ package org.apache.maven.its.mng3485; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml index 483d4426a59c..bf44bff90ca0 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml @@ -31,9 +31,9 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test 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 901f8d216cfb..30da1ca0593f 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 @@ -18,33 +18,18 @@ */ package org.apache.maven.its.mng3506; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml index d68d6e9ca08f..6e1aa9ca2ba9 100644 --- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml @@ -29,9 +29,9 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test 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 901f8d216cfb..de9f7981b9e3 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 @@ -18,33 +18,19 @@ */ package org.apache.maven.its.mng3506; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3671/pom.xml b/its/core-it-suite/src/test/resources/mng-3671/pom.xml index c373caeaadeb..f4340c4b755a 100644 --- a/its/core-it-suite/src/test/resources/mng-3671/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3671/pom.xml @@ -8,9 +8,9 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java b/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java index 8d45fed1a552..94c816a80726 100644 --- a/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java @@ -18,33 +18,19 @@ */ package testing; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/pom.xml index 973010801cb3..7e514eaa97df 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/pom.xml @@ -8,9 +8,9 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java index 5abee27b21a8..80cf39b678c9 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java @@ -18,33 +18,19 @@ */ package tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml index 4d1449f8abc9..9df425e26581 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml @@ -8,9 +8,9 @@ - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java index 5abee27b21a8..80cf39b678c9 100644 --- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java @@ -18,33 +18,19 @@ */ package tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-4270/pom.xml b/its/core-it-suite/src/test/resources/mng-4270/pom.xml index 664da6cbce18..59a8d98d95a0 100644 --- a/its/core-it-suite/src/test/resources/mng-4270/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4270/pom.xml @@ -27,9 +27,9 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test 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 901f8d216cfb..de9f7981b9e3 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 @@ -18,33 +18,19 @@ */ package org.apache.maven.its.mng3506; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-5338/project/pom.xml b/its/core-it-suite/src/test/resources/mng-5338/project/pom.xml index 4969bf2854af..09399002a17b 100644 --- a/its/core-it-suite/src/test/resources/mng-5338/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5338/project/pom.xml @@ -16,9 +16,9 @@ - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java b/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java index de1b691145f2..1b0129c5756f 100644 --- a/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java @@ -18,33 +18,19 @@ */ package org.apache.maven.its.mng5338; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); } diff --git a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/pom.xml b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/pom.xml index 9f7483e00b0c..113dfe911809 100644 --- a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/pom.xml @@ -32,9 +32,9 @@ under the License. compile - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test diff --git a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/src/test/java/org/apache/maven/its/mng5640/FailingTest.java b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/src/test/java/org/apache/maven/its/mng5640/FailingTest.java index 220e2478eda8..e00fd3544f1a 100644 --- a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/src/test/java/org/apache/maven/its/mng5640/FailingTest.java +++ b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-depmissing/src/test/java/org/apache/maven/its/mng5640/FailingTest.java @@ -18,15 +18,18 @@ */ package org.apache.maven.its.mng5640; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Always failing UT. */ -public class FailingTest extends TestCase { +public class FailingTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(false); } diff --git a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java index 220e2478eda8..e00fd3544f1a 100644 --- a/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java +++ b/its/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java @@ -18,15 +18,18 @@ */ package org.apache.maven.its.mng5640; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Always failing UT. */ -public class FailingTest extends TestCase { +public class FailingTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(false); }