This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon.
commit 479246d0a0a35e3e0979f927546f2af62eef683e Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 8 13:11:40 2017 +0100 Refreshed the patches --- debian/changelog | 4 +- debian/patches/do_not_build_ftp_tests.patch | 36 ++-- debian/patches/do_not_run_http_tests.patch | 20 +- debian/patches/fix_compilation_issues.patch | 14 +- .../patches/network_dependent_test_disabled.patch | 16 +- debian/patches/no_itcould_webdav.diff | 23 +-- debian/patches/no_mina_sshd.diff | 82 ++++---- debian/patches/series | 1 - debian/patches/updated-jetty-compatibility.patch | 209 --------------------- 9 files changed, 94 insertions(+), 311 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12310a4..f338220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -wagon (2.12-4) UNRELEASED; urgency=medium +wagon (3.0.0-1) UNRELEASED; urgency=medium * Team upload. * Renamed the package to wagon + * New upstream release + - Refreshed the patches * Standards-Version updated to 4.1.1 -- Emmanuel Bourg <[email protected]> Wed, 08 Nov 2017 12:46:07 +0100 diff --git a/debian/patches/do_not_build_ftp_tests.patch b/debian/patches/do_not_build_ftp_tests.patch index 3a8a2e8..e5f6fac 100644 --- a/debian/patches/do_not_build_ftp_tests.patch +++ b/debian/patches/do_not_build_ftp_tests.patch @@ -9,21 +9,21 @@ Subject: [PATCH] do not build FtpWagonTest.java --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml @@ -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> + </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 42f4b1b..7c5eb78 100644 --- a/debian/patches/do_not_run_http_tests.patch +++ b/debian/patches/do_not_run_http_tests.patch @@ -4,9 +4,9 @@ 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 @@ -70,4 +70,19 @@ - <artifactId>slf4j-simple</artifactId> - </dependency> - </dependencies> + <artifactId>slf4j-simple</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> @@ -22,13 +22,13 @@ 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 @@ -169,6 +169,18 @@ - </systemPropertyVariables> - </configuration> - </plugin> + </systemPropertyVariables> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> @@ -41,6 +41,6 @@ Subject: Do not run tests making HTTP/HTTPS connections + </excludes> + </configuration> + </plugin> - </plugins> - </build> - </project> + </plugins> + </build> + </project> diff --git a/debian/patches/fix_compilation_issues.patch b/debian/patches/fix_compilation_issues.patch index a863f88..afafe1e 100644 --- a/debian/patches/fix_compilation_issues.patch +++ b/debian/patches/fix_compilation_issues.patch @@ -1,11 +1,11 @@ --- a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java +++ b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java @@ -736,7 +736,7 @@ - - List<String> files = new ArrayList<String>(); - -- for ( ScmFile f : result.getFiles() ) + + List<String> files = new ArrayList<String>(); + +- for ( ScmFile f : result.getFiles() ) + for ( ScmFile f : (List<ScmFile>) result.getFiles() ) - { - files.add( f.getPath() ); - } + { + files.add( f.getPath() ); + } diff --git a/debian/patches/network_dependent_test_disabled.patch b/debian/patches/network_dependent_test_disabled.patch index 0065c13..af18c62 100644 --- a/debian/patches/network_dependent_test_disabled.patch +++ b/debian/patches/network_dependent_test_disabled.patch @@ -5,12 +5,12 @@ Last-Update: 2014-10-09 --- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagonTest.java +++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagonTest.java -@@ -26,7 +26,7 @@ - - public class AbstractHttpClientWagonTest - { -- @Test +@@ -27,7 +27,7 @@ + + public class AbstractHttpClientWagonTest + { +- @Test +// @Test - public void test() - throws Exception - { + public void test() + throws Exception + { diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff index bfb115f..61b35db 100644 --- a/debian/patches/no_itcould_webdav.diff +++ b/debian/patches/no_itcould_webdav.diff @@ -1,18 +1,9 @@ --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml -@@ -146,7 +146,7 @@ - </executions> - </plugin> - <plugin><!-- Jackrabbit is compiled for JDK 6 --> -- <artifactId>maven-enforcer-plugin</artifactId> -+ <!--artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-bytecode-version</id> -@@ -164,6 +164,15 @@ - </execution> - </executions> - </plugin> +@@ -159,6 +159,15 @@ + </systemPropertyVariables> + </configuration> + </plugin> + + <plugin--> + <artifactId>maven-compiler-plugin</artifactId> @@ -22,6 +13,6 @@ + </testExcludes> + </configuration> + </plugin> - </plugins> - </build> - </project> + </plugins> + </build> + </project> diff --git a/debian/patches/no_mina_sshd.diff b/debian/patches/no_mina_sshd.diff index ac08950..b23d985 100644 --- a/debian/patches/no_mina_sshd.diff +++ b/debian/patches/no_mina_sshd.diff @@ -1,31 +1,31 @@ --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml @@ -40,7 +40,6 @@ - <module>wagon-scm</module> - <module>wagon-ssh-external</module> - <module>wagon-ssh-common</module> -- <module>wagon-ssh-common-test</module> - <module>wagon-ssh</module> - <module>wagon-webdav-jackrabbit</module> - </modules> + <module>wagon-scm</module> + <module>wagon-ssh-external</module> + <module>wagon-ssh-common</module> +- <module>wagon-ssh-common-test</module> + <module>wagon-ssh</module> + <module>wagon-webdav-jackrabbit</module> + </modules> --- a/wagon-providers/wagon-ssh-external/pom.xml +++ b/wagon-providers/wagon-ssh-external/pom.xml @@ -47,11 +47,6 @@ - <artifactId>wagon-ssh-common</artifactId> - </dependency> - <dependency> -- <groupId>org.apache.maven.wagon</groupId> -- <artifactId>wagon-ssh-common-test</artifactId> -- <scope>test</scope> -- </dependency> -- <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> + <artifactId>wagon-ssh-common</artifactId> + </dependency> + <dependency> +- <groupId>org.apache.maven.wagon</groupId> +- <artifactId>wagon-ssh-common-test</artifactId> +- <scope>test</scope> +- </dependency> +- <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> @@ -62,6 +57,20 @@ - </dependency> - - </dependencies> + </dependency> + + </dependencies> + + <build> + <plugins> @@ -40,27 +40,27 @@ + </plugin> + </plugins> + </build> - - <profiles> - <profile> + + <profiles> + <profile> --- a/wagon-providers/wagon-ssh/pom.xml +++ b/wagon-providers/wagon-ssh/pom.xml @@ -63,11 +63,6 @@ - <artifactId>wagon-ssh-common</artifactId> - </dependency> - <dependency> -- <groupId>org.apache.maven.wagon</groupId> -- <artifactId>wagon-ssh-common-test</artifactId> -- <scope>test</scope> -- </dependency> -- <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all</artifactId> - <scope>test</scope> + <artifactId>wagon-ssh-common</artifactId> + </dependency> + <dependency> +- <groupId>org.apache.maven.wagon</groupId> +- <artifactId>wagon-ssh-common-test</artifactId> +- <scope>test</scope> +- </dependency> +- <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-all</artifactId> + <scope>test</scope> @@ -87,6 +82,20 @@ - <scope>test</scope> - </dependency> - </dependencies> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> @@ -75,6 +75,6 @@ + </plugin> + </plugins> + </build> - - <profiles> - <profile> + + <profiles> + <profile> diff --git a/debian/patches/series b/debian/patches/series index 66d8ee7..1c8c51f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ no_mina_sshd.diff no_itcould_webdav.diff fix_compilation_issues.patch network_dependent_test_disabled.patch -updated-jetty-compatibility.patch diff --git a/debian/patches/updated-jetty-compatibility.patch b/debian/patches/updated-jetty-compatibility.patch deleted file mode 100644 index e9e59c3..0000000 --- a/debian/patches/updated-jetty-compatibility.patch +++ /dev/null @@ -1,209 +0,0 @@ -Description: Upgrade to Jetty 9 - Reworked from Emmanuel's original jetty-compability.patch, which updated - wagon 2.10 from Jetty6 -> Jetty9. This patch updates wagon 2.12 from - Jetty8 -> Jetty9. -Author: Emmanuel Bourg <[email protected]> -Author: tony mancill <[email protected]> -Forwarded: no -Last-Update: 2017-05-07 - ---- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -@@ -39,6 +39,7 @@ - import org.eclipse.jetty.security.HashLoginService; - import org.eclipse.jetty.security.SecurityHandler; - import org.eclipse.jetty.security.authentication.BasicAuthenticator; -+import org.eclipse.jetty.server.NetworkConnector; - import org.eclipse.jetty.server.Request; - import org.eclipse.jetty.server.Response; - import org.eclipse.jetty.server.Server; -@@ -121,7 +122,7 @@ - { - return 0; - } -- return server.getConnectors()[0].getLocalPort(); -+ return ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); - } - - protected ServletContextHandler createContext( Server server, File repositoryDirectory ) -@@ -169,7 +170,7 @@ - server.start(); - - wagon.connect( -- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); -+ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) server.getConnectors()[0]).getLocalPort() ) ); - - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - -@@ -201,7 +202,7 @@ - server.start(); - - wagon.connect( -- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); -+ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) server.getConnectors()[0]).getLocalPort() ) ); - - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - -@@ -222,7 +223,7 @@ - addConnectors( server ); - server.start(); - wagon.connect( new Repository( "id", getProtocol() + "://localhost:" -- + server.getConnectors()[0].getLocalPort() ) ); -+ + ((NetworkConnector) server.getConnectors()[0]).getLocalPort() ) ); - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - wagon.disconnect(); - server.stop(); -@@ -253,7 +254,7 @@ - addConnectors( server ); - server.start(); - wagon.connect( new Repository( "id", getProtocol() + "://localhost:" -- + server.getConnectors()[0].getLocalPort() ) ); -+ + ((NetworkConnector) server.getConnectors()[0]).getLocalPort() ) ); - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - wagon.disconnect(); - server.stop(); -@@ -270,7 +271,7 @@ - - protected String getRepositoryUrl( Server server ) - { -- int localPort = server.getConnectors()[0].getLocalPort(); -+ int localPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); - return getProtocol() + "://localhost:" + localPort; - } - -@@ -685,7 +686,7 @@ - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) realServer.getConnectors()[0]).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "See Other", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null ); -@@ -751,7 +752,7 @@ - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) realServer.getConnectors()[0]).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "See Other", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null ); -@@ -819,7 +820,7 @@ - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) realServer.getConnectors()[0]).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "See Other", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory ); -@@ -998,7 +999,7 @@ - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) realServer.getConnectors()[0]).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "See Other", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory ); -@@ -1174,7 +1175,7 @@ - - proxyServer.start(); - -- proxyInfo.setPort( proxyServer.getConnectors()[0].getLocalPort() ); -+ proxyInfo.setPort( ((NetworkConnector) proxyServer.getConnectors()[0]).getLocalPort() ); - - System.out.println( - "start proxy on host/port " + proxyInfo.getHost() + "/" + proxyInfo.getPort() + " with non proxyHosts " -@@ -1232,7 +1233,7 @@ - - proxyServer.start(); - -- proxyInfoProvider.getProxyInfo( null ).setPort( proxyServer.getConnectors()[0].getLocalPort() ); -+ proxyInfoProvider.getProxyInfo( null ).setPort( ((NetworkConnector) proxyServer.getConnectors()[0]).getLocalPort() ); - - System.out.println( "start proxy on host/port " + proxyInfoProvider.getProxyInfo( null ).getHost() + "/" - + proxyInfoProvider.getProxyInfo( null ).getPort() + " with non proxyHosts " ---- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java -+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java -@@ -21,21 +21,26 @@ - - import org.eclipse.jetty.server.Connector; - import org.eclipse.jetty.server.Handler; -+import org.eclipse.jetty.server.HttpConfiguration; -+import org.eclipse.jetty.server.HttpConnectionFactory; -+import org.eclipse.jetty.server.SecureRequestCustomizer; -+import org.eclipse.jetty.server.NetworkConnector; - import org.eclipse.jetty.server.Server; -+import org.eclipse.jetty.server.ServerConnector; -+import org.eclipse.jetty.server.SslConnectionFactory; - import org.eclipse.jetty.server.handler.DefaultHandler; - import org.eclipse.jetty.server.handler.HandlerCollection; --import org.eclipse.jetty.server.nio.SelectChannelConnector; - import org.eclipse.jetty.server.session.AbstractSessionManager; - import org.eclipse.jetty.server.session.SessionHandler; - import org.eclipse.jetty.security.ConstraintMapping; - import org.eclipse.jetty.security.ConstraintSecurityHandler; - import org.eclipse.jetty.security.HashLoginService; --import org.eclipse.jetty.server.ssl.SslSocketConnector; - import org.eclipse.jetty.servlet.FilterHolder; - import org.eclipse.jetty.servlet.FilterMapping; - import org.eclipse.jetty.servlet.ServletHolder; - import org.eclipse.jetty.util.security.Constraint; - import org.eclipse.jetty.util.security.Password; -+import org.eclipse.jetty.util.ssl.SslContextFactory; - import org.eclipse.jetty.webapp.WebAppContext; - - import javax.servlet.Filter; -@@ -84,24 +89,34 @@ - server = new Server(); - if ( ssl ) - { -- SslSocketConnector connector = new SslSocketConnector(); - String keystore = getResource( SERVER_SSL_KEYSTORE_RESOURCE_PATH ).getAbsolutePath(); - - LoggerFactory.getLogger( ServerFixture.class ).info( "TCK Keystore path: " + keystore ); - System.setProperty( "javax.net.ssl.keyStore", keystore ); - System.setProperty( "javax.net.ssl.trustStore", keystore ); - -- // connector.setHost( SERVER_HOST ); -- //connector.setPort( port ); -- connector.setKeystore( keystore ); -- connector.setPassword( SERVER_SSL_KEYSTORE_PASSWORD ); -- connector.setKeyPassword( SERVER_SSL_KEYSTORE_PASSWORD ); -+ SslContextFactory sslContextFactory = new SslContextFactory(); -+ sslContextFactory.setKeyStorePath( keystore ); -+ sslContextFactory.setKeyStorePassword( SERVER_SSL_KEYSTORE_PASSWORD ); -+ sslContextFactory.setKeyManagerPassword( SERVER_SSL_KEYSTORE_PASSWORD ); -+ -+ HttpConfiguration http_config = new HttpConfiguration(); -+ http_config.setSecureScheme( "https" ); -+ http_config.setSecurePort( 443 ); -+ -+ HttpConfiguration https_config = new HttpConfiguration( http_config ); -+ https_config.addCustomizer( new SecureRequestCustomizer() ); -+ -+ ServerConnector connector = new ServerConnector(server, -+ new SslConnectionFactory( sslContextFactory, "http/1.1" ), -+ new HttpConnectionFactory( https_config )); -+ connector.setPort( 443 ); - - server.addConnector( connector ); - } - else - { -- Connector connector = new SelectChannelConnector(); -+ ServerConnector connector = new ServerConnector( server ); - connector.setHost( "localhost" ); - //connector.setPort( port ); - server.addConnector( connector ); -@@ -204,7 +219,7 @@ - { - throw new IllegalStateException( "Server didn't start in: " + total + "ms." ); - } -- this.httpPort = server.getConnectors()[0].getLocalPort(); -+ this.httpPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); - } - - public int getHttpPort() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
