[wagon2] 05/05: New upstream release (2.5) Refreshed the patches Removed the wagon-providers/wagon-http-shared4 module

[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 991b59dea70c0f5aae7d286643440271c670df20
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 28 12:01:00 2013 +0100

    New upstream release (2.5)
    Refreshed the patches
    Removed the wagon-providers/wagon-http-shared4 module
---
 debian/changelog                            |    5 ++++-
 debian/libwagon2-java.poms                  |    1 -
 debian/patches/do_not_build_ftp_tests.patch |    6 ++----
 debian/patches/do_not_run_http_tests.patch  |    4 ++--
 debian/patches/no_itcould_webdav.diff       |    2 +-
 debian/patches/no_mina_sshd.diff            |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3089c97..3caebf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-wagon2 (2.4-2) UNRELEASED; urgency=low
+wagon2 (2.5-1) unstable; urgency=low
 
+  * New upstream release
+    - Refreshed the patches
+    - Removed the wagon-providers/wagon-http-shared4 module
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Updated Standards-Version to 3.9.5 (no changes)
diff --git a/debian/libwagon2-java.poms b/debian/libwagon2-java.poms
index 89c4cf5..c277a1e 100644
--- a/debian/libwagon2-java.poms
+++ b/debian/libwagon2-java.poms
@@ -32,7 +32,6 @@ wagon-providers/wagon-file/pom.xml --has-package-version --java-lib --usj-name=w
 wagon-providers/wagon-ftp/pom.xml --has-package-version --java-lib --usj-name=wagon-ftp-2.x
 wagon-providers/wagon-http/pom.xml --has-package-version --java-lib --usj-name=wagon-http-2.x
 wagon-providers/wagon-http-shared/pom.xml --has-package-version --java-lib --usj-name=wagon-http-shared-2.x
-wagon-providers/wagon-http-shared4/pom.xml --has-package-version --java-lib --usj-name=wagon-http-shared4-2.x
 wagon-providers/wagon-http-lightweight/pom.xml --has-package-version --java-lib --usj-name=wagon-http-lightweight-2.x
 wagon-providers/wagon-scm/pom.xml --has-package-version --java-lib --usj-name=wagon-scm-2.x
 wagon-providers/wagon-ssh/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-2.x
diff --git a/debian/patches/do_not_build_ftp_tests.patch b/debian/patches/do_not_build_ftp_tests.patch
index d8fdbbf..980123d 100644
--- a/debian/patches/do_not_build_ftp_tests.patch
+++ b/debian/patches/do_not_build_ftp_tests.patch
@@ -6,12 +6,10 @@ Subject: [PATCH] do not build FtpWagonTest.java
  wagon-providers/wagon-ftp/pom.xml |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
 
-Index: b/wagon-providers/wagon-ftp/pom.xml
-===================================================================
 --- a/wagon-providers/wagon-ftp/pom.xml
 +++ b/wagon-providers/wagon-ftp/pom.xml
-@@ -55,5 +55,19 @@
-       <artifactId>slf4j-simple</artifactId>
+@@ -59,5 +59,19 @@
+       <artifactId>commons-io</artifactId>
      </dependency>
    </dependencies>
 +  
diff --git a/debian/patches/do_not_run_http_tests.patch b/debian/patches/do_not_run_http_tests.patch
index c9f9ad7..0e079e8 100644
--- a/debian/patches/do_not_run_http_tests.patch
+++ b/debian/patches/do_not_run_http_tests.patch
@@ -3,7 +3,7 @@ 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
-@@ -58,4 +58,19 @@
+@@ -48,4 +48,19 @@
        <scope>test</scope>
      </dependency>
    </dependencies>
@@ -25,7 +25,7 @@ Subject: Do not run tests making HTTP/HTTPS connections
  </project>
 --- a/wagon-providers/wagon-http/pom.xml
 +++ b/wagon-providers/wagon-http/pom.xml
-@@ -114,6 +114,18 @@
+@@ -118,6 +118,18 @@
            </systemPropertyVariables>
          </configuration>
        </plugin>
diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff
index 5ce226a..09f28d3 100644
--- a/debian/patches/no_itcould_webdav.diff
+++ b/debian/patches/no_itcould_webdav.diff
@@ -1,6 +1,6 @@
 --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
 +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
-@@ -165,6 +165,15 @@
+@@ -160,6 +160,15 @@
            </dependency>
          </dependencies>
        </plugin>
diff --git a/debian/patches/no_mina_sshd.diff b/debian/patches/no_mina_sshd.diff
index 0622132..b3f080e 100644
--- a/debian/patches/no_mina_sshd.diff
+++ b/debian/patches/no_mina_sshd.diff
@@ -1,6 +1,6 @@
 --- a/wagon-providers/pom.xml
 +++ b/wagon-providers/pom.xml
-@@ -41,7 +41,6 @@
+@@ -40,7 +40,6 @@
      <module>wagon-scm</module>
      <module>wagon-ssh-external</module>
      <module>wagon-ssh-common</module>

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