[SCM] jenkins packaging branch, master, updated. debian/1.424.3+dfsg-1-11-gde57da4
James Page
james.page at ubuntu.com
Wed May 2 14:31:31 UTC 2012
The following commit has been merged in the master branch:
commit de57da4b370a75391a562622379b9079abcb4c16
Author: James Page <james.page at ubuntu.com>
Date: Wed May 2 15:13:30 2012 +0100
d/patches/build/remove-findbugs.patch: Drop findbugs annotations from the codebase as this tool is not packaged for Debian.
diff --git a/debian/changelog b/debian/changelog
index d11bf93..3dfc6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ jenkins (1.447.1+dfsg-1) unstable; urgency=low
- d/patches/build/build.patch: Allow building with Maven 2, this works
OK for this package as Maven 3 features are not used by the package
build process at the moment.
+ - d/patches/build/remove-findbugs.patch: Drop findbugs annotations from
+ the codebase as this tool is not packaged for Debian.
- Refreshed all other patches.
- d/maven.ignoreRules, d/maven.properties: Disable unit testing and ignore
powermock dependencies until powermock is packaged.
@@ -17,7 +19,7 @@ jenkins (1.447.1+dfsg-1) unstable; urgency=low
packaged and let users know this feature is missing.
- d/control: Added new dependencies on libsisu-guice-java, libmockito-java.
- -- James Page <james.page at ubuntu.com> Wed, 02 May 2012 15:10:44 +0100
+ -- James Page <james.page at ubuntu.com> Wed, 02 May 2012 15:12:45 +0100
jenkins (1.424.6+dfsg-1) unstable; urgency=low
diff --git a/debian/patches/build/remove-findbugs.patch b/debian/patches/build/remove-findbugs.patch
new file mode 100644
index 0000000..6aa27b0
--- /dev/null
+++ b/debian/patches/build/remove-findbugs.patch
@@ -0,0 +1,96 @@
+Description: The Debian build process does not run findbugs as
+ this is not packaged for Debian.
+ .
+ This patch removes all calls to the findbugs annotations package
+ as this is not packaged either.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/logging/LogRecorderManager.java 2012-04-26 14:09:39.199341012 +0100
++++ jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java 2012-04-30 12:26:52.355201214 +0100
+@@ -112,7 +112,6 @@
+ /**
+ * Configure the logging level.
+ */
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE")
+ public HttpResponse doConfigLogger(@QueryParameter String name, @QueryParameter String level) {
+ Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+ Level lv;
+Index: jenkins/core/src/main/java/hudson/util/PluginServletFilter.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/util/PluginServletFilter.java 2012-04-26 14:09:39.215341004 +0100
++++ jenkins/core/src/main/java/hudson/util/PluginServletFilter.java 2012-04-30 12:27:25.555306327 +0100
+@@ -58,7 +58,6 @@
+ public PluginServletFilter() {
+ }
+
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+ public void init(FilterConfig filterConfig) throws ServletException {
+ PluginServletFilter.filterConfig = filterConfig;
+ synchronized (LIST) {
+Index: jenkins/core/src/main/java/hudson/WebAppMain.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/WebAppMain.java 2012-04-26 14:09:39.195341014 +0100
++++ jenkins/core/src/main/java/hudson/WebAppMain.java 2012-04-30 12:27:08.699252835 +0100
+@@ -260,7 +260,6 @@
+ /**
+ * Installs log handler to monitor all Hudson logs.
+ */
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE")
+ private void installLogger() {
+ Jenkins.logRecords = handler.getView();
+ Logger.getLogger("hudson").addHandler(handler);
+Index: jenkins/core/src/main/java/jenkins/model/Jenkins.java
+===================================================================
+--- jenkins.orig/core/src/main/java/jenkins/model/Jenkins.java 2012-04-26 14:09:39.219341002 +0100
++++ jenkins/core/src/main/java/jenkins/model/Jenkins.java 2012-04-30 12:26:58.503220606 +0100
+@@ -670,7 +670,6 @@
+ * @param pluginManager
+ * If non-null, use existing plugin manager. create a new one.
+ */
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("SC_START_IN_CTOR") // bug in FindBugs. It flags UDPBroadcastThread.start() call but that's for another class
+ protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
+ // As hudson is starting, grant this process full control
+ SecurityContextHolder.getContext().setAuthentication(ACL.SYSTEM);
+@@ -2871,7 +2870,6 @@
+ /**
+ * For debugging. Expose URL to perform GC.
+ */
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("DM_GC")
+ public void doGc(StaplerResponse rsp) throws IOException {
+ checkPermission(Jenkins.ADMINISTER);
+ System.gc();
+Index: jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+===================================================================
+--- jenkins.orig/maven-plugin/src/main/java/hudson/maven/MavenUtil.java 2012-04-26 14:09:39.399340909 +0100
++++ jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java 2012-04-30 12:26:17.835092970 +0100
+@@ -52,7 +52,6 @@
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.project.ProjectBuildingException;
+
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
+ /**
+ * @author Kohsuke Kawaguchi
+@@ -138,7 +137,6 @@
+ * Creates a fresh {@link MavenEmbedder} instance.
+ *
+ */
+- @SuppressWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
+ public static MavenEmbedder createEmbedder(MavenEmbedderRequest mavenEmbedderRequest) throws MavenEmbedderException, IOException {
+
+
+Index: jenkins/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
+===================================================================
+--- jenkins.orig/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java 2012-04-26 14:09:39.403340907 +0100
++++ jenkins/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java 2012-04-30 12:26:32.387138474 +0100
+@@ -168,7 +168,6 @@
+ return true;
+ }
+
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="It's okay to write to static fields here, as each Maven build is started in its own VM")
+ private void markBuildAsSuccess(Throwable mojoError, MavenBuildInformation buildInfo) {
+ if(mojoError == null // in the success case we don't get any exception in Maven 3.0.2+; Maven < 3.0.2 returns no exception anyway
+ || mojoError instanceof MojoFailureException) {
--
jenkins packaging
More information about the pkg-java-commits
mailing list