You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/05/03 20:38:56 UTC
[maven-antrun-plugin] branch MANTRUN-224 updated (8fc2aee ->
171bb21)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MANTRUN-224
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git.
omit 8fc2aee [MANTRUN-224] Upgrade tests to JUnit5
omit e9ea05a [MANTRUN-224] Require Java 8
omit f2b3605 Prepare for 3.1.0
add 47c4610 set Maven 3.1.1 as minimum version
add 1e63614 Merge pull request #6 from apache/v
add 7d195b0 deps: update hamcrest
add b3582e8 Merge pull request #7 from apache/elharo-patch-1
new d0dfc73 Prepare for 3.1.0
new c6e5f34 [MANTRUN-224] Require Java 8
new 171bb21 [MANTRUN-224] Upgrade tests to JUnit5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8fc2aee)
\
N -- N -- N refs/heads/MANTRUN-224 (171bb21)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-antrun-plugin] 01/03: Prepare for 3.1.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MANTRUN-224
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit d0dfc73335ddb3eda62aa4451e9bc243a8f69784
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 16 21:28:15 2020 +0200
Prepare for 3.1.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6115cba..145bece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven AntRun Plugin</name>
[maven-antrun-plugin] 03/03: [MANTRUN-224] Upgrade tests to JUnit5
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MANTRUN-224
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit 171bb21d7e679e4617d653f818d79e1b0bfb6be2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 15 23:53:27 2020 +0200
[MANTRUN-224] Upgrade tests to JUnit5
---
pom.xml | 12 +++------
src/it/MANTRUN-208/pom.xml | 6 ++---
src/it/antrun-default-test/pom.xml | 6 ++---
src/it/classpath-ref-test/pom.xml | 6 ++---
src/it/classpath-test-scope-test/pom.xml | 6 ++---
src/it/env-var-test/pom.xml | 6 ++---
src/it/filesets-test/pom.xml | 8 +++---
src/it/filesets-test/verify.bsh | 4 +--
src/it/local-repo-prop-test/pom.xml | 6 ++---
src/it/properties-test/build.xml | 4 +--
src/it/properties-test/pom.xml | 6 ++---
.../AntrunXmlPlexusConfigurationWriterTest.java | 31 +++++++++-------------
12 files changed, 45 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/pom.xml
index c54d284..5a0eb9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,15 +100,9 @@ under the License.
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>2.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/it/MANTRUN-208/pom.xml b/src/it/MANTRUN-208/pom.xml
index b8cccf9..e6db120 100644
--- a/src/it/MANTRUN-208/pom.xml
+++ b/src/it/MANTRUN-208/pom.xml
@@ -32,9 +32,9 @@ under the License.
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/antrun-default-test/pom.xml b/src/it/antrun-default-test/pom.xml
index a074ad5..3c44f11 100644
--- a/src/it/antrun-default-test/pom.xml
+++ b/src/it/antrun-default-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/classpath-ref-test/pom.xml b/src/it/classpath-ref-test/pom.xml
index 73e5f06..6d8f3bf 100644
--- a/src/it/classpath-ref-test/pom.xml
+++ b/src/it/classpath-ref-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
</dependency>
</dependencies>
diff --git a/src/it/classpath-test-scope-test/pom.xml b/src/it/classpath-test-scope-test/pom.xml
index c046a01..c921449 100644
--- a/src/it/classpath-test-scope-test/pom.xml
+++ b/src/it/classpath-test-scope-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/env-var-test/pom.xml b/src/it/env-var-test/pom.xml
index 6715a20..2bfd47c 100644
--- a/src/it/env-var-test/pom.xml
+++ b/src/it/env-var-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/filesets-test/pom.xml b/src/it/filesets-test/pom.xml
index aa6267a..a56444c 100755
--- a/src/it/filesets-test/pom.xml
+++ b/src/it/filesets-test/pom.xml
@@ -49,7 +49,7 @@ under the License.
<dependencyfilesets prefix="test."/>
<mkdir dir="target/dependencies"/>
<copy todir="target/dependencies">
- <fileset refid="test.junit:junit:jar"/>
+ <fileset refid="test.org.junit.jupiter:junit-jupiter-engine:jar"/>
<fileset refid="test.org.apache.ant:ant:jar"/>
</copy>
@@ -73,9 +73,9 @@ under the License.
<version>1.9.14</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
</dependency>
</dependencies>
diff --git a/src/it/filesets-test/verify.bsh b/src/it/filesets-test/verify.bsh
index ad846c5..068e3ff 100644
--- a/src/it/filesets-test/verify.bsh
+++ b/src/it/filesets-test/verify.bsh
@@ -28,7 +28,7 @@ try
{
File depsDir = new File( basedir, "target/dependencies" );
File antJar = new File( depsDir, "ant-1.9.14.jar" );
- File junitJar = new File( depsDir, "junit-4.12.jar" );
+ File junitJar = new File( depsDir, "junit-jupiter-engine-5.6.2.jar" );
if ( ! antJar.exists() || antJar.isDirectory() )
{
@@ -43,7 +43,7 @@ try
File deps2Dir = new File( basedir, "target/dependencies2" );
antJar = new File( deps2Dir, "ant-1.9.14.jar" );
- junitJar = new File( deps2Dir, "junit-4.12.jar" );
+ junitJar = new File( deps2Dir, "junit-jupiter-api-5.6.2.jar" );
if ( ! antJar.exists() || antJar.isDirectory() )
{
diff --git a/src/it/local-repo-prop-test/pom.xml b/src/it/local-repo-prop-test/pom.xml
index d4a126c..0df6818 100644
--- a/src/it/local-repo-prop-test/pom.xml
+++ b/src/it/local-repo-prop-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/properties-test/build.xml b/src/it/properties-test/build.xml
index c535007..3ea0fc7 100755
--- a/src/it/properties-test/build.xml
+++ b/src/it/properties-test/build.xml
@@ -40,8 +40,8 @@ under the License.
<fail unless="line.separator" message="Property not set \${line.separator}"/>
<!-- Dependency artifact properties -->
- <echo message="junit:junit:jar : ${junit:junit:jar}"/>
- <fail unless="junit:junit:jar" message="Property not set \${junit:junit:jar}"/>
+ <echo message="org.junit.jupiter:junit-jupiter-engine:jar : ${org.junit.jupiter:junit-jupiter-engine:jar}"/>
+ <fail unless="org.junit.jupiter:junit-jupiter-engine:jar" message="Property not set \${org.junit.jupiter:junit-jupiter-engine:jar}"/>
<!-- Check that the build output dir is pointing to the correct location -->
<property name="outputDir" location="./target/classes"/>
diff --git a/src/it/properties-test/pom.xml b/src/it/properties-test/pom.xml
index 5578d95..70a9c11 100644
--- a/src/it/properties-test/pom.xml
+++ b/src/it/properties-test/pom.xml
@@ -32,9 +32,9 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.2</version>
</dependency>
</dependencies>
diff --git a/src/test/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriterTest.java b/src/test/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriterTest.java
index fe66f6f..4a7a83b 100644
--- a/src/test/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriterTest.java
+++ b/src/test/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriterTest.java
@@ -19,17 +19,18 @@ package org.apache.maven.plugins.antrun;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.xmlunit.builder.Input;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
@@ -42,7 +43,8 @@ public class AntrunXmlPlexusConfigurationWriterTest
private static final String TARGET_NAME = "main";
- private TemporaryFolder folder = new TemporaryFolder();
+ @TempDir
+ Path folder;
private AntrunXmlPlexusConfigurationWriter configurationWriter;
@@ -50,14 +52,14 @@ public class AntrunXmlPlexusConfigurationWriterTest
private File file;
- @Before
- public void setUp()
+ @BeforeEach
+ void setUp()
throws IOException
{
configurationWriter = new AntrunXmlPlexusConfigurationWriter();
configuration = new XmlPlexusConfiguration( "target" );
configuration.setAttribute( "name", TARGET_NAME );
- file = folder.newFile();
+ file = Files.createTempFile(folder, "junit", "antrun").toFile();
}
/**
@@ -123,11 +125,4 @@ public class AntrunXmlPlexusConfigurationWriterTest
{
assertThat( Input.from( file ), isIdenticalTo( Input.from( getClass().getResourceAsStream( expected ) ) ) );
}
-
- @Rule
- public TemporaryFolder getFolder()
- {
- return folder;
- }
-
}
[maven-antrun-plugin] 02/03: [MANTRUN-224] Require Java 8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MANTRUN-224
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit c6e5f349f2b456e2b81f8db0e34414b6e38c3abe
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Apr 16 00:18:02 2020 +0200
[MANTRUN-224] Require Java 8
---
Jenkinsfile | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e9f05f7..9481f86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild()
+asfMavenTlpPlgnBuild(jdk:['8','11','14','15'])
diff --git a/pom.xml b/pom.xml
index 145bece..c54d284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
<properties>
<mavenVersion>3.1.1</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-12T07:51:40Z</project.build.outputTimestamp>
</properties>