You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/12 06:39:41 UTC
[isis] branch master updated: ISIS-2445: fixes surefire config; also try out new surefire version 3.x
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 194c75d76b ISIS-2445: fixes surefire config; also try out new surefire version 3.x
194c75d76b is described below
commit 194c75d76b587349c1707651b0b8b809e423aaa5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 12 08:39:35 2022 +0200
ISIS-2445: fixes surefire config; also try out new surefire version 3.x
- now that jacoco is only activated via a profile, surefire's @{argLine}
is no longer populated so we remove it
---
.github/workflows/ci-build-artifacts-no-push-maven.yml | 1 -
core/pom.xml | 12 ------------
isis-parent/pom.xml | 18 ++++++++++++++----
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-no-push-maven.yml b/.github/workflows/ci-build-artifacts-no-push-maven.yml
index 961f72ab43..842574acc4 100644
--- a/.github/workflows/ci-build-artifacts-no-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-no-push-maven.yml
@@ -82,7 +82,6 @@ jobs:
-Dmaven.source.skip=true
-Denforcer.failFast=true
-Djacoco.skip=true
- -T 1C
# FOR DEBUG USE
# - name: Dump GitHub context
diff --git a/core/pom.xml b/core/pom.xml
index f697fec215..38b442be0d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -49,7 +49,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <surefire-plugin.argLine>-Xms1024m -Xmx1024m</surefire-plugin.argLine>
<testsToExclude>**/*IntegrationTest.java</testsToExclude>
<checkstyle.configLocation>${coreBaseDir}/codequality/checkstyle.xml</checkstyle.configLocation>
@@ -282,17 +281,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
- <configuration>
- <!-- override defaults and include everything unless explicitly excluded -->
- <includes>
- <include>**/*.java</include>
- </includes>
- <excludes>
- <exclude>${testsToExclude}</exclude>
- </excludes>
- <printSummary>false</printSummary>
- <argLine>@{argLine} ${surefire-plugin.argLine}</argLine>
- </configuration>
<!-- goal:test binds to phase:test -->
</plugin>
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 781ec1da29..6e75ff2d58 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -334,8 +334,10 @@ under the License.
<lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
<delombok.output>${project.build.directory}/delombok</delombok.output>
+ <surefire.version>3.0.0-M6</surefire.version>
+ <surefire-plugin.argLine>-Xms512m -Xmx512m</surefire-plugin.argLine>
<!-- APACHE ISIS customisation 4/15: end -->
- <surefire.version>2.22.2</surefire.version>
+
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<!-- set this property for all derived projects:
-->
@@ -541,6 +543,17 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
+ <configuration>
+ <!-- override defaults and include everything unless explicitly excluded -->
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>${testsToExclude}</exclude>
+ </excludes>
+ <printSummary>false</printSummary>
+ <argLine>${surefire-plugin.argLine}</argLine>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1144,8 +1157,6 @@ under the License.
<goal>prepare-agent</goal>
</goals>
</execution>
- <!-- stopped working with GitHub CI on 2021-03-18,
- could not find a way to disable -->
<execution>
<id>report</id>
<phase>prepare-package</phase>
@@ -1156,7 +1167,6 @@ under the License.
<formats>XML</formats>
</configuration>
</execution>
-
</executions>
</plugin>
</plugins>