This is an automated email from the git hooks/post-receive script. jamespage pushed a commit to branch master in repository jenkins-remoting.
commit 6feaf360b095bd77b3370cadabc6c9f43413d35e Author: James Page <[email protected]> Date: Sun Jan 26 19:47:47 2014 +0000 d/maven.propertires,d/p/disable-tests.patch: Disable unit testing as this introduces a circular self-dependency. --- debian/changelog | 2 ++ debian/maven.properties | 2 +- debian/patches/disable-tests.patch | 42 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f660df1..433f9df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ jenkins-remoting (2.32-1) UNRELEASED; urgency=medium - d/p/*: Refresh patches. - d/control: Add new BD's on ant, guava, jsr305 and jenkins-constant-pool-scanner. + - d/maven.propertires,d/p/disable-tests.patch: Disable unit testing + as this introduces a circular self-dependency. * d/p/remove-findbugs.patch,d/control,d/maven.rules: Drop patch for removal of findbugs annotations, add BD on findbugs and remap to findbugs artefact naming. diff --git a/debian/maven.properties b/debian/maven.properties index 44fc385..17a452d 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1,6 +1,6 @@ # Include here properties to pass to Maven during the build. # For example: -# maven.test.skip=true +maven.test.skip=true # Specify code source and target as not explicit in pom.xml # and defaults to 1.3 maven.compiler.source=1.5 diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch new file mode 100644 index 0000000..b7c4040 --- /dev/null +++ b/debian/patches/disable-tests.patch @@ -0,0 +1,42 @@ +Description: Disable use of remote-test-client + This dependency introduces an awkward circular + dependency, so disable its use for the time + being +Author: James Page <[email protected]> +Forwarded: not-needed + +--- a/pom.xml ++++ b/pom.xml +@@ -230,32 +230,6 @@ THE SOFTWARE. + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> +- <id>resgen</id> +- <phase>process-test-classes</phase> +- <goals> +- <goal>copy</goal> +- </goals> +- <configuration> +- <artifactItems> +- <artifactItem> +- <groupId>org.jenkins-ci</groupId> +- <artifactId>remoting-test-client</artifactId> +- <version>1.0</version> +- <outputDirectory>target/test-classes</outputDirectory> +- <destFileName>remoting-test-client.jar</destFileName> +- </artifactItem> +- <artifactItem> +- <groupId>org.jenkins-ci</groupId> +- <artifactId>remoting-test-client</artifactId> +- <version>1.0</version> +- <classifier>tests</classifier> +- <outputDirectory>target/test-classes</outputDirectory> +- <destFileName>remoting-test-client-tests.jar</destFileName> +- </artifactItem> +- </artifactItems> +- </configuration> +- </execution> +- <execution> + <id>bundle-arg4j</id> + <phase>process-classes</phase> + <goals> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
