This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to branch master in repository sisu-ioc.
commit d5d5a4b476f0973363adb439a2e04a757bddd3a2 Author: Eugene Zhukov <[email protected]> Date: Fri Oct 4 08:24:31 2013 +0000 TestNG dependency update --- debian/changelog | 8 +++++++ debian/maven.rules | 2 +- debian/patches/pom_testng_classifier.patch | 35 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ead8afe..9da136b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sisu-ioc (2.3.0-4) unstable; urgency=low + + * Team upload. + * add patch to remove jdk15 classifier from testng dependency from pom.xml + * fix testng version handling in d/maven.rules + + -- Eugene Zhukov <[email protected]> Fri, 04 Oct 2013 07:52:09 +0000 + sisu-ioc (2.3.0-3) unstable; urgency=low * Fix FTBFS (LP: #935445) (Closes: #662789): diff --git a/debian/maven.rules b/debian/maven.rules index 2a4db91..c69e425 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -25,6 +25,6 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ org.sonatype.sisu sisu-inject-bean jar 2.3.0 * * org.sonatype.sisu sisu-inject-plexus jar 2.3.0 * * -org.testng testng s/bundle/jar/ s/.*/debian/ s/.*/jdk15/ * +org.testng testng jar s/.*/6.x/ s/org.apache.felix/org.osgi/ org.osgi.compendium * * * * s/org.apache.felix/org.osgi/ org.osgi.core * * * * diff --git a/debian/patches/pom_testng_classifier.patch b/debian/patches/pom_testng_classifier.patch new file mode 100644 index 0000000..c427cb7 --- /dev/null +++ b/debian/patches/pom_testng_classifier.patch @@ -0,0 +1,35 @@ +Description: removes jdk15 classifier from testng dependency + * remove jdk15 classifier from testng dependency in pom.xml +Author: Eugene Zhukov <[email protected]> +Last-Update: 2013-10-04 + +--- a/pom.xml ++++ b/pom.xml +@@ -185,7 +185,6 @@ + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.2</version> +- <classifier>jdk15</classifier> + </dependency> + + </dependencies> +--- a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml ++++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml +@@ -70,7 +70,6 @@ + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <optional>true</optional> +- <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.sonatype.sisu.inject</groupId> +--- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml ++++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml +@@ -81,7 +81,6 @@ + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <optional>true</optional> +- <classifier>jdk15</classifier> + </dependency> + </dependencies> + diff --git a/debian/patches/series b/debian/patches/series index 28523c4..92bacb4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ testng_classifier.diff guice_classifier.diff modules.diff javac_apt_scanner.diff +pom_testng_classifier.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
