.travis.yml

-language: java
-jdk:
-  - oraclejdk8
-#  - oraclejdk9
-
-script: "rm -rf .repository && mvn --show-version --errors --batch-mode -Prun-its clean install -Dmaven.repo.local=.repository -Denforcer.skip=true -e"
-
-install: true
-
-branches:
-    except:
-        - gh-pages

debian/changelog

+surefire (2.22.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 12 Jul 2019 01:13:07 +0200
+
 surefire (2.22.1-1) unstable; urgency=medium
 
   * Team upload.

maven-failsafe-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>

maven-surefire-common/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>maven-surefire-common</artifactId>

maven-surefire-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>

maven-surefire-report-plugin/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -28,7 +28,7 @@
 
   <groupId>org.apache.maven.surefire</groupId>
   <artifactId>surefire</artifactId>
-  <version>2.22.1</version>
+  <version>2.22.2</version>
   <packaging>pom</packaging>
 
   <name>Apache Maven Surefire</name>
@@ -66,7 +66,7 @@
     <connection>${maven.surefire.scm.devConnection}</connection>
     <developerConnection>${maven.surefire.scm.devConnection}</developerConnection>
     <url>https://github.com/apache/maven-surefire/tree/${project.scm.tag}</url>
-    <tag>surefire-2.22.1_vote-1</tag>
+    <tag>surefire-2.22.2</tag>
   </scm>
   <issueManagement>
     <system>jira</system>

surefire-api/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>surefire-api</artifactId>

surefire-booter/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>surefire-booter</artifactId>

surefire-grouper/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>surefire-grouper</artifactId>

surefire-its/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>surefire-its</artifactId>

surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java

@@ -63,7 +63,6 @@ public static Iterable<Object[]> regexVersions()
         args.add( new Object[] { "1.1.1", "5.1.1", "1.0.0", "1.0.0" } );
         args.add( new Object[] { "1.2.0", "5.2.0", "1.1.0", "1.0.0" } );
         args.add( new Object[] { "1.3.1", "5.3.1", "1.1.1", "1.0.0" } );
-        args.add( new Object[] { "1.4.0-SNAPSHOT", "5.4.0-SNAPSHOT", "1.1.1", "1.0.0" } );
         return args;
     }
 

surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java

+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.startsWith;
+
+public class JUnitPlatformStreamCorruptionIT
+        extends SurefireJUnit4IntegrationTestCase
+{
+    @Before
+    public void setUp()
+    {
+        assumeJavaVersion( 1.8d );
+    }
+
+    @Test
+    public void warningIsNotEmitted() throws VerificationException
+    {
+        OutputValidator validator = unpack( "/surefire-1614-stream-corruption" )
+                .executeTest()
+                .verifyErrorFree( 1 );
+
+        List<String> lines = validator.loadLogLines(
+                startsWith( "[WARNING] Corrupted STDOUT by directly writing to native stream in forked JVM" ) );
+
+        assertThat( lines )
+                .isEmpty();
+    }
+}

surefire-its/src/test/resources/surefire-1614-stream-corruption/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.maven.plugins.surefire</groupId>
+    <artifactId>junit-platform-1.0.0</artifactId>
+    <version>1.0</version>
+    <name>[SUREFIRE-1614] JUnit 5: Vintage Output Stream Corruption</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.3.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

surefire-its/src/test/resources/surefire-1614-stream-corruption/src/test/java/com/example/demo/CustomRunner.java

+package com.example.demo;
+
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.TestClass;
+
+public class CustomRunner
+        extends BlockJUnit4ClassRunner
+{
+
+    public CustomRunner( Class<?> klass ) throws InitializationError
+    {
+        super( klass );
+    }
+
+    @Override
+    protected TestClass createTestClass( Class<?> testClass )
+    {
+        System.out.println( "Creating test class" );
+        return super.createTestClass( testClass );
+    }
+}

surefire-its/src/test/resources/surefire-1614-stream-corruption/src/test/java/com/example/demo/SurefireStreamCorruptionTest.java

+package com.example.demo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith( CustomRunner.class )
+public class SurefireStreamCorruptionTest
+{
+    @Test
+    public void contextLoads()
+    {
+    }
+}

surefire-logger-api/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>2.22.1</version>
+        <version>2.22.2</version>
     </parent>
 
     <artifactId>surefire-logger-api</artifactId>

surefire-providers/common-java5/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>common-java5</artifactId>

surefire-providers/common-junit3/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>common-junit3</artifactId>

surefire-providers/common-junit4/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>2.22.1</version>
+    <version>2.22.2</version>
   </parent>
 
   <artifactId>common-junit4</artifactId>