This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 7baf199023 ISIS-3297: bom: consolidate surefire plugin
7baf199023 is described below
commit 7baf199023611402ebe85442243a374756b65700
Author: Andi Huber <[email protected]>
AuthorDate: Tue Nov 29 11:25:20 2022 +0100
ISIS-3297: bom: consolidate surefire plugin
- also require minimalMavenBuildVersion >= 3.8.0 (https)
---
bom/pom.xml | 33 ++++++++++++++++++---------------
core/pom.xml | 10 ----------
pom.xml | 2 +-
regressiontests/pom.xml | 13 -------------
starters/pom.xml | 2 +-
5 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 464f420d42..52e1848ae8 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -57,17 +57,10 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<gpg.useagent>true</gpg.useagent>
- <minimalMavenBuildVersion>3.2.5</minimalMavenBuildVersion>
- <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
-
- <java.version>11</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
+ <minimalMavenBuildVersion>3.8.0</minimalMavenBuildVersion> <!--
enforces https repos -->
+ <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
<maven.compiler.release>11</maven.compiler.release>
- <surefire.version>3.0.0-M7</surefire.version>
-
- <!-- for surefire, failsafe and surefire-report -->
- <maven.plugin.tools.version>3.7.0</maven.plugin.tools.version>
+
<!-- for m-plugin-p and maven-plugin-annotations -->
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<causeway.skipTests>false</causeway.skipTests>
@@ -77,6 +70,13 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<delombok.output>${project.build.directory}/delombok</delombok.output>
+ <!-- PLUGIN DEPENDENCIES -->
+
+
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+
<maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
+ <!-- for surefire, failsafe and surefire-report -->
+ <maven.plugin.tools.version>3.7.0</maven.plugin.tools.version>
+
<!-- LIBRARY DEPENDENCIES -->
<archunit.version>1.0.1</archunit.version>
@@ -480,7 +480,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- override defaults and include everything unless
explicitly excluded -->
<includes>
@@ -503,10 +503,13 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
+ <!-- Test Reporting -->
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+
<version>${maven-surefire-report-plugin.version}</version>
+ <!-- goal:report is a report so is
configured in the reporting section;
+ invokes phase:test before
running itself -->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 72a95e462f..c84dc1e4da 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -63,16 +63,6 @@
<pluginManagement>
<plugins>
- <!-- Test Reporting -->
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-report-plugin</artifactId>
-
<version>${maven-surefire-plugin.version}</version>
- <!-- goal:report is a report so is
configured in the reporting section;
- invokes phase:test before
running itself -->
- </plugin>
-
-
<!-- Packaging: source jars of main and test
code -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c41f3f75c1..5bde22ff46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,7 +454,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
-
<version>${maven-surefire-plugin.version}</version>
+
<version>${maven-surefire-report-plugin.version}</version>
<configuration>
<showSuccess>false</showSuccess>
</configuration>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index e8d27fe350..ea5ba1014f 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -60,19 +60,6 @@
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1C</forkCount>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <!-- allows regression tests to
reduce verbosity when run with surefire -->
-
<isRunningWithSurefire>true</isRunningWithSurefire>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/starters/pom.xml b/starters/pom.xml
index 40e54e0b24..2a92bca6f6 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -316,7 +316,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
-
<version>${maven-surefire-plugin.version}</version>
+
<version>${maven-surefire-report-plugin.version}</version>
<configuration>
<showSuccess>false</showSuccess>
</configuration>
