Skip to content

Commit

Permalink
Merge pull request #25985 from famod/surefire-m7
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi committed Jun 8, 2022
2 parents 1212424 + f51ab0e commit ad366c5
Show file tree
Hide file tree
Showing 71 changed files with 67 additions and 82 deletions.
6 changes: 1 addition & 5 deletions build-parent/pom.xml
Expand Up @@ -29,7 +29,7 @@

<!-- version.* properties are defined in jboss-parent and are overridden/updated here: -->
<version.enforcer.plugin>3.0.0-M3</version.enforcer.plugin>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.exec.plugin>3.0.0</version.exec.plugin>
<failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>

Expand Down Expand Up @@ -415,8 +415,6 @@
<!-- limit the amount of memory surefire can use, 1500m should be plenty-->
<!-- set tmpdir as early as possible because surefire sets it too late for JDK16 -->
<argLine>${jacoco.agent.argLine} -Xmx1500m -XX:MaxMetaspaceSize=1500m -Djava.io.tmpdir="${project.build.directory}" ${surefire.argLine.additional}</argLine>
<!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
<trimStackTrace>false</trimStackTrace>
<excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
</configuration>
</plugin>
Expand All @@ -435,8 +433,6 @@
</systemPropertyVariables>
<!-- set tmpdir as early as possible because failsafe sets it too late for JDK16 -->
<argLine>-Djava.io.tmpdir="${project.build.directory}"</argLine>
<!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
<trimStackTrace>false</trimStackTrace>
<excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
</configuration>
</plugin>
Expand Down
3 changes: 1 addition & 2 deletions docs/src/main/asciidoc/building-my-first-extension.adoc
Expand Up @@ -169,8 +169,7 @@ Your extension is a multi-module project. So let's start by checking out the par
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.version>{quarkus-version}</quarkus.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
3 changes: 1 addition & 2 deletions docs/src/main/asciidoc/jreleaser.adoc
Expand Up @@ -616,8 +616,7 @@ As a reference, these are the full contents of the `pom.xml`:
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>{quarkus-version}</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Expand Up @@ -18,7 +18,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Expand Up @@ -18,7 +18,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Expand Up @@ -17,7 +17,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Expand Up @@ -17,7 +17,7 @@
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<resources-plugin.version>3.1.0</resources-plugin.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>

<azure.functions.maven.plugin.version>1.9.1</azure.functions.maven.plugin.version>
<functionAppName>${appName}</functionAppName>
Expand Down
Expand Up @@ -17,7 +17,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/arc/pom.xml
Expand Up @@ -51,7 +51,7 @@
<version.gizmo>1.0.11.Final</version.gizmo>
<version.jpa>2.2.3</version.jpa>

<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion independent-projects/bootstrap/pom.xml
Expand Up @@ -34,7 +34,7 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>

<!-- Dependency versions -->
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/extension-maven-plugin/pom.xml
Expand Up @@ -33,7 +33,7 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<jackson-bom.version>2.13.3</jackson-bom.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/ide-config/pom.xml
Expand Up @@ -39,7 +39,7 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion independent-projects/qute/pom.xml
Expand Up @@ -44,7 +44,7 @@
<version.assertj>3.23.1</version.assertj>
<version.gizmo>1.0.11.Final</version.gizmo>
<version.jboss-logging>3.5.0.Final</version.jboss-logging>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
<version.smallrye-mutiny>1.5.0</version.smallrye-mutiny>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/resteasy-reactive/pom.xml
Expand Up @@ -50,7 +50,7 @@
<gizmo.version>1.0.11.Final</gizmo.version>
<jakarta.persistence-api.version>2.2.3</jakarta.persistence-api.version>

