Commit 06c40d569f1a1eda9895343e44d101e2cbbbe5b0 - wagon

+5

-3

debian/patches/do_not_build_ftp_tests.patch less more

5	5	wagon-providers/wagon-ftp/pom.xml \| 9 +++++++++
6	6	1 files changed, 9 insertions(+), 0 deletions(-)
7	7
8		--- a/wagon-providers/wagon-ftp/pom.xml
9		+++ b/wagon-providers/wagon-ftp/pom.xml
10		@@ -60,4 +60,18 @@
	8	Index: wagon/wagon-providers/wagon-ftp/pom.xml
	9	===================================================================
	10	--- wagon.orig/wagon-providers/wagon-ftp/pom.xml
	11	+++ wagon/wagon-providers/wagon-ftp/pom.xml
	12	@@ -60,4 +60,18 @@ under the License.
11	13	</dependency>
12	14	</dependencies>
13	15

+10

-6

debian/patches/do_not_run_http_tests.patch less more

0	0	Author: Torsten Werner <twerner@debian.org>
1	1	Author: Damien Raude-Morvan <drazzib@debian.org>
2	2	Subject: Do not run tests making HTTP/HTTPS connections
3		--- a/wagon-providers/wagon-http-lightweight/pom.xml
4		+++ b/wagon-providers/wagon-http-lightweight/pom.xml
5		@@ -70,4 +70,19 @@
	3	Index: wagon/wagon-providers/wagon-http-lightweight/pom.xml
	4	===================================================================
	5	--- wagon.orig/wagon-providers/wagon-http-lightweight/pom.xml
	6	+++ wagon/wagon-providers/wagon-http-lightweight/pom.xml
	7	@@ -70,4 +70,19 @@ under the License.
6	8	<artifactId>slf4j-simple</artifactId>
7	9	</dependency>
8	10	</dependencies>

22	24	+ </plugins>
23	25	+ </build>
24	26	</project>
25		--- a/wagon-providers/wagon-http/pom.xml
26		+++ b/wagon-providers/wagon-http/pom.xml
27		@@ -168,6 +168,18 @@
	27	Index: wagon/wagon-providers/wagon-http/pom.xml
	28	===================================================================
	29	--- wagon.orig/wagon-providers/wagon-http/pom.xml
	30	+++ wagon/wagon-providers/wagon-http/pom.xml
	31	@@ -168,6 +168,18 @@ under the License.
28	32	</systemPropertyVariables>
29	33	</configuration>
30	34	</plugin>

+14

-10

debian/patches/jetty-compatibility.patch less more

0	0	Description: Fixes the compatibility with Jetty 9.4
1	1	Author: Emmanuel Bourg <ebourg@apache.org>
2	2	Forwarded: no
3		--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
4		+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
5		@@ -2239,7 +2239,9 @@
	3	Index: wagon/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
	4	===================================================================
	5	--- wagon.orig/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
	6	+++ wagon/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
	7	@@ -2307,7 +2307,9 @@ public abstract class HttpWagonTestCase
6	8
7	9	TestSecurityHandler sh = new TestSecurityHandler();
8	10	HashLoginService hashLoginService = new HashLoginService( "MyRealm" );

13	15	sh.setLoginService( hashLoginService );
14	16	sh.setConstraintMappings( new ConstraintMapping[]{ cm } );
15	17	sh.setAuthenticator ( new BasicAuthenticator() );
16		--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
17		+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
18		@@ -22,12 +22,12 @@
	18	Index: wagon/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
	19	===================================================================
	20	--- wagon.orig/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
	21	+++ wagon/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
	22	@@ -22,12 +22,12 @@ package org.apache.maven.wagon.tck.http.
19	23	import org.eclipse.jetty.security.ConstraintMapping;
20	24	import org.eclipse.jetty.security.ConstraintSecurityHandler;
21	25	import org.eclipse.jetty.security.HashLoginService;

29	33	import org.eclipse.jetty.server.session.SessionHandler;
30	34	import org.eclipse.jetty.servlet.FilterHolder;
31	35	import org.eclipse.jetty.servlet.FilterMapping;
32		@@ -71,6 +71,8 @@
	36	@@ -71,6 +71,8 @@ public class ServerFixture
33	37
34	38	private final HashLoginService loginService;
35	39

38	42	private final ConstraintSecurityHandler securityHandler;
39	43
40	44	private int filterCount = 0;
41		@@ -117,6 +119,8 @@
	45	@@ -117,6 +119,8 @@ public class ServerFixture
42	46	securityHandler = new ConstraintSecurityHandler();
43	47
44	48	loginService = new HashLoginService( "Test Server" );

