Revert maven-surefire to prevent a build regression

In some environments, the 2.20.1 version of the maven surefire plugin
can cause builds to fail due to changes in surefire in how it detects
that the forked JVM used for testing is still alive or not.
This commit is contained in:
Shane Freeder 2017-11-06 23:58:32 +00:00
parent 4c71520375
commit d1d4f3b465
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C

View File

@ -1,11 +1,11 @@
From b729acf6c391a7f26a4e093724d238d56e6fa812 Mon Sep 17 00:00:00 2001 From 4daeb84c011999face5942ce02193c4e0ba552c9 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600 Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index f31825f52..6a0a02883 100644 index c73b4b4f5..0c4398228 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
@ -138,7 +138,7 @@ index f31825f52..6a0a02883 100644
<relocation> <relocation>
<pattern>org.bukkit.craftbukkit</pattern> <pattern>org.bukkit.craftbukkit</pattern>
<shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern> <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
@@ -247,18 +239,6 @@ @@ -247,23 +239,11 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.7.0</version>
@ -157,6 +157,12 @@ index f31825f52..6a0a02883 100644
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.20</version> <!-- Paper - revert due to regression in some environments -->
<configuration>
<workingDirectory>${basedir}/target/test-server</workingDirectory>
<excludes>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d..674096cab 100644 index 93046379d..674096cab 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@ -171,5 +177,5 @@ index 93046379d..674096cab 100644
if (stream != null) { if (stream != null) {
-- --
2.14.1 2.14.3