This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch experimental in repository wagon2.
commit 056ace934fdb299d6f364dc3144ac42ef3a50b7a Author: tony mancill <[email protected]> Date: Sat May 6 16:24:40 2017 -0700 refresh patches --- debian/patches/no_itcould_webdav.diff | 32 ++++++------ debian/patches/no_mina_sshd.diff | 92 +++++++++++++++++------------------ 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff index 6e40c71..bfb115f 100644 --- a/debian/patches/no_itcould_webdav.diff +++ b/debian/patches/no_itcould_webdav.diff @@ -1,19 +1,19 @@ --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml -@@ -142,7 +142,7 @@ - </executions> - </plugin> - <plugin><!-- Jackrabbit is compiled for JDK 6 --> -- <artifactId>maven-enforcer-plugin</artifactId> +@@ -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> -@@ -160,6 +160,15 @@ - </execution> - </executions> - </plugin> -+ + <executions> + <execution> + <id>enforce-bytecode-version</id> +@@ -164,6 +164,15 @@ + </execution> + </executions> + </plugin> ++ + <plugin--> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> @@ -22,6 +22,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 d49b79d..ac08950 100644 --- a/debian/patches/no_mina_sshd.diff +++ b/debian/patches/no_mina_sshd.diff @@ -1,32 +1,32 @@ --- 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.apache.sshd</groupId> - <artifactId>sshd-core</artifactId> - <scope>test</scope> -@@ -78,6 +73,20 @@ - </dependency> - - </dependencies> -+ + <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> ++ + <build> + <plugins> + <plugin> @@ -40,28 +40,28 @@ + </plugin> + </plugins> + </build> - - <profiles> - <profile> + + <profiles> + <profile> --- a/wagon-providers/wagon-ssh/pom.xml +++ b/wagon-providers/wagon-ssh/pom.xml -@@ -58,11 +58,6 @@ - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-common</artifactId> - </dependency> -- <dependency> -- <groupId>org.apache.maven.wagon</groupId> -- <artifactId>wagon-ssh-common-test</artifactId> -- <scope>test</scope> -- </dependency> - - - <dependency> -@@ -85,6 +80,20 @@ - </dependency> - - </dependencies> -+ +@@ -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> +@@ -87,6 +82,20 @@ + <scope>test</scope> + </dependency> + </dependencies> ++ + <build> + <plugins> + <plugin> @@ -75,6 +75,6 @@ + </plugin> + </plugins> + </build> - - <profiles> - <profile> + + <profiles> + <profile> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
