From 9eecbf531f3b45e4be204b45e06b345c5fc4c625 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jan 04 2016 10:15:00 +0000
Subject: Update for maven-surefire 2.19.1


---

diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch
index b146444..1676d28 100644
--- a/tycho-fix-surefire.patch
+++ b/tycho-fix-surefire.patch
@@ -38,7 +38,7 @@ index c43cc8d..6e5fde4 100644
  					<groupId>org.apache.maven.plugins</groupId>
  					<artifactId>maven-surefire-plugin</artifactId>
 -					<version>2.17</version>
-+					<version>2.19</version>
++					<version>2.19.1</version>
  				</plugin>
  				<plugin>
  					<groupId>org.apache.maven.plugins</groupId>
@@ -53,8 +53,8 @@ index da31140..fb5803f 100644
 -Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
 -Bundle-ClassPath: jars/surefire-junit3-2.17.jar
 +Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
-+Bundle-ClassPath: jars/surefire-junit3-2.19.jar,
-+ jars/common-junit3-2.19.jar
++Bundle-ClassPath: jars/surefire-junit3-2.19.1.jar,
++ jars/common-junit3-2.19.1.jar
  Bundle-Vendor: %providerName
 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
 index f99c319..0224cc6 100644
@@ -81,9 +81,9 @@ index 50be5ea..97760e2 100644
  Bundle-RequiredExecutionEnvironment: J2SE-1.5,
   JavaSE-1.6
 -Bundle-ClassPath: jars/surefire-junit4-2.17.jar
-+Bundle-ClassPath: jars/surefire-junit4-2.19.jar,
-+ jars/common-junit3-2.19.jar,
-+ jars/common-junit4-2.19.jar
++Bundle-ClassPath: jars/surefire-junit4-2.19.1.jar,
++ jars/common-junit3-2.19.1.jar,
++ jars/common-junit4-2.19.1.jar
  Import-Package: junit.framework;version="3.0.0",
   org.junit;version="4.0.0",
   org.junit.runner;version="4.0.0",
@@ -122,11 +122,11 @@ index 595265b..1ac6c5d 100644
 - jars/surefire-junit47-2.17.jar,
 - jars/common-junit48-2.17.jar,
 - jars/surefire-grouper-2.17.jar
-+ jars/surefire-junit47-2.19.jar,
-+ jars/common-junit48-2.19.jar,
-+ jars/surefire-grouper-2.19.jar,
-+ jars/common-junit3-2.19.jar,
-+ jars/common-junit4-2.19.jar
++ jars/surefire-junit47-2.19.1.jar,
++ jars/common-junit48-2.19.1.jar,
++ jars/surefire-grouper-2.19.1.jar,
++ jars/common-junit3-2.19.1.jar,
++ jars/common-junit4-2.19.1.jar
  Import-Package: junit.framework;version="3.0.0",
   org.junit;version="[4.7,5)",
   org.junit.runner;version="[4.7,5)",
@@ -162,9 +162,9 @@ index 991edc1..83732d5 100644
 - jars/surefire-booter-2.17.jar,
 - jars/surefire-api-2.17.jar,
 - jars/maven-surefire-common-2.17.jar
-+ jars/surefire-booter-2.19.jar,
-+ jars/surefire-api-2.19.jar,
-+ jars/maven-surefire-common-2.19.jar,
++ jars/surefire-booter-2.19.1.jar,
++ jars/surefire-api-2.19.1.jar,
++ jars/maven-surefire-common-2.19.1.jar,
 + jars/plexus-utils-3.0.jar
  Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
  Bundle-ManifestVersion: 2
@@ -259,7 +259,7 @@ index cb2b826..bbe5f29 100644
  
  	<properties>
 -		<surefire-version>2.17</surefire-version>
-+		<surefire-version>2.19</surefire-version>
++		<surefire-version>2.19.1</surefire-version>
  		<!-- NOTE: when updating surefire version above, run BND manually to find Import-Package 
  		statements to JUnit packages required for org.eclipse.tycho.surefire.junit* OSGi wrappers.
  		Surefire jars are shaded but not fully self-contained (various package dependencies to org.apache.maven.* 
@@ -317,15 +317,14 @@ index 9f1e332..62a16fb 100644
      protected ScanResult scanForTests() {
          List<String> defaultIncludes = Arrays.asList("**/Test*.class", "**/*Test.class", "**/*TestCase.class");
          List<String> defaultExcludes = Arrays.asList("**/*$*");
-@@ -879,8 +899,9 @@ public class TestMojo extends AbstractMojo {
+@@ -879,8 +899,8 @@ public class TestMojo extends AbstractMojo {
          } else {
              includeList = defaultIncludes;
          }
 -        DirectoryScanner scanner = new DirectoryScanner(testClassesDirectory, includeList, excludes != null ? excludes
 -                : defaultExcludes, Collections.<String> emptyList());
 +        DirectoryScanner scanner = new DirectoryScanner(testClassesDirectory,
-+                new TestListResolver(includeList, excludes != null ? excludes : defaultExcludes),
-+                new TestListResolver(Collections.<String> emptyList()));
++                new TestListResolver(includeList, excludes != null ? excludes : defaultExcludes));
          DefaultScanResult scanResult = scanner.scan();
          return scanResult;
      }
diff --git a/tycho.spec b/tycho.spec
index 85e1806..4cc317f 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -27,7 +27,7 @@
 
 Name:           %{?scl_prefix}tycho
 Version:        0.23.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -422,6 +422,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{_javadocdir}/tycho
 
 %changelog
+* Mon Jan  4 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.23.0-12
+- Update for maven-surefire 2.19.1
+
 * Mon Oct 26 2015 Roland Grunberg <rgrunber@redhat.com> - 0.23.0-11
 - Fix bug in org.eclipse.tycho.surefire.junit4 provider.