You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/06/12 22:06:34 UTC
[maven-surefire] branch macos-ipv4 updated (ef18fb7 -> b21559b)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch macos-ipv4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from ef18fb7 TestMethodPatternIT
new ddd6ce7 removed java.net.preferIPv4Stack
new b21559b use wildcard address
The 2 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.
Summary of changes:
.../maven/plugin/surefire/extensions/SurefireForkChannel.java | 6 ++----
pom.xml | 2 +-
surefire-its/src/test/resources/consoleOutput/pom.xml | 1 -
surefire-its/src/test/resources/consoleoutput-noisy/pom.xml | 1 -
surefire-its/src/test/resources/fail-fast-junit/pom.xml | 1 -
surefire-its/src/test/resources/fail-fast-testng/pom.xml | 1 -
surefire-its/src/test/resources/junit44-method-pattern/pom.xml | 1 -
.../resources/junit47-rerun-failing-tests-with-cucumber/pom.xml | 1 -
surefire-its/src/test/resources/junit48-method-pattern/pom.xml | 1 -
surefire-its/src/test/resources/testng-method-pattern-after/pom.xml | 1 -
.../src/test/resources/testng-method-pattern-before/pom.xml | 1 -
surefire-its/src/test/resources/testng-method-pattern/pom.xml | 1 -
12 files changed, 3 insertions(+), 15 deletions(-)
[maven-surefire] 02/02: use wildcard address
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch macos-ipv4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit b21559bd4e8aa54b9b6190952915f763cc2e0ace
Author: tibordigana <ti...@apache.org>
AuthorDate: Sat Jun 13 00:06:24 2020 +0200
use wildcard address
---
.../maven/plugin/surefire/extensions/SurefireForkChannel.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
index cf522e8..c2e26d3 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
@@ -32,7 +32,6 @@ import org.apache.maven.surefire.extensions.util.LineConsumerThread;
import javax.annotation.Nonnull;
import java.io.Closeable;
import java.io.IOException;
-import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketOption;
@@ -84,10 +83,9 @@ final class SurefireForkChannel extends ForkChannel
super( arguments );
server = open( withThreadPool( THREAD_POOL ) );
setTrueOptions( SO_REUSEADDR, TCP_NODELAY, SO_KEEPALIVE );
- InetAddress ip = Inet4Address.getLocalHost();
- server.bind( new InetSocketAddress( ip, 0 ), 1 );
+ server.bind( null, 1 );
InetSocketAddress localAddress = (InetSocketAddress) server.getLocalAddress();
- localHost = localAddress.getHostString();
+ localHost = InetAddress.getLocalHost().getHostAddress(); // localAddress.getHostString();
localPort = localAddress.getPort();
}
[maven-surefire] 01/02: removed java.net.preferIPv4Stack
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch macos-ipv4
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit ddd6ce714b50e96c6536e1bd3dc53574453f642d
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Jun 12 23:38:14 2020 +0200
removed java.net.preferIPv4Stack
---
pom.xml | 2 +-
surefire-its/src/test/resources/consoleOutput/pom.xml | 1 -
surefire-its/src/test/resources/consoleoutput-noisy/pom.xml | 1 -
surefire-its/src/test/resources/fail-fast-junit/pom.xml | 1 -
surefire-its/src/test/resources/fail-fast-testng/pom.xml | 1 -
surefire-its/src/test/resources/junit44-method-pattern/pom.xml | 1 -
.../test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml | 1 -
surefire-its/src/test/resources/junit48-method-pattern/pom.xml | 1 -
surefire-its/src/test/resources/testng-method-pattern-after/pom.xml | 1 -
surefire-its/src/test/resources/testng-method-pattern-before/pom.xml | 1 -
surefire-its/src/test/resources/testng-method-pattern/pom.xml | 1 -
11 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index cc5fc51..78efd27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
<jdk.home>${java.home}/..</jdk.home>
<maven.compiler.testSource>1.${javaVersion}</maven.compiler.testSource>
<maven.compiler.testTarget>1.${javaVersion}</maven.compiler.testTarget>
- <jvm.args.tests>-Xms128m -Xmx144m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true -Djava.net.preferIPv4Stack=true</jvm.args.tests>
+ <jvm.args.tests>-Xms128m -Xmx144m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
<project.build.outputTimestamp>2020-06-10T18:16:37Z</project.build.outputTimestamp>
</properties>
diff --git a/surefire-its/src/test/resources/consoleOutput/pom.xml b/surefire-its/src/test/resources/consoleOutput/pom.xml
index 2d8759e..2b52941 100644
--- a/surefire-its/src/test/resources/consoleOutput/pom.xml
+++ b/surefire-its/src/test/resources/consoleOutput/pom.xml
@@ -53,7 +53,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml b/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
index 3f8f327..6fd7013 100644
--- a/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
+++ b/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
@@ -69,7 +69,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/fail-fast-junit/pom.xml b/surefire-its/src/test/resources/fail-fast-junit/pom.xml
index 2a76cd5..6dca1d5 100644
--- a/surefire-its/src/test/resources/fail-fast-junit/pom.xml
+++ b/surefire-its/src/test/resources/fail-fast-junit/pom.xml
@@ -108,7 +108,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/fail-fast-testng/pom.xml b/surefire-its/src/test/resources/fail-fast-testng/pom.xml
index 3ef824c..c891407 100644
--- a/surefire-its/src/test/resources/fail-fast-testng/pom.xml
+++ b/surefire-its/src/test/resources/fail-fast-testng/pom.xml
@@ -66,7 +66,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
index 10b7ae8..e3db519 100644
--- a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
+++ b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
@@ -66,7 +66,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
index f61c400..d58223c 100644
--- a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
@@ -86,7 +86,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/junit48-method-pattern/pom.xml b/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
index cc0ad12..40227c3 100644
--- a/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
+++ b/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
@@ -106,7 +106,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
index 804467d..c894f12 100644
--- a/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern-after/pom.xml
@@ -69,7 +69,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
index 804467d..c894f12 100644
--- a/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern-before/pom.xml
@@ -69,7 +69,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
diff --git a/surefire-its/src/test/resources/testng-method-pattern/pom.xml b/surefire-its/src/test/resources/testng-method-pattern/pom.xml
index fb414ec..905a56c 100644
--- a/surefire-its/src/test/resources/testng-method-pattern/pom.xml
+++ b/surefire-its/src/test/resources/testng-method-pattern/pom.xml
@@ -69,7 +69,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>