You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:13:00 UTC
[maven-surefire] branch mvn4 created (now f919e59)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
at f919e59 mvn4 aggregator
This branch includes the following new commits:
new f919e59 mvn4 aggregator
The 1 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.
[maven-surefire] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit f919e59ab5999acc39121093404236e5e6dd9a46
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:12:57 2022 +0100
mvn4 aggregator
---
.../maven/plugin/surefire/SurefireProperties.java | 2 +-
.../surefire/AbstractSurefireMojoToolchainsTest.java | 6 ++++++
.../src/main/resources/surefire-report.properties | 2 ++
.../src/main/resources/surefire-report_de.properties | 2 ++
.../src/main/resources/surefire-report_sv.properties | 2 ++
pom.xml | 20 ++++++++++----------
.../maven/surefire/booter/SystemPropertyManager.java | 2 +-
.../maven/surefire/booter/ForkedBooterMockTest.java | 6 +++---
.../src/test/resources/junit-platform.properties | 3 ++-
9 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
index 2f5e919..1df2369 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
@@ -248,7 +248,7 @@ public class SurefireProperties
private static SurefireProperties loadProperties( InputStream inStream )
throws IOException
{
- try ( final InputStream surefirePropertiesStream = inStream )
+ try ( InputStream surefirePropertiesStream = inStream )
{
Properties p = new Properties();
p.load( surefirePropertiesStream );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
index 8468df5..ef7cf33 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java
@@ -315,5 +315,11 @@ public class AbstractSurefireMojoToolchainsTest
{
return buildContextToolchain;
}
+
+ @Override
+ public List<Toolchain> getToolchains( MavenSession session, String type, Map<String, String> requirements )
+ {
+ throw new UnsupportedOperationException();
+ }
}
}
diff --git a/maven-surefire-report-plugin/src/main/resources/surefire-report.properties b/maven-surefire-report-plugin/src/main/resources/surefire-report.properties
index 8aa256e..d0ace6f 100644
--- a/maven-surefire-report-plugin/src/main/resources/surefire-report.properties
+++ b/maven-surefire-report-plugin/src/main/resources/surefire-report.properties
@@ -17,6 +17,8 @@
# under the License.
#
+# CHECKSTYLE_OFF: LineLength
+
report.surefire.name=Surefire Report
report.surefire.description=Report on the test results of the project.
report.surefire.header=Surefire Report
diff --git a/maven-surefire-report-plugin/src/main/resources/surefire-report_de.properties b/maven-surefire-report-plugin/src/main/resources/surefire-report_de.properties
index baff5db..eebcb19 100644
--- a/maven-surefire-report-plugin/src/main/resources/surefire-report_de.properties
+++ b/maven-surefire-report-plugin/src/main/resources/surefire-report_de.properties
@@ -17,6 +17,8 @@
# under the License.
#
+# CHECKSTYLE_OFF: LineLength
+
report.surefire.description=Bericht \u00FCber die Testresultate des Projekts.
report.surefire.header=Surefire Bericht
report.surefire.label.class=Klasse
diff --git a/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties b/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
index 5e3bcbe..c6e068b 100644
--- a/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
+++ b/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
@@ -17,6 +17,8 @@
# under the License.
#
+# CHECKSTYLE_OFF: LineLength
+
report.surefire.name=Surefire-rapport
report.surefire.description=Rapport om testresultaten f\u00f6r projektet.
report.surefire.header=Surefire-rapport
diff --git a/pom.xml b/pom.xml
index 50a8743..1a7b9c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.surefire</groupId>
@@ -88,15 +88,15 @@
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<commonsLang3Version>3.12.0</commonsLang3Version>
<commonsCompress>1.21</commonsCompress>
<commonsIoVersion>2.11.0</commonsIoVersion>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
<plexus-java-version>1.1.0</plexus-java-version>
<!-- maven-shared-utils:3.3.4 uses org.fusesource.jansi:jansi:2.2.0 -->
- <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
+ <mavenSharedUtilsVersion>4.0.0-SNAPSHOT</mavenSharedUtilsVersion>
<powermockVersion>2.0.9</powermockVersion>
<mavenPluginToolsVersion>3.6.2</mavenPluginToolsVersion>
<jacocoVersion>0.8.7</jacocoVersion>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.1</version>
+ <version>3.2.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.shared</groupId>
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
@@ -462,7 +462,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.17</version>
+ <version>1.20</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -582,7 +582,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce-java</id>
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
index abed5e8..d08177e 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
@@ -44,7 +44,7 @@ public class SystemPropertyManager
public static PropertiesWrapper loadProperties( InputStream inStream )
throws IOException
{
- try ( final InputStream stream = inStream )
+ try ( InputStream stream = inStream )
{
Properties p = new Properties();
p.load( stream );
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java
index d353521..a8c8c4c 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java
@@ -274,7 +274,7 @@ public class ForkedBooterMockTest
doCallRealMethod()
.when( ForkedBooter.class, "lookupDecoderFactory", anyString() );
- try ( final MasterProcessChannelProcessorFactory factory =
+ try ( MasterProcessChannelProcessorFactory factory =
invokeMethod( ForkedBooter.class, "lookupDecoderFactory", "pipe://3" ) )
{
assertThat( factory ).isInstanceOf( LegacyMasterProcessChannelProcessorFactory.class );
@@ -434,13 +434,13 @@ public class ForkedBooterMockTest
doCallRealMethod()
.when( ForkedBooter.class, "lookupDecoderFactory", anyString() );
- try ( final ServerSocketChannel server = ServerSocketChannel.open() )
+ try ( ServerSocketChannel server = ServerSocketChannel.open() )
{
server.bind( new InetSocketAddress( 0 ) );
int serverPort = ( (InetSocketAddress) server.getLocalAddress() ).getPort();
final String uuid = UUID.randomUUID().toString();
String url = "tcp://localhost:" + serverPort + "?sessionId=" + uuid;
- try ( final MasterProcessChannelProcessorFactory factory =
+ try ( MasterProcessChannelProcessorFactory factory =
invokeMethod( ForkedBooter.class, "lookupDecoderFactory", url ) )
{
assertThat( factory )
diff --git a/surefire-its/src/test/resources/surefire-1659-stream-corruption/src/test/resources/junit-platform.properties b/surefire-its/src/test/resources/surefire-1659-stream-corruption/src/test/resources/junit-platform.properties
index 648ee97..9d7a324 100644
--- a/surefire-its/src/test/resources/surefire-1659-stream-corruption/src/test/resources/junit-platform.properties
+++ b/surefire-its/src/test/resources/surefire-1659-stream-corruption/src/test/resources/junit-platform.properties
@@ -1 +1,2 @@
-# This file is needed in order for JUnit to log something early on org.junit.platform.launcher.core.LauncherConfigurationParameters
+# This file is needed in order for JUnit to log something early
+# on org.junit.platform.launcher.core.LauncherConfigurationParameters