47	51
48	52	securityHandler.setLoginService( loginService );
49	53	securityHandler.setConstraintMappings( new ConstraintMapping[]{ cm } );
50		@@ -130,7 +134,7 @@
	54	@@ -130,7 +134,7 @@ public class ServerFixture
51	55	webappContext.setHandler( securityHandler );
52	56
53	57	SessionHandler sessionHandler = webappContext.getSessionHandler();

56	60
57	61	HandlerCollection handlers = new HandlerCollection();
58	62	handlers.setHandlers( new Handler[]{ webappContext, new DefaultHandler() } );
59		@@ -159,7 +163,7 @@
	63	@@ -159,7 +163,7 @@ public class ServerFixture
60	64
61	65	public void addUser( final String user, final String password )
62	66	{

+5

-3

debian/patches/no_itcould_webdav.diff less more

0		--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
1		+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
2		@@ -159,6 +159,15 @@
	0	Index: wagon/wagon-providers/wagon-webdav-jackrabbit/pom.xml
	1	===================================================================
	2	--- wagon.orig/wagon-providers/wagon-webdav-jackrabbit/pom.xml
	3	+++ wagon/wagon-providers/wagon-webdav-jackrabbit/pom.xml
	4	@@ -159,6 +159,15 @@ under the License.
3	5	</systemPropertyVariables>
4	6	</configuration>
5	7	</plugin>

+23

-17

debian/patches/no_mina_sshd.diff less more

0		--- a/wagon-providers/pom.xml
1		+++ b/wagon-providers/pom.xml
2		@@ -40,7 +40,6 @@
	0	Index: wagon/wagon-providers/pom.xml
	1	===================================================================
	2	--- wagon.orig/wagon-providers/pom.xml
	3	+++ wagon/wagon-providers/pom.xml
	4	@@ -40,7 +40,6 @@ under the License.
3	5	<module>wagon-scm</module>
4	6	<module>wagon-ssh-external</module>
5	7	<module>wagon-ssh-common</module>

7	9	<module>wagon-ssh</module>
8	10	<module>wagon-webdav-jackrabbit</module>
9	11	</modules>
10		--- a/wagon-providers/wagon-ssh-external/pom.xml
11		+++ b/wagon-providers/wagon-ssh-external/pom.xml
12		@@ -47,11 +47,6 @@
	12	Index: wagon/wagon-providers/wagon-ssh-external/pom.xml
	13	===================================================================
	14	--- wagon.orig/wagon-providers/wagon-ssh-external/pom.xml
	15	+++ wagon/wagon-providers/wagon-ssh-external/pom.xml
	16	@@ -47,11 +47,6 @@ under the License.
13	17	<artifactId>wagon-ssh-common</artifactId>
14	18	</dependency>
15	19	<dependency>

21	25	<groupId>org.slf4j</groupId>
22	26	<artifactId>slf4j-simple</artifactId>
23	27	</dependency>
24		@@ -62,6 +57,20 @@
25		</dependency>
	28	@@ -63,6 +58,20 @@ under the License.
26	29
27	30	</dependencies>
28		+
	31
29	32	+ <build>
30	33	+ <plugins>
31	34	+ <plugin>

39	42	+ </plugin>
40	43	+ </plugins>
41	44	+ </build>
42
	45	+
43	46	<profiles>
44	47	<profile>
45		--- a/wagon-providers/wagon-ssh/pom.xml
46		+++ b/wagon-providers/wagon-ssh/pom.xml
47		@@ -63,11 +63,6 @@
	48	<id>no-ssh-tests</id>
	49	Index: wagon/wagon-providers/wagon-ssh/pom.xml
	50	===================================================================
	51	--- wagon.orig/wagon-providers/wagon-ssh/pom.xml
	52	+++ wagon/wagon-providers/wagon-ssh/pom.xml
	53	@@ -63,11 +63,6 @@ under the License.
48	54	<artifactId>wagon-ssh-common</artifactId>
49	55	</dependency>
50	56	<dependency>

56	62	<groupId>org.eclipse.jetty.aggregate</groupId>
57	63	<artifactId>jetty-all</artifactId>
58	64	<scope>test</scope>
59		@@ -87,6 +82,20 @@
60		<scope>test</scope>
	65	@@ -88,6 +83,20 @@ under the License.
61	66	</dependency>
62	67	</dependencies>
63		+
	68
64	69	+ <build>
65	70	+ <plugins>
66	71	+ <plugin>

74	79	+ </plugin>
75	80	+ </plugins>
76	81	+ </build>
77
	82	+
78	83	<profiles>
79	84	<profile>
	85	<id>no-ssh-tests</id>