This is an automated email from the git hooks/post-receive script. tpot-guest pushed a commit to branch master in repository jenkins.
commit 53175e4e9630d4346ee2bcf97d8bbf714bd9ff46 Author: Tim Potter <[email protected]> Date: Mon Mar 30 13:29:49 2015 +1100 Use d/maven.rules change to rename jffi groupID, removing need for a patch Thanks to ebourg for the tip. --- debian/changelog | 6 ++++-- debian/maven.rules | 1 + .../dependency-upgrades/0030-rename-jffi-groupid.patch | 13 ------------- debian/patches/series | 1 - 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index a01dbe6..a00900f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ jenkins (1.565.3-4) unstable; urgency=medium * Team upload. - * Rename jffi Maven groupId to new location of com.github.jnr - -- Tim Potter <[email protected]> Wed, 04 Mar 2015 22:05:04 +1100 + [ Tim Potter ] + * Update maven.rules for new groupID of jffi library. + + -- Tim Potter <[email protected]> Mon, 30 Mar 2015 13:27:51 +1100 jenkins (1.565.3-3) unstable; urgency=medium diff --git a/debian/maven.rules b/debian/maven.rules index 293bd78..8022d39 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -74,3 +74,4 @@ cglib cglib * s/.*/3.x/ * * s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * * org.jsr-305 jsr305 * 0.x * * s/org.jvnet.hudson/org.jenkins-ci/ test-annotations * s/.*/debian/ * * +s/org.jruby.extras/com.github.jnr/ jffi * s/.*/debian/ * * diff --git a/debian/patches/dependency-upgrades/0030-rename-jffi-groupid.patch b/debian/patches/dependency-upgrades/0030-rename-jffi-groupid.patch deleted file mode 100644 index 6c6abcb..0000000 --- a/debian/patches/dependency-upgrades/0030-rename-jffi-groupid.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: jenkins/core/pom.xml -=================================================================== ---- jenkins.orig/core/pom.xml -+++ jenkins/core/pom.xml -@@ -117,7 +117,7 @@ THE SOFTWARE. - <version>3.0.1</version> - </dependency> - <dependency> -- <groupId>org.jruby.extras</groupId> -+ <groupId>com.github.jnr</groupId> - <artifactId>jffi</artifactId> - <version>0.6.5</version> - </dependency> diff --git a/debian/patches/series b/debian/patches/series index b8e55a1..fb76c72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,4 +24,3 @@ build/0019-io-compat.pach.patch 0027-add-cglib-dependency.patch 0028-properly-set-httponly-flag-for-tomcat.patch 0029-master-slave-security-warning.patch -dependency-upgrades/0030-rename-jffi-groupid.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
