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 2021/05/17 19:48:37 UTC
[maven-antrun-plugin] 02/02: (doc) misc versions sync
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit 54b4dbabcb1e5d7b99ff8aff79b147c4ff923978
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon May 17 21:21:12 2021 +0200
(doc) misc versions sync
---
Jenkinsfile | 2 +-
pom.xml | 23 ++++++++++++++++++++---
src/it/MANTRUN-208/pom.xml | 2 +-
src/it/antrun-default-test/pom.xml | 2 +-
src/it/classpath-ref-test/pom.xml | 2 +-
src/it/classpath-test-scope-test/pom.xml | 2 +-
src/it/custom-task-test/pom.xml | 2 +-
src/it/env-var-test/pom.xml | 2 +-
src/it/filesets-test/pom.xml | 4 ++--
src/it/filesets-test/verify.bsh | 8 ++++----
src/it/local-repo-prop-test/pom.xml | 2 +-
src/it/properties-test/pom.xml | 2 +-
src/site/apt/examples/customTasks.apt.vm | 2 +-
13 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9481f86..e9f05f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['8','11','14','15'])
+asfMavenTlpPlgnBuild()
diff --git a/pom.xml b/pom.xml
index ed76fa2..00b54e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,8 @@ under the License.
<properties>
<mavenVersion>3.1.1</mavenVersion>
<javaVersion>8</javaVersion>
+ <surefire.version>2.22.2</surefire.version>
+ <mavenPluginToolsVersion>3.6.1</mavenPluginToolsVersion>
<project.build.outputTimestamp>2020-04-12T07:51:40Z</project.build.outputTimestamp>
</properties>
@@ -108,13 +110,13 @@ under the License.
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.7.0</version>
+ <version>2.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
- <version>2.7.0</version>
+ <version>2.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -134,9 +136,24 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${mavenPluginToolsVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.9.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -152,7 +169,7 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.11</version>
+ <version>1.10.0</version><!-- 1.11 error: There are more than one class as root element for this version -->
<configuration>
<models>
<model>src/main/mdo/antrun.mdo</model>
diff --git a/src/it/MANTRUN-208/pom.xml b/src/it/MANTRUN-208/pom.xml
index 298b53d..84e24eb 100644
--- a/src/it/MANTRUN-208/pom.xml
+++ b/src/it/MANTRUN-208/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.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 3bb4c5b..bd2c76d 100644
--- a/src/it/antrun-default-test/pom.xml
+++ b/src/it/antrun-default-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.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 a2e5cbc..dea103f 100644
--- a/src/it/classpath-ref-test/pom.xml
+++ b/src/it/classpath-ref-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.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 434261e..bc325dc 100644
--- a/src/it/classpath-test-scope-test/pom.xml
+++ b/src/it/classpath-test-scope-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/custom-task-test/pom.xml b/src/it/custom-task-test/pom.xml
index 32d390f..c4b96ab 100644
--- a/src/it/custom-task-test/pom.xml
+++ b/src/it/custom-task-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.8</version>
+ <version>1.10.10</version>
</dependency>
</dependencies>
diff --git a/src/it/env-var-test/pom.xml b/src/it/env-var-test/pom.xml
index a41aaf6..4bb0544 100644
--- a/src/it/env-var-test/pom.xml
+++ b/src/it/env-var-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/filesets-test/pom.xml b/src/it/filesets-test/pom.xml
index c26aa4e..7a0b188 100644
--- a/src/it/filesets-test/pom.xml
+++ b/src/it/filesets-test/pom.xml
@@ -116,12 +116,12 @@ under the License.
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.8</version>
+ <version>1.10.10</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.2</version>
</dependency>
</dependencies>
diff --git a/src/it/filesets-test/verify.bsh b/src/it/filesets-test/verify.bsh
index 235ba8f..a267bbb 100644
--- a/src/it/filesets-test/verify.bsh
+++ b/src/it/filesets-test/verify.bsh
@@ -27,8 +27,8 @@ import org.codehaus.plexus.util.*;
try
{
File depsDir = new File( basedir, "target/dependencies" );
- File antJar = new File( depsDir, "ant-1.10.8.jar" );
- File junitJar = new File( depsDir, "junit-jupiter-engine-5.7.0.jar" );
+ File antJar = new File( depsDir, "ant-1.10.10.jar" );
+ File junitJar = new File( depsDir, "junit-jupiter-engine-5.7.2.jar" );
if ( ! antJar.exists() || antJar.isDirectory() )
{
@@ -42,8 +42,8 @@ try
}
File deps2Dir = new File( basedir, "target/dependencies2" );
- antJar = new File( deps2Dir, "ant-1.10.8.jar" );
- junitJar = new File( deps2Dir, "junit-jupiter-api-5.7.0.jar" );
+ antJar = new File( deps2Dir, "ant-1.10.10.jar" );
+ junitJar = new File( deps2Dir, "junit-jupiter-api-5.7.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 25bf55a..464dd3f 100644
--- a/src/it/local-repo-prop-test/pom.xml
+++ b/src/it/local-repo-prop-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/properties-test/pom.xml b/src/it/properties-test/pom.xml
index 74bd3a8..8994392 100644
--- a/src/it/properties-test/pom.xml
+++ b/src/it/properties-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.2</version>
</dependency>
</dependencies>
diff --git a/src/site/apt/examples/customTasks.apt.vm b/src/site/apt/examples/customTasks.apt.vm
index ae1b464..9158b40 100644
--- a/src/site/apt/examples/customTasks.apt.vm
+++ b/src/site/apt/examples/customTasks.apt.vm
@@ -71,7 +71,7 @@ Using tasks not included in Ant's default jar
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
- <version>1.10.7</version>
+ <version>1.10.10</version>
</dependency>
</dependencies>
</plugin>