[surefire] 06/10: Disabled the copy of the maven-shared-utils source files

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository surefire.

commit b6d7a71adc76a7a93a557969beb501e2e23966f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 15 00:09:00 2017 +0200

    Disabled the copy of the maven-shared-utils source files
---
 debian/changelog                                   |  1 +
 debian/patches/maven-shared-utils-dependency.patch | 58 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1428eb2..70ecfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ surefire (2.20-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Build the new surefire-logger-api module
     - New build dependency on libbuild-helper-maven-plugin-java
+    - Disabled the copy of the maven-shared-utils source files
   * Returned to a simple single pass build
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 14 Sep 2017 12:43:01 +0200
diff --git a/debian/patches/maven-shared-utils-dependency.patch b/debian/patches/maven-shared-utils-dependency.patch
new file mode 100644
index 0000000..7a0ba11
--- /dev/null
+++ b/debian/patches/maven-shared-utils-dependency.patch
@@ -0,0 +1,58 @@
+Description: Disabled the copy of the maven-shared-utils source files
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/maven-surefire-common/pom.xml
++++ b/maven-surefire-common/pom.xml
+@@ -140,25 +140,6 @@
+         </executions>
+       </plugin>
+       <plugin>
+-        <!-- Remove in 3.0 -->
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>shared-logging-generated-sources</id>
+-            <phase>generate-sources</phase>
+-            <goals>
+-              <goal>unpack</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+-              <overWriteIfNewer>false</overWriteIfNewer>
+-              <artifact>org.apache.maven.shared:maven-shared-utils:3.1.0:jar:sources</artifact>
+-              <includes>org/apache/maven/shared/utils/logging/*.java</includes>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <redirectTestOutputToFile>true</redirectTestOutputToFile>
+--- a/maven-surefire-report-plugin/pom.xml
++++ b/maven-surefire-report-plugin/pom.xml
+@@ -153,24 +153,6 @@
+         </executions>
+       </plugin>
+       <plugin>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>shared-logging-generated-sources</id>
+-            <phase>generate-sources</phase>
+-            <goals>
+-              <goal>unpack</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>${project.build.directory}/generated-sources/dependency</outputDirectory>
+-              <overWriteIfNewer>false</overWriteIfNewer>
+-              <artifact>org.apache.maven.shared:maven-shared-utils:3.1.0:jar:sources</artifact>
+-              <includes>org/apache/maven/shared/utils/logging/*.java</includes>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <configuration>
+           <classpathDependencyExcludes>
diff --git a/debian/patches/series b/debian/patches/series
index e71738f..9f744a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ bypass-testng-version-check.patch
 dependency-plugin-configuration.patch
 doxia-compatibility.patch
 maven-compatibility.patch
+maven-shared-utils-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git