This is an automated email from the ASF dual-hosted git repository.
sparsick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 2c75fc9 chore: remove junit3 references (#487)
2c75fc9 is described below
commit 2c75fc9f84b2bfd49624e67a8faa099686184d3d
Author: Sandra Parsick <[email protected]>
AuthorDate: Mon Oct 27 10:21:53 2025 +0000
chore: remove junit3 references (#487)
* chore: remove junit3 references
also update surefire version in it-tests
* refactor: replace hardcoded surefire version by property
---
pom.xml | 3 +
src/it/MJAR-30-excludes/pom.xml | 10 +---
.../src/test/java/foo/project003/AppTest.java | 70 ----------------------
.../src/test/resources/excluded-file.txt | 18 ------
.../test-default-configuration.properties | 16 -----
src/it/MJAR-30-fullcontent/pom.xml | 10 +---
.../src/test/java/foo/project001/AppTest.java | 70 ----------------------
.../test-default-configuration.properties | 16 -----
src/it/MJAR-30-include/pom.xml | 2 +-
src/it/MJAR-80-exclude/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 32 +---------
.../src/test/java/foo/project003/AppTest.java | 32 +---------
src/it/MJAR-80-fullcontent/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 32 +---------
.../src/test/java/foo/project003/AppTest.java | 32 +---------
src/it/MJAR-80-include/pom.xml | 10 +---
.../java/foo/project003/AppIntegrationTest.java | 23 +------
.../src/test/java/foo/project003/AppTest.java | 32 +---------
src/it/mjar-90/pom.xml | 10 +---
src/it/mjar-90/src/test/java/FooTest.java | 11 +---
src/it/project-004/pom.xml | 2 +-
21 files changed, 18 insertions(+), 433 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6a02bdc..1f4418f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,6 +237,9 @@
<goal>package</goal>
</goals>
<showErrors>true</showErrors>
+ <filterProperties>
+
<pluginPropertyUsedForFiltering>version.maven-surefire</pluginPropertyUsedForFiltering>
+ </filterProperties>
</configuration>
<executions>
<execution>
diff --git a/src/it/MJAR-30-excludes/pom.xml b/src/it/MJAR-30-excludes/pom.xml
index 45631ce..d1bcefc 100644
--- a/src/it/MJAR-30-excludes/pom.xml
+++ b/src/it/MJAR-30-excludes/pom.xml
@@ -25,14 +25,6 @@
<packaging>jar</packaging>
<name>Maven</name>
<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>
@@ -48,7 +40,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 43f793c..0000000
--- a/src/it/MJAR-30-excludes/src/test/java/foo/project003/AppTest.java
+++ /dev/null
@@ -1,70 +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 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 058ca62..ebe27ff 100644
--- a/src/it/MJAR-30-fullcontent/pom.xml
+++ b/src/it/MJAR-30-fullcontent/pom.xml
@@ -26,14 +26,6 @@
<name>Maven</name>
<description>Tests the normal behavior of jar-plugin.</description>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -43,7 +35,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 4a912ec..0000000
--- a/src/it/MJAR-30-fullcontent/src/test/java/foo/project001/AppTest.java
+++ /dev/null
@@ -1,70 +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 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 2afaca3..4538460 100644
--- a/src/it/MJAR-30-include/pom.xml
+++ b/src/it/MJAR-30-include/pom.xml
@@ -40,7 +40,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-80-exclude/pom.xml b/src/it/MJAR-80-exclude/pom.xml
index cba553c..efa5af7 100644
--- a/src/it/MJAR-80-exclude/pom.xml
+++ b/src/it/MJAR-80-exclude/pom.xml
@@ -25,14 +25,6 @@
<packaging>jar</packaging>
<name>Maven</name>
<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>
@@ -55,7 +47,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 87eb229..3b51a95 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
@@ -37,34 +37,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 43f793c..82c4166 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
@@ -37,34 +37,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 1f38a4c..b3e8e2a 100644
--- a/src/it/MJAR-80-fullcontent/pom.xml
+++ b/src/it/MJAR-80-fullcontent/pom.xml
@@ -25,14 +25,6 @@
<packaging>jar</packaging>
<name>Maven</name>
<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>
@@ -50,7 +42,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 87eb229..3b51a95 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
@@ -37,34 +37,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 43f793c..82c4166 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
@@ -37,34 +37,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 cb35fbc..6d6db38 100644
--- a/src/it/MJAR-80-include/pom.xml
+++ b/src/it/MJAR-80-include/pom.xml
@@ -25,14 +25,6 @@
<packaging>jar</packaging>
<name>Maven</name>
<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>
@@ -55,7 +47,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 b0ee598..3b51a95 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
@@ -37,25 +37,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 43f793c..82c4166 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
@@ -37,34 +37,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-90/pom.xml b/src/it/mjar-90/pom.xml
index b6338b9..82f2c47 100644
--- a/src/it/mjar-90/pom.xml
+++ b/src/it/mjar-90/pom.xml
@@ -25,14 +25,6 @@
<packaging>jar</packaging>
<name>Maven</name>
<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>
@@ -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-90/src/test/java/FooTest.java
b/src/it/mjar-90/src/test/java/FooTest.java
index b9d8583..d23f440 100644
--- a/src/it/mjar-90/src/test/java/FooTest.java
+++ b/src/it/mjar-90/src/test/java/FooTest.java
@@ -16,13 +16,4 @@
* specific language governing permissions and limitations
* under the License.
*/
-import junit.framework.TestCase;
-
-/**
- * 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 f5269e2..b10169a 100644
--- a/src/it/project-004/pom.xml
+++ b/src/it/project-004/pom.xml
@@ -49,7 +49,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>@version.maven-surefire@</version>
</plugin>
</plugins>
</build>
