[wagon2] 03/18: refresh patches

[Emmanuel Bourg]

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

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

commit 8abc48ffcf3daa5473369a72cffa88d900aa7519
Author: tony mancill <tmancill at debian.org>
Date:   Sat May 6 15:29:25 2017 -0700

    refresh patches
---
 debian/patches/do_not_build_ftp_tests.patch | 39 ++++++++++++++---------------
 debian/patches/do_not_run_http_tests.patch  | 26 +++++++++----------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/debian/patches/do_not_build_ftp_tests.patch b/debian/patches/do_not_build_ftp_tests.patch
index 980123d..3a8a2e8 100644
--- a/debian/patches/do_not_build_ftp_tests.patch
+++ b/debian/patches/do_not_build_ftp_tests.patch
@@ -8,23 +8,22 @@ Subject: [PATCH] do not build FtpWagonTest.java
 
 --- a/wagon-providers/wagon-ftp/pom.xml
 +++ b/wagon-providers/wagon-ftp/pom.xml
-@@ -59,5 +59,19 @@
-       <artifactId>commons-io</artifactId>
-     </dependency>
-   </dependencies>
-+  
-+  <build>
-+    <plugins>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <testExcludes>
-+            <exclude>**/FtpWagonTest.java</exclude>
-+          </testExcludes>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+   </build>
- 
- </project>
+@@ -60,4 +60,18 @@
+     </dependency>
+   </dependencies>
+ 
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <testExcludes>
++            <exclude>**/FtpWagonTest.java</exclude>
++          </testExcludes>
++        </configuration>
++      </plugin>
++    </plugins>
++   </build>
++
+ </project>
diff --git a/debian/patches/do_not_run_http_tests.patch b/debian/patches/do_not_run_http_tests.patch
index 50e5af1..42f4b1b 100644
--- a/debian/patches/do_not_run_http_tests.patch
+++ b/debian/patches/do_not_run_http_tests.patch
@@ -3,10 +3,10 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Subject: Do not run tests making HTTP/HTTPS connections
 --- a/wagon-providers/wagon-http-lightweight/pom.xml
 +++ b/wagon-providers/wagon-http-lightweight/pom.xml
-@@ -48,4 +48,19 @@
-       <scope>test</scope>
-     </dependency>
-   </dependencies>
+@@ -70,4 +70,19 @@
+       <artifactId>slf4j-simple</artifactId>
+     </dependency>
+   </dependencies>
 +
 +  <build>
 +    <plugins>
@@ -22,14 +22,14 @@ Subject: Do not run tests making HTTP/HTTPS connections
 +      </plugin>
 +    </plugins>
 +  </build>
- </project>
+ </project>
 --- a/wagon-providers/wagon-http/pom.xml
 +++ b/wagon-providers/wagon-http/pom.xml
-@@ -138,6 +138,18 @@
-           </systemPropertyVariables>
-         </configuration>
-       </plugin>
-+      
+@@ -169,6 +169,18 @@
+           </systemPropertyVariables>
+         </configuration>
+       </plugin>
++
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-surefire-plugin</artifactId>
@@ -41,6 +41,6 @@ Subject: Do not run tests making HTTP/HTTPS connections
 +          </excludes>
 +        </configuration>
 +      </plugin>
-     </plugins>
-   </build>
- </project>
+     </plugins>
+   </build>
+ </project>

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