[SCM] jenkins-remoting packaging branch, master, updated. debian/2.16+dfsg-1-6-g3381843

James Page james.page at ubuntu.com
Sun Feb 17 17:45:16 UTC 2013


The following commit has been merged in the master branch:
commit 3381843648736414a094f92a66dbb4603d70c01b
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 17 17:44:01 2013 +0000

    d/control,d/maven.rules: Bump junit -> junit4.

diff --git a/debian/changelog b/debian/changelog
index ecba452..f5edba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jenkins-remoting (2.22+dfsg-1~exp1) experimental; urgency=low
     - Refreshed patches.
     - d/p/remove-findbugs.patch,d/maven.ignoreRules: Drop findbugs
       annotations as not packaged.
+    - d/control,d/maven.rules: Bump junit -> junit4.
   * d/control: Bumped Standards-Version: 3.9.4, no changes.
   * d/control: Dropped DM-Upload-Allowed.
 
diff --git a/debian/control b/debian/control
index f99b253..7cc4224 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep:
  default-jdk-doc,
  jenkins-test-annotations,
- junit (>= 3.8),
+ junit4,
  libanimal-sniffer-java,
  libanimal-sniffer-java-doc,
  libargs4j-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 54a8b6c..593eda1 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,7 +19,7 @@
 args4j args4j-site pom 2.0.16 * *
 args4j args4j jar 2.0.16 * *
 asm asm-all jar s/.*/3.x/ * *
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
 org.jenkins-ci.main remoting jar s/.*/debian/ * *
 asm * * s/3\..*/3.x/ * *
 s/org.jvnet/org.codehaus.mojo/ s/animal-sniffer-annotation/animal-sniffer-annotations/ jar s/.*/debian/ * *

-- 
jenkins-remoting packaging



More information about the pkg-java-commits mailing list