Update findbugs to version 3.0.1 / rev 30 via SR 1110689

https://build.opensuse.org/request/show/1110689 by user fstrba + anag+factory reproducibility improvements
bmwiedemann · Sep 13, 2023 · 241e3e2 · 241e3e2
1 parent 59bb4ca
commit 241e3e2
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/packages/f/findbugs/.files b/packages/f/findbugs/.files
diff --git a/packages/f/findbugs/.rev b/packages/f/findbugs/.rev
@@ -251,4 +251,12 @@
     <comment>remove reference to parent pom</comment>
     <requestid>733942</requestid>
   </revision>
+  <revision rev="30" vrev="3">
+    <srcmd5>c5a01f69f32d10d23e7dafd96593000c</srcmd5>
+    <version>3.0.1</version>
+    <time>1694630645</time>
+    <user>anag+factory</user>
+    <comment>reproducibility improvements</comment>
+    <requestid>1110689</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/f/findbugs/findbugs-javadoc.patch b/packages/f/findbugs/findbugs-javadoc.patch
@@ -1,18 +1,20 @@
 --- findbugs-3.0.1/build.xml	2018-12-19 16:12:01.609965260 +0100
 +++ findbugs-3.0.1/build.xml	2018-12-19 16:13:06.614286632 +0100
-@@ -1184,6 +1184,7 @@
+@@ -1184,6 +1184,8 @@
        <javadoc access="protected"
         author="true"
          packagenames="*"
-+        source="1.7"
++        source="8"
++        additionalparam="-notimestamp"
          destdir="${apiDoc.dir}"
          doctitle="FindBugs API Documentation"
          Header="&lt;b&gt;FindBugs&amp;trade; ${release.number}&lt;/b&gt;"
-@@ -1200,6 +1201,7 @@
+@@ -1200,6 +1202,8 @@
         classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
          destdir="${annotationDoc.dir}"
          packagenames="edu.umd.cs.findbugs.annotations"
-+        source="1.7"
++        source="8"
++        additionalparam="-notimestamp"
          doctitle="FindBugs Annotation Documentation"
          nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar= "false" notree="false"
          sourcepath="src/java:src/gui:src/antTask" splitindex="true" use="true" version="true"/>
diff --git a/packages/f/findbugs/findbugs.changes b/packages/f/findbugs/findbugs.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 12 15:15:11 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * findbugs-javadoc.patch
+    + avoid timestamps in javadoc
+- Added patch:
+  * reproducible-now.patch
+    + use timestamp from the SOURCE_DATE_EPOCH environmental
+      variable, if it is set
+
 -------------------------------------------------------------------
 Sun Sep 29 19:55:16 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/f/findbugs/findbugs.spec b/packages/f/findbugs/findbugs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package findbugs
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,6 +48,7 @@ Patch3:         findbugs-manual.patch
 Patch4:         findbugs-dom4j.patch
 Patch5:         findbugs-jdk11.patch
 Patch6:         findbugs-javadoc.patch
+Patch7:         reproducible-now.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-lang
 BuildRequires:  desktop-file-utils
@@ -129,6 +130,7 @@ README.tools for more information.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 cp -p %{SOURCE2} README.tools
 

diff --git a/packages/f/findbugs/reproducible-now.patch b/packages/f/findbugs/reproducible-now.patch
@@ -0,0 +1,13 @@
+--- findbugs-3.0.1/src/java/edu/umd/cs/findbugs/Version.java	2023-09-12 16:45:13.900282199 +0200
++++ findbugs-3.0.1/src/java/edu/umd/cs/findbugs/Version.java	2023-09-12 17:00:09.399877830 +0200
+@@ -92,6 +92,10 @@
+         SimpleDateFormat eclipseDateFormat = new SimpleDateFormat("yyyyMMdd", Locale.ENGLISH);
+         SimpleDateFormat releaseDateFormat = new SimpleDateFormat(UpdateChecker.PLUGIN_RELEASE_DATE_FMT, Locale.ENGLISH);
+         Date now = new Date();
++        if (System.getenv("SOURCE_DATE_EPOCH") != null) {
++            now = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
++        }
++
+         COMPUTED_DATE = dateFormat.format(now);
+         COMPUTED_ECLIPSE_DATE = eclipseDateFormat.format(now);
+         String tmp =  releaseDateFormat.format(now);