This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-jar-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/maven-jar-plugin-3.x by this
push:
new 06a6245 chore: remove junit3 references
06a6245 is described below
commit 06a6245f7a4874dbab3fcd60d1903cf297a78f90
Author: Sandra Parsick <[email protected]>
AuthorDate: Mon Oct 27 11:21:53 2025 +0100
chore: remove junit3 references
(cherry picked from commit 2c75fc9f84b2bfd49624e67a8faa099686184d3d)
with cleanups
---
src/it/MJAR-162/pom.xml | 8 ---
src/it/MJAR-30-excludes/pom.xml | 10 +---
.../src/test/java/foo/project003/AppTest.java | 57 ----------------------
.../src/test/resources/excluded-file.txt | 18 -------
.../test-default-configuration.properties | 16 ------
src/it/MJAR-30-fullcontent/pom.xml | 13 +----
.../src/test/java/foo/project001/AppTest.java | 57 ----------------------
.../test-default-configuration.properties | 16 ------
src/it/MJAR-30-include/pom.xml | 2 +-
src/it/MJAR-62-toolchain/pom.xml | 8 ---
src/it/MJAR-80-exclude/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 37 +-------------
.../src/test/java/foo/project003/AppTest.java | 37 +-------------
src/it/MJAR-80-fullcontent/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 37 +-------------
.../src/test/java/foo/project003/AppTest.java | 37 +-------------
src/it/MJAR-80-include/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 27 +---------
.../src/test/java/foo/project003/AppTest.java | 37 +-------------
src/it/mjar-139/pom.xml | 8 ---
src/it/mjar-90/pom.xml | 10 +---
src/it/mjar-90/src/test/java/FooTest.java | 17 +------
src/it/project-004/pom.xml | 2 +-
23 files changed, 16 insertions(+), 468 deletions(-)
diff --git a/src/it/MJAR-162/pom.xml b/src/it/MJAR-162/pom.xml
index cd26816..ceffdec 100644
--- a/src/it/MJAR-162/pom.xml
+++ b/src/it/MJAR-162/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Avoid creating jars</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
diff --git a/src/it/MJAR-30-excludes/pom.xml b/src/it/MJAR-30-excludes/pom.xml
index 5273879..ef72f92 100644
--- a/src/it/MJAR-30-excludes/pom.xml
+++ b/src/it/MJAR-30-excludes/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Tests excludes.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -51,7 +43,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java
b/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java
deleted file mode 100644
index d8d8a33..0000000
--- a/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package foo.project003;
-
-/*
- * 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.
- */
-
-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 );
- }
-}
diff --git a/src/it/MJAR-30-excludes/src/test/resources/excluded-file.txt
b/src/it/MJAR-30-excludes/src/test/resources/excluded-file.txt
deleted file mode 100644
index bd1a364..0000000
--- a/src/it/MJAR-30-excludes/src/test/resources/excluded-file.txt
+++ /dev/null
@@ -1,18 +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.
-
-This file is excluded by the custom configuration, so shouldn't end up in the
end product
\ No newline at end of file
diff --git
a/src/it/MJAR-30-excludes/src/test/resources/test-default-configuration.properties
b/src/it/MJAR-30-excludes/src/test/resources/test-default-configuration.properties
deleted file mode 100644
index 13a8339..0000000
---
a/src/it/MJAR-30-excludes/src/test/resources/test-default-configuration.properties
+++ /dev/null
@@ -1,16 +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.
diff --git a/src/it/MJAR-30-fullcontent/pom.xml
b/src/it/MJAR-30-fullcontent/pom.xml
index b66d6f9..2479fb6 100644
--- a/src/it/MJAR-30-fullcontent/pom.xml
+++ b/src/it/MJAR-30-fullcontent/pom.xml
@@ -26,17 +26,8 @@
<artifactId>maven-jar-plugin-test-mjar-30-01</artifactId>
<version>99.0</version>
<name>Maven</name>
- <packaging>jar</packaging>
- <url>http://maven.apache.org</url>
<description>Tests the normal behavior of jar-plugin.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <url>http://maven.apache.org</url>
<build>
<plugins>
<plugin>
@@ -46,7 +37,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git
a/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java
b/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java
deleted file mode 100644
index 2f8bb48..0000000
--- a/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package foo.project001;
-
-/*
- * 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.
- */
-
-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 );
- }
-}
diff --git
a/src/it/MJAR-30-fullcontent/src/test/resources/test-default-configuration.properties
b/src/it/MJAR-30-fullcontent/src/test/resources/test-default-configuration.properties
deleted file mode 100644
index 13a8339..0000000
---
a/src/it/MJAR-30-fullcontent/src/test/resources/test-default-configuration.properties
+++ /dev/null
@@ -1,16 +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.
diff --git a/src/it/MJAR-30-include/pom.xml b/src/it/MJAR-30-include/pom.xml
index 6fb1dd9..9eb4a97 100644
--- a/src/it/MJAR-30-include/pom.xml
+++ b/src/it/MJAR-30-include/pom.xml
@@ -42,7 +42,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/MJAR-62-toolchain/pom.xml b/src/it/MJAR-62-toolchain/pom.xml
index 610d560..6b2648b 100644
--- a/src/it/MJAR-62-toolchain/pom.xml
+++ b/src/it/MJAR-62-toolchain/pom.xml
@@ -28,14 +28,6 @@
<name>jar plugin it</name>
</organization>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/src/it/MJAR-80-exclude/pom.xml b/src/it/MJAR-80-exclude/pom.xml
index d6b21e1..1e44fd9 100644
--- a/src/it/MJAR-80-exclude/pom.xml
+++ b/src/it/MJAR-80-exclude/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Tests excludes.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -58,7 +50,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git
a/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java
b/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java
index 7d434ec..26403fd 100644
---
a/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java
+++
b/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppIntegrationTest.java
@@ -19,39 +19,4 @@ package foo.project003;
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppIntegrationTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppIntegrationTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppIntegrationTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
+public class AppIntegrationTest {}
diff --git a/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java
b/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java
index d8d8a33..546e109 100644
--- a/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java
+++ b/src/it/MJAR-80-exclude/src/test/java/foo/project003/AppTest.java
@@ -19,39 +19,4 @@ package foo.project003;
* under the License.
*/
-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/src/it/MJAR-80-fullcontent/pom.xml
b/src/it/MJAR-80-fullcontent/pom.xml
index a971d64..bc3b324 100644
--- a/src/it/MJAR-80-fullcontent/pom.xml
+++ b/src/it/MJAR-80-fullcontent/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Tests the normal behavior of test-jar-plugin.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -53,7 +45,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git
a/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java
b/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java
index 7d434ec..26403fd 100644
---
a/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java
+++
b/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppIntegrationTest.java
@@ -19,39 +19,4 @@ package foo.project003;
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppIntegrationTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppIntegrationTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppIntegrationTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
+public class AppIntegrationTest {}
diff --git
a/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java
b/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java
index d8d8a33..546e109 100644
--- a/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java
+++ b/src/it/MJAR-80-fullcontent/src/test/java/foo/project003/AppTest.java
@@ -19,39 +19,4 @@ package foo.project003;
* under the License.
*/
-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/src/it/MJAR-80-include/pom.xml b/src/it/MJAR-80-include/pom.xml
index 869d34d..f02d235 100644
--- a/src/it/MJAR-80-include/pom.xml
+++ b/src/it/MJAR-80-include/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Tests includes.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -58,7 +50,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git
a/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java
b/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java
index 226669d..26403fd 100644
---
a/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java
+++
b/src/it/MJAR-80-include/src/test/java/foo/project003/AppIntegrationTest.java
@@ -19,29 +19,4 @@ package foo.project003;
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppIntegrationTest
- extends TestCase
-{
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppIntegrationTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
+public class AppIntegrationTest {}
diff --git a/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java
b/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java
index d8d8a33..546e109 100644
--- a/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java
+++ b/src/it/MJAR-80-include/src/test/java/foo/project003/AppTest.java
@@ -19,39 +19,4 @@ package foo.project003;
* under the License.
*/
-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/src/it/mjar-139/pom.xml b/src/it/mjar-139/pom.xml
index 77d57fb..feedbd4 100644
--- a/src/it/mjar-139/pom.xml
+++ b/src/it/mjar-139/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Avoid creating jars</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
diff --git a/src/it/mjar-90/pom.xml b/src/it/mjar-90/pom.xml
index eec5c6d..518979d 100644
--- a/src/it/mjar-90/pom.xml
+++ b/src/it/mjar-90/pom.xml
@@ -28,14 +28,6 @@
<name>Maven</name>
<packaging>jar</packaging>
<description>Test skip.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -56,7 +48,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
diff --git a/src/it/mjar-90/src/test/java/FooTest.java
b/src/it/mjar-90/src/test/java/FooTest.java
index af6cda9..05aea66 100644
--- a/src/it/mjar-90/src/test/java/FooTest.java
+++ b/src/it/mjar-90/src/test/java/FooTest.java
@@ -17,19 +17,4 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test
- */
-public class FooTest
- extends TestCase
-{
- public void testFoo()
- {
- assertTrue( true );
- }
-}
+public class FooTest {}
diff --git a/src/it/project-004/pom.xml b/src/it/project-004/pom.xml
index a3dee6e..962119e 100644
--- a/src/it/project-004/pom.xml
+++ b/src/it/project-004/pom.xml
@@ -52,7 +52,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