<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
<jakarta.json.version>1.1.6</jakarta.json.version>
Expand Down
Expand Up @@ -38,7 +38,6 @@
{#if maven.surefire-plugin.version}
<surefire-plugin.version>{maven.surefire-plugin.version}</surefire-plugin.version>
<failsafe-plugin.version>$\{surefire-plugin.version}</failsafe-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
{/if}
</properties>

Expand Down
Expand Up @@ -19,7 +19,6 @@
<compiler-plugin.version>{maven-compiler-plugin.version}</compiler-plugin.version>
<skipITs>true</skipITs>
<surefire-plugin.version>{maven-surefire-plugin.version}</surefire-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
{#if uberjar}
<quarkus.package.type>uber-jar</quarkus.package.type>
{/if}
Expand Down
Expand Up @@ -53,7 +53,7 @@ public enum LayoutType {
public static final String DEFAULT_QUARKIVERSE_PARENT_VERSION = "9";
public static final String DEFAULT_QUARKIVERSE_NAMESPACE_ID = "quarkus-";

private static final String DEFAULT_SUREFIRE_PLUGIN_VERSION = "3.0.0-M5";
private static final String DEFAULT_SUREFIRE_PLUGIN_VERSION = "3.0.0-M7";
private static final String DEFAULT_COMPILER_PLUGIN_VERSION = "3.8.1";

private final QuarkusExtensionCodestartProjectInputBuilder builder = QuarkusExtensionCodestartProjectInput.builder();
Expand Down
Expand Up @@ -604,7 +604,7 @@ public TestPlatformCatalogMemberBuilder addCoreMember() {
metadata.put("maven-plugin-artifactId", "quarkus-maven-plugin");
metadata.put("maven-plugin-version", quarkusBom.extensions.getBom().getVersion());
metadata.put("compiler-plugin-version", "3.8.1");
metadata.put("surefire-plugin-version", "3.0.0-M5");
metadata.put("surefire-plugin-version", "3.0.0-M7");
return quarkusBom;
}

Expand Down
Expand Up @@ -357,7 +357,7 @@
"doc-root": "https://quarkus.io",
"rest-assured-version": "4.3.2",
"compiler-plugin-version": "3.8.1",
"surefire-plugin-version": "3.0.0-M5",
"surefire-plugin-version": "3.0.0-M7",
"kotlin-version": "1.4.31",
"scala-version": "2.12.13",
"scala-plugin-version": "4.4.0",
Expand Down
Expand Up @@ -7,7 +7,6 @@
<version>1.0.0-codestart</version>
<properties>
<compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
Expand Up @@ -7,7 +7,6 @@
<version>1.0.0-codestart</version>
<properties>
<compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/tools/pom.xml
Expand Up @@ -56,7 +56,7 @@
<jboss-logging.version>3.5.0.Final</jboss-logging.version>
<maven-core.version>3.8.4</maven-core.version>
<mockito.version>4.6.0</mockito.version>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<quarkus.version>999-SNAPSHOT</quarkus.version>
<maven-model-helper.version>20</maven-model-helper.version>
Expand Down
Expand Up @@ -3086,7 +3086,7 @@
"doc-root" : "https://quarkus.io",
"rest-assured-version" : "${rest-assured.version}",
"compiler-plugin-version" : "3.8.1",
"surefire-plugin-version" : "3.0.0-M5",
"surefire-plugin-version" : "3.0.0-M7",
"kotlin-version" : "1.5.31",
"scala-version" : "2.12.13",
"scala-plugin-version" : "4.4.0",
Expand Down
Expand Up @@ -7329,7 +7329,7 @@
"doc-root" : "https://quarkus.io",
"rest-assured-version" : "4.3.2",
"compiler-plugin-version" : "3.8.1",
"surefire-plugin-version" : "3.0.0-M5",
"surefire-plugin-version" : "3.0.0-M7",
"kotlin-version" : "1.4.32",
"scala-version" : "2.12.13",
"scala-plugin-version" : "4.4.0",
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
Expand Down

0 comments on commit ad366c5

Please sign in to comment.