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 2018/02/18 00:47:39 UTC

[27/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-
-    @Rule
-    public TestName testName = new TestName();
-    
-    @Before
-    public void testName()
-    {
-        System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
-    }
-    
-    @Test
-    @Category( CategoryA.class )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test
-    @Category(CategoryB.class)
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test
-    @Category({CategoryA.class, CategoryB.class})
-    public void testInCategoriesAB()
-    {
-        catACount++;
-        catBCount++;
-    }
-
-    @Test
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("mA: " + catACount + "\n" +
-            "mB: " + catBCount + "\n" +
-            "mC: " + catCCount );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
-  static int catNoneCount = 0;
-
-  @Test
-  public void testInNoCategory()
-  {
-      catNoneCount++;
-  }
-
-  @AfterClass
-  public static void oneTimeTearDown()
-  {
-      System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
-  }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
deleted file mode 100644
index 983e5bb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        ~ 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.
-    -->
-
-<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>testng-group-expressions</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>TestNG group expressions tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.8</version>
-            <classifier>jdk15</classifier>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-  
-    <properties>
-      <groups>!CategoryC</groups>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
deleted file mode 100644
index c53875a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-
-public class BasicTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-    static int catNoneCount = 0;
-    
-    @Test( groups = "CategoryA" )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test( groups = "CategoryB" )
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test( groups = { "CategoryA", "CategoryB" } )
-    public void testInCategoryAB()
-    {
-        System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
-        catACount++;
-        catBCount++;
-    }
-
-    @Test( groups = "CategoryC" )
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @Test
-    public void testInNoCategory()
-    {
-        catNoneCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("catA: " + catACount + "\n" +
-            "catB: " + catBCount + "\n" +
-            "catC: " + catCCount + "\n" +
-            "catNone: " + catNoneCount);
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
deleted file mode 100644
index 66fafab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class CategoryCTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-
-    @Test( groups = "CategoryA" )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test( groups = "CategoryB" )
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test( groups = { "CategoryA", "CategoryB" } )
-    public void testInCategoriesAB()
-    {
-        System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
-        catACount++;
-        catBCount++;
-    }
-
-    @Test( groups="CategoryC" )
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("mA: " + catACount + "\n" +
-            "mB: " + catBCount + "\n" +
-            "mC: " + catCCount );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
deleted file mode 100644
index 111f20d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class NoCategoryTest {
-  static int catNoneCount = 0;
-
-  @Test
-  public void testInNoCategory()
-  {
-      catNoneCount++;
-  }
-
-  @AfterClass
-  public static void oneTimeTearDown()
-  {
-      System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
-  }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
deleted file mode 100644
index 61be350..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<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>log4jClassloader</artifactId>
-  <name>surefire-812-log4j-classloader</name>
-  <version>1.0.0-SNAPSHOT</version>
-
-  <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <useManifestOnlyJar>false</useManifestOnlyJar>
-          <forkMode>always</forkMode>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <systemPropertyVariables>
-            <java.awt.headless>true</java.awt.headless>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
deleted file mode 100644
index 070ddc9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-
-log4j.rootLogger=debug, stdout, xml, R
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-log4j.appender.xml=org.apache.log4j.FileAppender
-log4j.appender.xml.file=example_xml.log
-log4j.appender.xml.append=false
-log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=example.log
-
-
-log4j.appender.R.MaxFileSize=100KB
-# Keep one backup file
-log4j.appender.R.MaxBackupIndex=1
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
deleted file mode 100644
index 3cda524..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package surefire812;
-
-/*
- * 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.log4j.Logger;
-
-import junit.framework.TestCase;
-
-public class LoggingTest extends TestCase
-{
-    //static {
-//        Logger.getLogger( LoggingTest.class ).debug( "fud");
-//    }
-
-    public void testCanLogAMessage()
-    {
-        Logger.getLogger( LoggingTest.class ).warn( "hey you" );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
deleted file mode 100644
index 8f48176..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-<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>
-  <parent>
-    <groupId>org.apache.maven.surefire</groupId>
-    <artifactId>it-parent</artifactId>
-    <version>1.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>jiras-surefire-817</artifactId>
-  <version>1.0</version>
-  <url>http://maven.apache.org</url>
-  <developers>
-    <developer>
-      <id>tibordigana</id>
-      <name>Tibor Digaňa (tibor17)</name>
-      <email>tibordigana@apache.org</email>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>Europe/Bratislava</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>always</forkMode>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>${surefire.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
deleted file mode 100644
index f56fd31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jiras.surefire817;
-
-/*
- * 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.
- */
-
-public class Test {
-    @org.junit.Test
-    public void test()
-    {
-        System.out.println( getClass() + " " + Thread.currentThread().getName() );
-        System.exit( 1 );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
deleted file mode 100644
index cef444e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<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>test</groupId>
-    <artifactId>cyril</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>cyril</name>
-
-    <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock</artifactId>
-            <version>1.1.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
deleted file mode 100644
index 9246e85..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cyril.test;
-
-/*
- * 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.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import org.junit.Test;
-
-
-public class FirstTest
-    extends MockObjectTestCase
-{
-
-    private Mock myServiceMock;
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        myServiceMock = mock( MyService.class );
-    }
-
-
-    @Test
-    public void test()
-    {
-
-        Message myMessage = new Message( "MyMessage" );
-        // Expectations
-        myServiceMock.expects( once() ).method( "writeMessage" ).with( eq( myMessage ) ).will(
-            returnValue( myMessage ) );
-
-        ( (MyService) myServiceMock.proxy() ).writeMessage( null );
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
deleted file mode 100644
index d66adc8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cyril.test;
-
-/*
- * 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.junit.Test;
-
-
-public class IgnoredTest
-{
-
-
-    @Test
-    public void test()
-    {
-        System.out.println( "My test is running fine" );
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
deleted file mode 100644
index 9d37531..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cyril.test;
-
-/*
- * 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.
- */
-
-public class Message
-{
-
-    private String content;
-
-    public Message( String content )
-    {
-        this.content = content;
-    }
-
-    public int hashCode()
-    {
-        throw new NullPointerException();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
deleted file mode 100644
index cb84749..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cyril.test;
-
-/*
- * 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.
- */
-
-
-public interface MyService
-{
-
-    public Message writeMessage( Message aMessage );
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
deleted file mode 100644
index f390ade..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cyril.test;
-
-public class MyServiceImpl
-    implements MyService
-{
-
-    public Message writeMessage( Message aMessage )
-    {
-        return aMessage;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
deleted file mode 100644
index a06ab61..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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>surefire-testcase</groupId>
-  <artifactId>surefire-testcase</artifactId>
-  <version>1.0</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>pl.pragmatists</groupId>
-      <artifactId>JUnitParams</artifactId>
-      <version>0.4.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <parallel>both</parallel>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
deleted file mode 100644
index 3ccd814..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package surefire.testcase;
-/*
- * 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 java.util.Arrays;
-import java.util.Collection;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire JunitParams test.
- */
-@RunWith( JUnitParamsRunner.class )
-public class JunitParamsTest
-{
-
-    @Parameters( method = "parameters" )
-    @Test
-    public void testSum( int a, int b, int expected )
-    {
-        assertThat( a + b, equalTo( expected ) );
-    }
-
-    public Collection<Integer[]> parameters()
-    {
-        Integer[][] parameters = { { 1, 2, 3 }, { 2, 3, 5 }, { 3, 4, 7 }, };
-        return Arrays.asList( parameters );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
deleted file mode 100644
index 6cffeeb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package surefire.testcase;
-/*
- * 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.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire non-JunitParams test.
- */
-public class NonJunitParamsTest
-{
-
-    @Test
-    public void testSum()
-    {
-        assertThat( 1 + 2, equalTo( 3 ) );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
deleted file mode 100644
index 2d005b6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<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>junit4</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test for JUnit 4.8.1</name>
-
-
-  <properties>
-    <junitVersion>4.8.1</junitVersion>
-      <groups>junit4.CategoryA,junit4.CategoryB</groups>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <groups>${groups}</groups>
-          <excludedGroups>${excludedGroups}</excludedGroups>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>${surefire.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <profile>
-      <id>emptyGroups</id>
-      <activation>
-        <property>
-          <name>profile</name>
-          <value>emptyGroups</value>
-        </property>
-      </activation>
-      <properties>
-        <groups></groups>
-        <excludedGroups>junit4.CategoryC</excludedGroups>
-      </properties>
-    </profile>
-    <profile>
-      <id>emptyExcludedGroups</id>
-      <activation>
-        <property>
-          <name>profile</name>
-          <value>emptyExcludedGroups</value>
-        </property>
-      </activation>
-      <properties>
-        <groups>junit4.CategoryA &amp;&amp; junit4.CategoryB</groups>
-        <excludedGroups></excludedGroups>
-      </properties>
-    </profile>
-  </profiles>
-
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index ecfec31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-public class BasicTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-    static int catNoneCount = 0;
-    
-    @Rule
-    public TestName testName = new TestName();
-    
-    @Before
-    public void testName()
-    {
-        System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
-    }
-    
-    @Test
-    @Category(CategoryA.class)
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test
-    @Category(CategoryB.class)
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test
-    @Category({CategoryA.class, CategoryB.class})
-    public void testInCategoryAB()
-    {
-        catACount++;
-        catBCount++;
-    }
-
-    @Test
-    @Category(CategoryC.class)
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @Test
-    public void testInNoCategory()
-    {
-        catNoneCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("catA: " + catACount + "\n" +
-            "catB: " + catBCount + "\n" +
-            "catC: " + catCCount + "\n" +
-            "catNone: " + catNoneCount);
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-
-    @Rule
-    public TestName testName = new TestName();
-    
-    @Before
-    public void testName()
-    {
-        System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
-    }
-    
-    @Test
-    @Category( CategoryA.class )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test
-    @Category(CategoryB.class)
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test
-    @Category({CategoryA.class, CategoryB.class})
-    public void testInCategoriesAB()
-    {
-        catACount++;
-        catBCount++;
-    }
-
-    @Test
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("mA: " + catACount + "\n" +
-            "mB: " + catBCount + "\n" +
-            "mC: " + catCCount );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
-  static int catNoneCount = 0;
-
-  @Test
-  public void testInNoCategory()
-  {
-      catNoneCount++;
-  }
-
-  @AfterClass
-  public static void oneTimeTearDown()
-  {
-      System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
-  }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
deleted file mode 100644
index 989f8af..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        ~ 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.
-    -->
-
-<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>testng-group-expressions</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>TestNG group expressions tests</name>
-
-    <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.8</version>
-            <classifier>jdk15</classifier>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-  
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <configuration>
-                  <groups>${groups}</groups>
-                  <excludedGroups>${excludedGroups}</excludedGroups>
-                </configuration>
-            </plugin>
-      </plugins>
-  </build>
-  
-  <profiles>
-    <profile>
-      <id>emptyGroups</id>
-      <activation>
-        <property>
-          <name>profile</name>
-          <value>emptyGroups</value>
-        </property>
-      </activation>
-      <properties>
-        <groups></groups>
-        <excludedGroups>CategoryC</excludedGroups>
-      </properties>
-    </profile>
-    <profile>
-      <id>emptyExcludedGroups</id>
-      <activation>
-        <property>
-          <name>profile</name>
-          <value>emptyExcludedGroups</value>
-        </property>
-      </activation>
-      <properties>
-        <groups>CategoryA &amp;&amp; CategoryB</groups>
-        <excludedGroups></excludedGroups>
-      </properties>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
deleted file mode 100644
index c53875a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-
-public class BasicTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-    static int catNoneCount = 0;
-    
-    @Test( groups = "CategoryA" )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test( groups = "CategoryB" )
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test( groups = { "CategoryA", "CategoryB" } )
-    public void testInCategoryAB()
-    {
-        System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
-        catACount++;
-        catBCount++;
-    }
-
-    @Test( groups = "CategoryC" )
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @Test
-    public void testInNoCategory()
-    {
-        catNoneCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("catA: " + catACount + "\n" +
-            "catB: " + catBCount + "\n" +
-            "catC: " + catCCount + "\n" +
-            "catNone: " + catNoneCount);
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
deleted file mode 100644
index 66fafab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class CategoryCTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-
-    @Test( groups = "CategoryA" )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test( groups = "CategoryB" )
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test( groups = { "CategoryA", "CategoryB" } )
-    public void testInCategoriesAB()
-    {
-        System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
-        catACount++;
-        catBCount++;
-    }
-
-    @Test( groups="CategoryC" )
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("mA: " + catACount + "\n" +
-            "mB: " + catBCount + "\n" +
-            "mC: " + catCCount );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
deleted file mode 100644
index 111f20d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class NoCategoryTest {
-  static int catNoneCount = 0;
-
-  @Test
-  public void testInNoCategory()
-  {
-      catNoneCount++;
-  }
-
-  @AfterClass
-  public static void oneTimeTearDown()
-  {
-      System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
-  }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
deleted file mode 100644
index 895dd91..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<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>junit4</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>4.8.1 provider selection Test for JUnit Groups</name>
-
-
-  <properties>
-    <junitVersion>4.8.1</junitVersion>
-      <groups>junit4.CategoryA,junit4.CategoryB</groups>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</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>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index ecfec31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-public class BasicTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-    static int catNoneCount = 0;
-    
-    @Rule
-    public TestName testName = new TestName();
-    
-    @Before
-    public void testName()
-    {
-        System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
-    }
-    
-    @Test
-    @Category(CategoryA.class)
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test
-    @Category(CategoryB.class)
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test
-    @Category({CategoryA.class, CategoryB.class})
-    public void testInCategoryAB()
-    {
-        catACount++;
-        catBCount++;
-    }
-
-    @Test
-    @Category(CategoryC.class)
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @Test
-    public void testInNoCategory()
-    {
-        catNoneCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("catA: " + catACount + "\n" +
-            "catB: " + catBCount + "\n" +
-            "catC: " + catCCount + "\n" +
-            "catNone: " + catNoneCount);
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
-    static int catACount = 0;
-    static int catBCount = 0;
-    static int catCCount = 0;
-
-    @Rule
-    public TestName testName = new TestName();
-    
-    @Before
-    public void testName()
-    {
-        System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
-    }
-    
-    @Test
-    @Category( CategoryA.class )
-    public void testInCategoryA()
-    {
-        catACount++;
-    }
-
-    @Test
-    @Category(CategoryB.class)
-    public void testInCategoryB()
-    {
-        catBCount++;
-    }
-
-    @Test
-    @Category({CategoryA.class, CategoryB.class})
-    public void testInCategoriesAB()
-    {
-        catACount++;
-        catBCount++;
-    }
-
-    @Test
-    public void testInCategoryC()
-    {
-        catCCount++;
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        System.out.println("mA: " + catACount + "\n" +
-            "mB: " + catBCount + "\n" +
-            "mC: " + catCCount );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.junit.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
-  static int catNoneCount = 0;
-
-  @Test
-  public void testInNoCategory()
-  {
-      catNoneCount++;
-  }
-
-  @AfterClass
-  public static void oneTimeTearDown()
-  {
-      System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
-  }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
deleted file mode 100644
index a244b92..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-start project 
-mvn clean test -Dtest=org.codehaus.SomeFailedTest
\ No newline at end of file