Hello community, here is the log from the commit of package findbugs for openSUSE:Factory checked in at 2019-01-08 12:25:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/findbugs (Old) and /work/SRC/openSUSE:Factory/.findbugs.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "findbugs" Tue Jan 8 12:25:49 2019 rev:28 rq:660487 version:3.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/findbugs/findbugs.changes 2018-12-04 20:56:21.188717743 +0100 +++ /work/SRC/openSUSE:Factory/.findbugs.new.28833/findbugs.changes 2019-01-08 12:28:16.488285521 +0100 @@ -1,0 +2,42 @@ +Thu Dec 20 21:35:33 UTC 2018 - Jan Engelhardt <[email protected]> + +- Restore nominal phrase in summary. + +------------------------------------------------------------------- +Wed Dec 19 14:53:03 UTC 2018 - Fridrich Strba <[email protected]> + +- Update to version 3.0.1 + * Build with source/target 7 + * Build against objectweb-asm instead of asm3 +- Removed patches: + * findbugs-1.3.9-build.patch + * findbugs-1.3.9-jdk9.patch + * findbugs-asm-version.patch + * findbugs-jar-filenames.patch + * findbugs-remove-classpath.patch +- Added patches: + * findbugs-ant-task-classpath.patch + + Allow using findbugs even though there is no classpath + in the jar's manifest + * findbugs-build.patch + + Build against the jars in system %_javadir instead of in + tarball's lib directory + + Do not forbid building with Java 8 + + Do not run git while building + * findbugs-dom4j.patch + + Add a cast to be able to build with dom4j 2.0 + * findbugs-jdk11.patch + + Fix incompatible types + * findbugs-manual.patch + + Use xsltproc instead of saxon for xslt processing + + Use the system docbook-xsl-stylesheets + * findbugs-javadoc.patch + + Build javadoc with source 1.7 in order to prevent errors due + to one package name existing in different modules +- Modified patch: + * findbugs-home.patch + + Remove Class-Path entry from findbugs.jar manifest; + use build-classpath instead + + Simplify shell fragment that determines findbugs_home + +------------------------------------------------------------------- Old: ---- README.manual annotations-1.3.9.pom findbugs-1.3.9-build.patch findbugs-1.3.9-jdk9.patch findbugs-1.3.9-source-suse.tar.bz2 findbugs-1.3.9.pom findbugs-ant-1.3.9.pom findbugs-asm-version.patch findbugs-jar-filenames.patch findbugs-remove-classpath.patch New: ---- annotations-3.0.0.pom findbugs-3.0.1-source.zip findbugs-3.0.1.pom findbugs-ant-3.0.0.pom findbugs-ant-task-classpath.patch findbugs-build.patch findbugs-dom4j.patch findbugs-javadoc.patch findbugs-jdk11.patch findbugs-manual.patch noUpdateChecks-plugin-20140707gitcce19ac.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findbugs.spec ++++++ --- /var/tmp/diff_new_pack.Oerq56/_old 2019-01-08 12:28:17.416284507 +0100 +++ /var/tmp/diff_new_pack.Oerq56/_new 2019-01-08 12:28:17.420284502 +0100 @@ -2,7 +2,6 @@ # spec file for package findbugs # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,81 +16,80 @@ # -%global _iconsdir %{_datadir}/icons/ -%define asm_version 3.3 -%bcond_with bundled_jformatstring +%global noupdatechecks_version 20140707gitcce19ac Name: findbugs -Version: 1.3.9 +Version: 3.0.1 Release: 0 -Summary: Bug Pattern Detector for Java +Summary: Bug pattern detector for Java License: LGPL-2.1-or-later Group: Development/Languages/Java URL: http://findbugs.sourceforge.net/ -Source0: findbugs-%{version}-source-suse.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.zip Source1: findbugs-ant Source2: findbugs-tools-README -# Versions will be fixed in a patch -Source3: http://repo.maven.apache.org/maven2/com/google/code/findbugs/findbugs/%{version}/findbugs-%{version}.pom -Source4: http://repo.maven.apache.org/maven2/com/google/code/findbugs/annotations/%{version}/annotations-%{version}.pom -Source5: http://repo.maven.apache.org/maven2/com/google/code/findbugs/findbugs-ant/%{version}/findbugs-ant-%{version}.pom +Source3: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs/3.0.1/findbugs-3.0.1.pom +Source4: http://repo1.maven.org/maven2/com/google/code/findbugs/annotations/3.0.0/annotations-3.0.0.pom +# This archive contains the source for the noUpdateChecks plugin. +# It was created with: +# $ git clone --bare [email protected]:findbugsproject/findbugs +# $ git --git-dir=findbugs.git archive --format tgz cce19ac plugins/noUpdateChecks -o noUpdateChecks-plugin-20140707gitcce19ac.tgz +Source5: noUpdateChecks-plugin-%{noupdatechecks_version}.tgz +Source6: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-ant/3.0.0/findbugs-ant-3.0.0.pom Source10: findbugs-16x16.png Source11: findbugs-32x32.png Source12: findbugs-48x48.png Source13: findbugs.desktop -Source1000: README.manual -# This patch has not been submitted upstream, as it contains Fedora-specific -# changes. It looks in /usr/share/java for jar files at both compile time and -# run time, instead of in findbugs' lib directory. -Patch0: findbugs-1.3.9-build.patch -# Build against ASM 3.3 instead of 3.1. Already changed upstream; see: -# http://code.google.com/p/findbugs/source/detail?r=12605 -# http://code.google.com/p/findbugs/source/detail?r=12606 -Patch1: findbugs-asm-version.patch -# Fedora-specific patch: use Fedora JAR filenames -Patch3: findbugs-jar-filenames.patch -# Fedora-specific patch to cope with removal of Class-Path & Main-Class entries -# from findbugs.jar manifest -Patch4: findbugs-remove-classpath.patch -# Fedora-specific patch to allow FindBugs launcher scripts to be run from -# /bin or /usr/bin (#848612) -Patch5: findbugs-home.patch -Patch6: findbugs-1.3.9-jdk9.patch -BuildRequires: ant >= 1.6.5 -BuildRequires: ant-junit -BuildRequires: asm3 +Patch0: findbugs-build.patch +Patch1: findbugs-home.patch +# Allow Ant task to work even though findbugs.jar has no Class-Path attribute in its manifest (bug #1080682) +Patch2: findbugs-ant-task-classpath.patch +Patch3: findbugs-manual.patch +# Port to dom4j 2.0 +Patch4: findbugs-dom4j.patch +Patch5: findbugs-jdk11.patch +Patch6: findbugs-javadoc.patch +BuildRequires: ant +BuildRequires: apache-commons-lang BuildRequires: desktop-file-utils +BuildRequires: docbook-xsl-stylesheets BuildRequires: dom4j BuildRequires: fdupes BuildRequires: findbugs-bcel BuildRequires: hicolor-icon-theme -BuildRequires: jakarta-commons-lang >= 2.4 -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: jaxen BuildRequires: jcip-annotations BuildRequires: jdepend +BuildRequires: jformatstring +BuildRequires: jpackage-utils BuildRequires: jsr-305 BuildRequires: junit +# For generating HTML version of manual using xsltproc +BuildRequires: libxslt +BuildRequires: make +BuildRequires: objectweb-asm +BuildRequires: texlive-preprint +BuildRequires: unzip BuildRequires: update-desktop-files -Requires: asm3 +BuildRequires: tex(latex) +Requires: apache-commons-lang Requires: dom4j Requires: findbugs-bcel -Requires: jakarta-commons-lang >= 2.4 -Requires: java >= 1.8 +Requires: java Requires: jaxen Requires: jcip-annotations +Requires: jformatstring +Requires: jpackage-utils Requires: jsr-305 +Requires: junit +Requires: objectweb-asm BuildArch: noarch -%if %without bundled_jformatstring -BuildRequires: jformatstring -Requires: jformatstring -%endif %description -FindBugs is a program to find bugs in Java programs. It looks for -instances of ``bug patterns''---code instances that are likely to be -errors. +Findbugs is a program which uses static analysis to look for bugs in Java code. +It can check for null pointer exceptions, multithreaded code errors, and other +bugs. %package -n ant-findbugs Summary: Ant task for findbugs @@ -105,12 +103,11 @@ into your ant-controlled project. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc documentation for findbugs Group: Documentation/HTML %description javadoc - -%{summary}. +Javadoc documentation for findbugs. %package tools Summary: Addon tools for findbugs @@ -124,97 +121,57 @@ %prep %setup -q +%setup -q -a 5 %patch0 -p1 %patch1 -p1 - -cp -p %{SOURCE2} README.tools - +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%{_bindir}/find . -name "*.bat" | %{_bindir}/xargs -t rm - -%if %with bundled_jformatstring -# FIXME: (dwalluck): standalone source code is at -# <https://jformatstring.dev.java.net/>, but using bundled source -# for now -unzip -qq -d jFormatString lib/jFormatString.jar -pushd jFormatString/ -%{_bindir}/find -name "*.class" | %{_bindir}/xargs -t rm -%javac `%{_bindir}/find -name "*.java"` -%jar cfm ../lib/jFormatString.jar.no META-INF/MANIFEST.MF . -popd -rm -r jFormatString/ -%endif - -find -name "*.jar" \ -%if %with bundled_jformatstring - -and -not -name jFormatString.jar \ -%endif - | %{_bindir}/xargs -t rm +cp -p %{SOURCE2} README.tools -# Use the system jcip-annotations instead of building it in -rm -fr src/java5/net +# Make sure we don't accidentally use any existing JAR files +rm -f lib/*.jar # Get rid of code for Mac OS X that depends on a jar from Apple -rm -f src/java/edu/umd/cs/findbugs/gui/OSXAdapter.java -rm -f src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java - -# Turn on the executable bits for some auxiliary scripts -chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl - -# Remove Class-Path & Main-Class entries from findbugs.jar manifest -sed -i '/class-path/I d' etc/MANIFEST-findbugs.MF -sed -i '/Main-Class/ d' etc/MANIFEST-findbugs.MF - -cp %{SOURCE1000} . +rm -f src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java +%pom_remove_dep com.apple:AppleJavaExtensions %{SOURCE3} %build -case $(uname -m) in - ppc*) - export ANT_OPTS="-Xss2m" - ;; - *) - export ANT_OPTS="-Xss1m" - ;; -esac - -# Build the class files -ant +# Build the class files and docs +ant docs build # Build the javadocs ant apiJavadoc # Build the architecture PDF -#pushd design/architecture -#make depend -#make -#popd +pushd design/architecture +make %{?_smp_mflags} depend +make %{?_smp_mflags} +popd # Package up the tools -cd build/classes +pushd build/classes jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools +popd + +# Build the noUpdateChecks plugin +pushd plugins/noUpdateChecks +ant plugin-jar +popd %install -# Install jars -mkdir -p %{buildroot}%{_javadir}/ -cp lib/annotations.jar lib/%{name}-annotations.jar -cp -p \ - lib/%{name}.jar \ - lib/%{name}-ant.jar \ - lib/%{name}-annotations.jar \ - lib/%{name}-tools.jar \ -%if %with bundled_jformatstring - lib/jFormatString.jar \ -%endif - %{buildroot}%{_javadir}/ +# Install the jars +mkdir -p %{buildroot}%{_javadir} +cp -p lib/annotations.jar %{buildroot}%{_javadir}/%{name}-annotations.jar +cp -p lib/%{name}-tools.jar %{buildroot}%{_javadir}/%{name}-tools.jar +cp -p lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar # Install the ant task mkdir -p %{buildroot}%{_javadir}/ant -cp -p lib/%{name}-ant.jar %{buildroot}%{_javadir}/ant/ant-%{name}-%{version}.jar -ln -s ant-%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/ant-%{name}.jar +cp -p lib/%{name}-ant.jar %{buildroot}%{_javadir}/ant/ant-%{name}.jar mkdir -p %{buildroot}%{_sysconfdir}/ant.d cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.d/%{name} @@ -224,7 +181,7 @@ # Install the scripts mkdir -p %{buildroot}%{_bindir} -for f in $(find bin -maxdepth 1 -type f \! -name '*.bat'); do +for f in $(find bin -maxdepth 1 -type f \! -name '*.bat' \! -name '*.ico'); do cp -p $f %{buildroot}%{_bindir} done @@ -232,16 +189,32 @@ mkdir -p %{buildroot}%{_datadir}/%{name} cp -a etc plugin %{buildroot}%{_datadir}/%{name} +# Install the noUpdateChecks plugin +cp -p plugins/noUpdateChecks/build/noUpdateChecks.jar %{buildroot}%{_datadir}/%{name}/plugin + +# Create /usr/share/findbugs/lib directory containing symlinks to required JARs (bug #1080682) +# List is based on the Class-Path attribute in etc/MANIFEST-findbugs.MF +mkdir -p %{buildroot}%{_datadir}/%{name}/lib +for i in findbugs findbugs-bcel dom4j jaxen objectweb-asm/asm \ + objectweb-asm/asm-commons objectweb-asm/asm-tree jsr-305 \ + jFormatString apache-commons-lang; do + ln -s %{_javadir}/$i.jar %{buildroot}%{_datadir}/%{name}/lib +done + +# Remove now unnecessary build-only manual files so %%doc doesn't get them +rm -f build/doc/manual*.xml build/doc/manual*.xsl + # Install poms mkdir -p %{buildroot}%{_mavenpomdir} +sed -i 's/3\.0\.0/3\.0\.1/g' %{SOURCE4} %{SOURCE6} cp %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom cp %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP-%{name}-annotations.pom -cp %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}-ant.pom +cp %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.ant-ant-%{name}.pom # Add depmaps %add_maven_depmap -a net.sourceforge.findbugs:findbugs JPP-%{name}.pom %{name}.jar %add_maven_depmap -a net.sourceforge.findbugs:annotations JPP-%{name}-annotations.pom %{name}-annotations.jar -%add_maven_depmap -a net.sourceforge.findbugs:findbugs-ant JPP-%{name}-ant.pom %{name}-ant.jar -f ant +%add_maven_depmap -a net.sourceforge.findbugs:findbugs-ant JPP.ant-ant-%{name}.pom ant/ant-findbugs.jar -f ant mkdir -p %{buildroot}%{_datadir}/applications install -D -p -m 644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png @@ -251,47 +224,32 @@ %suse_update_desktop_file -i %{name} %fdupes -s %{buildroot} +%fdupes -s build/doc -%files -%license LICENSE.txt -%doc README.txt design -%attr(0755,root,root) %{_bindir}/* +%files -f .mfiles +%license licenses/LICENSE.txt +%doc design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt +%doc README.txt "design/eclipse findbugs plugin features.sxw" +%doc design/architecture/architecture.pdf build/doc +%{_bindir}/* %{_datadir}/%{name} -%dir %{_iconsdir}/hicolor/ -%{_iconsdir}/hicolor/16x16/apps/findbugs.png -%{_iconsdir}/hicolor/32x32/apps/findbugs.png -%{_iconsdir}/hicolor/48x48/apps/findbugs.png -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavenpomdir}/JPP-%{name}-annotations.pom -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif +%dir %{_datadir}/icons/hicolor/ +%{_datadir}/icons/hicolor/16x16/apps/findbugs.png +%{_datadir}/icons/hicolor/32x32/apps/findbugs.png +%{_datadir}/icons/hicolor/48x48/apps/findbugs.png %{_datadir}/applications/*%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-annotations.jar -%files -n ant-findbugs -%license LICENSE.txt -%{_javadir}/ant/* +%files -n ant-findbugs -f .mfiles-ant +%license licenses/LICENSE.txt %config(noreplace) %{_sysconfdir}/ant.d/%{name} -%{_mavenpomdir}/JPP-%{name}-ant.pom -%{_javadir}/%{name}-ant.jar -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name}-ant -%else -%{_datadir}/maven-metadata/%{name}-ant.xml* -%endif %files javadoc -%doc README.manual -%{_javadocdir}/%{name} +%{_javadocdir}/* %files tools -%license LICENSE.txt +%license licenses/LICENSE.txt %doc README.tools -%{_javadir}/findbugs-tools* +%{_javadir}/findbugs-tools.jar %changelog ++++++ annotations-1.3.9.pom -> annotations-3.0.0.pom ++++++ --- /work/SRC/openSUSE:Factory/findbugs/annotations-1.3.9.pom 2018-12-04 20:56:21.116717822 +0100 +++ /work/SRC/openSUSE:Factory/.findbugs.new.28833/annotations-3.0.0.pom 2019-01-08 12:28:15.688286395 +0100 @@ -1,8 +1,8 @@ -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>com.google.code.findbugs</groupId> <artifactId>annotations</artifactId> - <version>1.3.9</version> + <version>3.0.0</version> <packaging>jar</packaging> <url>http://findbugs.sourceforge.net/</url> <name>FindBugs-Annotations</name> @@ -15,8 +15,134 @@ </license> </licenses> <scm> - <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection> - <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection> - <url>http://findbugs.googlecode.com/svn/trunk/</url> + <connection>scm:git:https://code.google.com/p/findbugs/</connection> + <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection> + <url>https://code.google.com/p/findbugs/</url> </scm> + + <developers> + <developer> + <id>bp</id> + <name>Bill Pugh</name> + <email>pugh at cs.umd.edu</email> + <url>http://www.cs.umd.edu/~pugh/</url> + <roles> + <role>Project Lead</role> + <role>Primary Developer</role> + </roles> + <timezone>-5</timezone> + </developer> + <developer> + <id>al</id> + <name>Andrey Loskutov</name> + <email>[email protected]</email> + <url>http://andrei.gmxhome.de/privat.html</url> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>+1</timezone> + </developer> + <developer> + <id>bp</id> + <name>Keith Lea</name> + <email></email> + <url>http://keithlea.com/</url> + <roles> + <role>web cloud</role> + </roles> + <timezone>-5</timezone> + </developer> + </developers> + <contributors> + <contributor> + <name>Garvin LeClaire</name> + <email>[email protected]</email> + <url></url> + <roles> + <role>Maven</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>David H. Hovemeyer</name> + <email>[email protected]</email> + <url>http://goose.ycp.edu/~dhovemey/</url> + <roles> + <role>project founder</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Nay Ayewah</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Ben Langmead</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Tomas Pollak</name> + <email></email> + <url></url> + <roles> + <role>Eclipse plugin tests</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Phil Crosby</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Peter Friese</name> + <email></email> + <url></url> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Dave Brosius</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Brian Goetz</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Rohan Lloyd</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + </contributors> </project> ++++++ findbugs-1.3.9.pom -> findbugs-3.0.1.pom ++++++ --- /work/SRC/openSUSE:Factory/findbugs/findbugs-1.3.9.pom 2018-12-04 20:56:21.148717787 +0100 +++ /work/SRC/openSUSE:Factory/.findbugs.new.28833/findbugs-3.0.1.pom 2019-01-08 12:28:15.916286146 +0100 @@ -1,95 +1,377 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>1.3.9</version> - <packaging>jar</packaging> - <url>http://findbugs.sourceforge.net/</url> - <name>FindBugs</name> - <description>Findbugs: Because it's easy!</description> - <licenses> - <license> - <name>GNU Lesser Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection> - <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection> - <url>http://findbugs.googlecode.com/svn/trunk/</url> - </scm> - <dependencies> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>bcel</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jFormatString</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-analysis</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-commons</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-util</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-tree</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-util</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-xml</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - </dependencies> -</project> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.sonatype.oss</groupId> + <artifactId>oss-parent</artifactId> + <version>7</version> + <relativePath /> + </parent> + + <groupId>com.google.code.findbugs</groupId> + <artifactId>findbugs</artifactId> + <version>3.0.1</version> + <packaging>jar</packaging> + + <url>http://findbugs.sourceforge.net/</url> + <name>FindBugs-Project</name> + <description>Findbugs: Because it's easy!</description> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>GNU Lesser Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <prerequisites> + <maven>3.0</maven> + </prerequisites> + + + <scm> + <connection>scm:git:http://code.google.com/p/findbugs/</connection> + <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection> + <url>https://code.google.com/p/findbugs/</url> + </scm> + + <developers> + <developer> + <id>bp</id> + <name>Bill Pugh</name> + <email>pugh at cs.umd.edu</email> + <url>http://www.cs.umd.edu/~pugh/</url> + <roles> + <role>Project Lead</role> + <role>Primary Developer</role> + </roles> + <timezone>-5</timezone> + </developer> + <developer> + <id>al</id> + <name>Andrey Loskutov</name> + <email>[email protected]</email> + <url>http://andrei.gmxhome.de/privat.html</url> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>+1</timezone> + </developer> + <developer> + <id>bp</id> + <name>Keith Lea</name> + <email /> + <url>http://keithlea.com/</url> + <roles> + <role>web cloud</role> + </roles> + <timezone>-5</timezone> + </developer> + </developers> + <contributors> + <contributor> + <name>Garvin LeClaire</name> + <email>[email protected]</email> + <url>http://gdleclaire.blogspot.com</url> + <roles> + <role>Maven</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>David H. Hovemeyer</name> + <email>[email protected]</email> + <url>http://goose.ycp.edu/~dhovemey/</url> + <roles> + <role>project founder</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Nay Ayewah</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Ben Langmead</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Tomas Pollak</name> + <email /> + <url /> + <roles> + <role>Eclipse plugin tests</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Phil Crosby</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Peter Friese</name> + <email /> + <url /> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Dave Brosius</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Brian Goetz</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Rohan Lloyd</name> + <email /> + <url /> + <roles> + <role /> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Tagir Valeev</name> + <email>[email protected]</email> + <url /> + <roles> + <role /> + </roles> + <timezone>+6</timezone> + </contributor> + </contributors> + + <properties> + <asmVersion>5.0.2</asmVersion> + <junitVersion>4.11</junitVersion> + </properties> + + <dependencies> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>bcel-findbugs</artifactId> + <version>6.0</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jFormatString</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-debug-all</artifactId> + <version>${asmVersion}</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>${asmVersion}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>com.apple</groupId> + <artifactId>AppleJavaExtensions</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junitVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.6</version> + <exclusions> + <exclusion> + <artifactId>icu4j</artifactId> + <groupId>com.ibm.icu</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/junit</testSourceDirectory> + <resources> + <resource> + <directory>${basedir}/etc</directory> + <includes> + <include>*.xsd</include> + <include>bugrank.txt</include> + <include>findbugs.xml</include> + <include>messages*.xml</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/xsl</directory> + <includes> + <include>*.xsl</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/antTask</directory> + <includes> + <include>**/*.xsl</include> + <include>**/*.properties</include> + <include>**/*.db</include> + <include>**/*.png</include> + <include>**/*.html</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/gui</directory> + <includes> + <include>**/*.xsl</include> + <include>**/*.properties</include> + <include>**/*.db</include> + <include>**/*.png</include> + <include>**/*.html</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/java</directory> + <includes> + <include>**/*.xsl</include> + <include>**/*.properties</include> + <include>**/*.db</include> + <include>**/*.png</include> + <include>**/*.html</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals><goal>add-source</goal></goals> + <configuration> + <sources> + <source>src/antTask</source> + <source>src/tools</source> + <source>src/gui</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.0</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + <excludes> + <exclude>**/junit/**</exclude> + <exclude>**/infonodeJava/**</exclude> + <exclude>**/obsolete/**</exclude> + </excludes> + <testExcludes> + <exclude>**/architecture/**</exclude> + <exclude>**/cloud/**</exclude> + <exclude>**/DetectorsTest.java</exclude> + </testExcludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <archive> + <manifestFile>${basedir}/etc/MANIFEST-findbugs.MF</manifestFile> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>deploy</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>install</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> ++++++ findbugs-ant ++++++ --- /var/tmp/diff_new_pack.Oerq56/_old 2019-01-08 12:28:17.508284407 +0100 +++ /var/tmp/diff_new_pack.Oerq56/_new 2019-01-08 12:28:17.508284407 +0100 @@ -1,3 +1,3 @@ -findbugs ant/ant-findbugs commons-lang dom4j findbugs-bcel jaxen -jcip-annotations jFormatString jsr-305 junit4 asm3/asm -asm3/asm-commons asm3/asm-tree +findbugs ant/ant-findbugs apache-commons-lang dom4j findbugs-bcel jaxen +jcip-annotations jFormatString jsr-305 junit objectweb-asm/asm +objectweb-asm/asm-commons objectweb-asm/asm-tree ++++++ findbugs-ant-1.3.9.pom -> findbugs-ant-3.0.0.pom ++++++ --- /work/SRC/openSUSE:Factory/findbugs/findbugs-ant-1.3.9.pom 2018-12-04 20:56:21.172717760 +0100 +++ /work/SRC/openSUSE:Factory/.findbugs.new.28833/findbugs-ant-3.0.0.pom 2019-01-08 12:28:15.948286111 +0100 @@ -2,11 +2,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.google.code.findbugs</groupId> <artifactId>findbugs-ant</artifactId> - <version>1.3.9</version> + <version>3.0.0</version> <packaging>jar</packaging> <url>http://findbugs.sourceforge.net/</url> <name>FindBugs-AntTask</name> <description>AntTask to run Findbugs</description> + <licenses> <license> <name>GNU Lesser Public License</name> @@ -14,16 +15,145 @@ <distribution>repo</distribution> </license> </licenses> - <scm> - <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection> - <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection> - <url>http://findbugs.googlecode.com/svn/trunk/</url> - </scm> + + <scm> + <connection>scm:git:http://code.google.com/p/findbugs/</connection> + <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection> + <url>https://code.google.com/p/findbugs/</url> + </scm> + + <developers> + <developer> + <id>bp</id> + <name>Bill Pugh</name> + <email>pugh at cs.umd.edu</email> + <url>http://www.cs.umd.edu/~pugh/</url> + <roles> + <role>Project Lead</role> + <role>Primary Developer</role> + </roles> + <timezone>-5</timezone> + </developer> + <developer> + <id>al</id> + <name>Andrey Loskutov</name> + <email>[email protected]</email> + <url>http://andrei.gmxhome.de/privat.html</url> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>+1</timezone> + </developer> + <developer> + <id>bp</id> + <name>Keith Lea</name> + <email></email> + <url>http://keithlea.com/</url> + <roles> + <role>web cloud</role> + </roles> + <timezone>-5</timezone> + </developer> + </developers> + <contributors> + <contributor> + <name>Garvin LeClaire</name> + <email>[email protected]</email> + <url></url> + <roles> + <role>Maven</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>David H. Hovemeyer</name> + <email>[email protected]</email> + <url>http://goose.ycp.edu/~dhovemey/</url> + <roles> + <role>project founder</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Nay Ayewah</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Ben Langmead</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Tomas Pollak</name> + <email></email> + <url></url> + <roles> + <role>Eclipse plugin tests</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Phil Crosby</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Peter Friese</name> + <email></email> + <url></url> + <roles> + <role>Eclipse plugin</role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Dave Brosius</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Brian Goetz</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + <contributor> + <name>Rohan Lloyd</name> + <email></email> + <url></url> + <roles> + <role></role> + </roles> + <timezone>-5</timezone> + </contributor> + </contributors> + <dependencies> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>findbugs</artifactId> - <version>1.3.9</version> + <version>3.0.0</version> </dependency> </dependencies> + </project> ++++++ findbugs-ant-task-classpath.patch ++++++ diff --git a/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java b/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java index 70af8ef..4919d09 100644 --- a/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java +++ b/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java @@ -28,6 +28,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Reference; /** @@ -311,7 +312,11 @@ public abstract class AbstractFindBugsTask extends Task { File findbugsLibFindBugs = new File(findbugsLib, "findbugs.jar"); // log("executing using home dir [" + homeDir + "]"); if (findbugsLibFindBugs.exists()) { - findbugsEngine.setClasspath(new Path(getProject(), findbugsLibFindBugs.getPath())); + FileSet findbugsLibFileSet = new FileSet(); + findbugsLibFileSet.setProject(getProject()); + findbugsLibFileSet.setDir(findbugsLib); + findbugsLibFileSet.setIncludes("*.jar"); + findbugsEngine.createClasspath().addFileset(findbugsLibFileSet); } else { throw new IllegalArgumentException("Can't find findbugs.jar in " + findbugsLib); } ++++++ findbugs-build.patch ++++++ diff --git a/build.xml b/build.xml index 698b91f..95a8789 100644 --- a/build.xml +++ b/build.xml @@ -18,6 +18,7 @@ <property file="build.properties" /> <property name="jar.dir" value="lib"/> + <property name="systemjar.dir" value="/usr/share/java"/> <property name="plugin.dir" value="plugin"/> <property name="build.dir" value="build"/> <property name="junit.dir" value="build/junit"/> @@ -59,13 +60,26 @@ <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/> <path id="findbugs.classpath"> - <fileset dir="${jar.dir}" includes="*.jar"/> + <pathelement location="${systemjar.dir}/ant.jar" /> + <pathelement location="${systemjar.dir}/objectweb-asm/asm.jar" /> + <pathelement location="${systemjar.dir}/objectweb-asm/asm-commons.jar" /> + <pathelement location="${systemjar.dir}/objectweb-asm/asm-tree.jar" /> + <pathelement location="${systemjar.dir}/findbugs-bcel.jar" /> + <pathelement location="${systemjar.dir}/apache-commons-lang.jar" /> + <pathelement location="${systemjar.dir}/dom4j.jar" /> + <pathelement location="${systemjar.dir}/jaxen.jar" /> + <pathelement location="${systemjar.dir}/jcip-annotations.jar" /> + <pathelement location="${systemjar.dir}/jdepend.jar" /> + <pathelement location="${systemjar.dir}/jFormatString.jar" /> + <pathelement location="${systemjar.dir}/jsr-305.jar" /> + <pathelement location="${systemjar.dir}/junit.jar" /> + <pathelement location="${systemjar.dir}/hamcrest/core.jar" /> </path> <path id="tools.classpath"> <pathelement location="${classes.dir}"/> <pathelement location="${jar.dir}/findbugs.jar"/> - <pathelement location="${jar.dir}/jdepend-2.9.jar"/> + <pathelement location="${systemjar.dir}/jdepend.jar"/> <path refid="findbugs.classpath"/> </path> @@ -122,13 +134,6 @@ </javac> </target> <target name="classes" depends="init"> - <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo> - <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}"> - <condition> - <equals arg1="1.8" arg2="${ant.java.version}"/> - </condition> - </fail> - <!-- Compile Java source files. --> <echo level="info" message="compiling findbugs"/> <javac @@ -298,8 +303,6 @@ <fileset dir="${src.dir}"> <include name="**/annotations/*.java"/> </fileset> - <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/> - <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/> </jar> </target> @@ -634,25 +637,13 @@ <!-- Get version properties. --> - <target name="-get-git-revision"> - <exec executable="git" spawn="false" outputproperty="gitrnum"> - <arg value="log"/> - <arg value="--pretty=format:%h"/> - <arg value="-n"/> - <arg value="1"/> - </exec> - <echo>Got git revision ${gitrnum}</echo> - </target> - - - <target name="version" depends="classes,-get-git-revision" > - <echo>${gitrnum}</echo> + <target name="version" depends="classes" > <java classpathref="tools.classpath" output="${version.props.file}" classname="edu.umd.cs.findbugs.Version" failonerror="true"> <arg value="-props"/> - <sysproperty key="git.revision" value="${gitrnum}"/> + <sysproperty key="git.revision" value="Unknown"/> </java> <loadproperties srcfile="${version.props.file}"/> diff --git a/design/architecture/Makefile b/design/architecture/Makefile index 8765025..0fc7869 100644 --- a/design/architecture/Makefile +++ b/design/architecture/Makefile @@ -4,6 +4,7 @@ PDFS = $(TEX_SRCS:.tex=.pdf) %.pdf : %.tex pdflatex $* pdflatex $* + pdflatex $* all : $(PDFS) ++++++ findbugs-dom4j.patch ++++++ >From 5a337b7fd291f42802ffe001408436df0a6318ce Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Fri, 31 Mar 2017 12:28:29 +0200 Subject: [PATCH] Port to dom4j 2.0 --- src/java/edu/umd/cs/findbugs/xml/XMLUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/edu/umd/cs/findbugs/xml/XMLUtil.java b/src/java/edu/umd/cs/findbugs/xml/XMLUtil.java index 0fa40f9..0baead5 100644 --- a/src/java/edu/umd/cs/findbugs/xml/XMLUtil.java +++ b/src/java/edu/umd/cs/findbugs/xml/XMLUtil.java @@ -30,7 +30,7 @@ public class XMLUtil { @SuppressWarnings("unchecked") public static <T> List<T> selectNodes(Node node, String arg0) { - return node.selectNodes(arg0); + return (List) node.selectNodes(arg0); } } -- 2.9.3 ++++++ findbugs-home.patch ++++++ --- /var/tmp/diff_new_pack.Oerq56/_old 2019-01-08 12:28:17.552284358 +0100 +++ /var/tmp/diff_new_pack.Oerq56/_new 2019-01-08 12:28:17.552284358 +0100 @@ -1,12 +1,135 @@ -diff -ur findbugs-1.3.9-ORIGINAL/etc/script.properties findbugs-1.3.9/etc/script.properties ---- findbugs-1.3.9-ORIGINAL/etc/script.properties 2012-08-16 20:11:04.169075637 +0100 -+++ findbugs-1.3.9/etc/script.properties 2012-08-16 20:12:41.334188169 +0100 -@@ -31,7 +31,7 @@ - fi\n\ - \n\ - # Make absolute\n\ -- findbugs_home=`cd "$findbugs_home" && pwd`\n\ -+ findbugs_home=`cd -P "$findbugs_home" && pwd`\n\ - \n\ - fb_pathsep=':'\n\ - \n\ +diff --git a/etc/MANIFEST-findbugs.MF b/etc/MANIFEST-findbugs.MF +index b29d6f8..9d885be 100644 +--- a/etc/MANIFEST-findbugs.MF ++++ b/etc/MANIFEST-findbugs.MF +@@ -1,3 +1 @@ + Manifest-Version: 1.0 +-Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI +-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar +diff --git a/etc/script.properties b/etc/script.properties +index f595a9a..b94eb5c 100644 +--- a/etc/script.properties ++++ b/etc/script.properties +@@ -3,48 +3,8 @@ + # variable. Also sets the fb_osname shell variable, + # as the output of uname. + script.get.fbhome=\ +- program="$0"\n\ +- \n\ +- # Follow symlinks until we get to the actual file.\n\ +- while [ -h "$program" ]; do\n\ +- \tlink=`ls -ld "$program"`\n\ +- \tlink=`expr "$link" : '.*-> \\(.*\\)'`\n\ +- \tif [ "`expr "$link" : '/.*'`" = 0 ]; then\n\ +- \t\t# Relative\n\ +- \t\tdir=`dirname "$program"`\n\ +- \t\tprogram="$dir/$link"\n\ +- \telse\n\ +- \t\t# Absolute\n\ +- \t\tprogram="$link"\n\ +- \tfi\n\ +- done\n\ +- \n\ +- # Assume findbugs home directory is the parent\n\ +- # of the directory containing the script (which should\n\ +- # normally be "$findbugs_home/bin").\n\ +- dir=`dirname "$program"`\n\ +- findbugs_home="$dir/.."\n\ +- \n\ +- # Handle FHS-compliant installations (e.g., Fink)\n\ +- if [ -d "$findbugs_home/share/findbugs" ]; then\n\ +- \tfindbugs_home="$findbugs_home/share/findbugs"\n\ +- fi\n\ +- \n\ +- # Make absolute\n\ +- findbugs_home=`cd "$findbugs_home" && pwd`\n\ +- \n\ +- fb_pathsep=':'\n\ +- \n\ +- # Handle cygwin, courtesy of Peter D. Stout\n\ ++ findbugs_home=/usr/share/findbugs\n\ + fb_osname=`uname`\n\ +- if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then\n\ +- \tfindbugs_home=`cygpath --mixed "$findbugs_home"`\n\ +- \tfb_pathsep=';'\n\ +- fi\n\ +- # Handle MKS, courtesy of Kelly O'Hair\n\ +- if [ "${fb_osname}" = "Windows_NT" ]; then\n\ +- \tfb_pathsep=';'\n\ +- fi\n\ + \n\ + if [ ! -d "$findbugs_home" ]; then\n\ + \techo "The path $findbugs_home,"\n\ +@@ -88,16 +48,17 @@ script.set.default.java=\ + + # Fragment to execute java, using the arguments stored + # in the shell's $@ variable (and/or in the $fb_appargs variable). +-# Unless fb_appjar is specified, assumes the class to be executed +-# is in $findbugs_home/lib/findbugs.jar. + script.wrap.java=\ + fb_javacmd=\${fb_javacmd:-"java"}\n\ + fb_maxheap=\${fb_maxheap:-"-Xmx768m"}\n\ +- fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\ ++ \n\ ++ fb_classpath=\$(build-classpath findbugs findbugs-bcel dom4j jaxen \\\n\ ++ \tobjectweb-asm/asm-all jsr-305 jFormatString apache-commons-lang)\n\ ++ \n\ + set -f\n\ + #echo command: \\\n\ + exec "$fb_javacmd" \\\n\ +- \t-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \\\n\ ++ \t-classpath "$fb_classpath" \\\n\ + \t-Dfindbugs.home="$findbugs_home"\\\n\ + \t$fb_maxheap $fb_jvmargs $fb_mainclass \${@:+"$@"} $fb_appargs + +diff --git a/src/scripts/standard/fb b/src/scripts/standard/fb +index 1f42652..d8fa084 100644 +--- a/src/scripts/standard/fb ++++ b/src/scripts/standard/fb +@@ -9,8 +9,6 @@ + @SET_DEFAULT_JAVA@ + + +-fb_appjar="$findbugs_home/lib/findbugs.jar" +- + ShowHelpAndExit() { + fb_mainclass="edu.umd.cs.findbugs.ShowHelp" + @WRAP_JAVA@ +diff --git a/src/scripts/standard/findbugs b/src/scripts/standard/findbugs +index d5bd992..779a61a 100755 +--- a/src/scripts/standard/findbugs ++++ b/src/scripts/standard/findbugs +@@ -8,8 +8,6 @@ + + @SET_DEFAULT_JAVA@ + +-fb_appjar="$findbugs_home/lib/findbugs.jar" +- + ShowHelpAndExit() { + fb_mainclass="edu.umd.cs.findbugs.ShowHelp" + @WRAP_JAVA@ +diff --git a/src/scripts/standard/findbugs2 b/src/scripts/standard/findbugs2 +index 36c054b..d250e79 100644 +--- a/src/scripts/standard/findbugs2 ++++ b/src/scripts/standard/findbugs2 +@@ -109,13 +109,18 @@ if [ $fb_osname = "Darwin" ]; then + -Dapple.laf.useScreenMenuBar=true" + fi + ++fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \ ++ objectweb-asm/asm-all jsr-305 jFormatString apache-commons-lang) ++ ++fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI ++ + # + # Launch JVM + # + exec "$fb_javacmd" \ +- -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \ ++ -classpath "$fb_classpath" \ + -Dfindbugs.home="$findbugs_home" \ + $jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \ + -Dfindbugs.launchUI=$fb_launchui \ +- -jar $findbugs_home/lib/findbugs.jar \ ++ $fb_mainclass \ + ${@:+"$@"} ++++++ findbugs-javadoc.patch ++++++ --- 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 @@ <javadoc access="protected" author="true" packagenames="*" + source="1.7" destdir="${apiDoc.dir}" doctitle="FindBugs API Documentation" Header="<b>FindBugs&trade; ${release.number}</b>" @@ -1200,6 +1201,7 @@ 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" 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"/> ++++++ findbugs-jdk11.patch ++++++ --- findbugs-3.0.1/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java 2018-12-19 13:35:39.922423293 +0100 +++ findbugs-3.0.1/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java 2018-12-19 13:36:41.506770502 +0100 @@ -201,7 +201,7 @@ wizardComponents[3] = cloudPanel; @SuppressWarnings("unchecked") - ListCellRenderer<CloudPlugin> aRenderer = new CloudComboBoxRenderer(); + ListCellRenderer<Object> aRenderer = new CloudComboBoxRenderer(); cloudSelector.setRenderer(aRenderer); cloudSelector.addItem(null); String cloudId = project.getCloudId(); ++++++ findbugs-manual.patch ++++++ diff --git a/build.properties b/build.properties index 27f21f8..82f65b1 100644 --- a/build.properties +++ b/build.properties @@ -11,7 +11,7 @@ source.findbugs.jar = src/java/,\ # Set this to the directory containing the DocBook Modular XSL Stylesheets # from http://docbook.sourceforge.net/projects/xsl/ -xsl.stylesheet.home =${local.software.home}/docbook-xsl-1.76.1 +xsl.stylesheet.home =/usr/share/xml/docbook/stylesheet/nwalsh/current # Set this to the directory containing the svnant Ant jars. These are # needed for the srcdist target and to get the svn revision number diff --git a/build.xml b/build.xml index 95a8789..0f48456 100644 --- a/build.xml +++ b/build.xml @@ -856,24 +856,16 @@ --> <target name="generatemanual" unless="manual.uptodate"> <echo>Generating HTML version of manual</echo> - <echo>Running saxon: ${saxon.home}/saxon.jar</echo> - <java fork="true" dir="${docoutput.dir}" failonerror="true" classname="com.icl.saxon.StyleSheet" > - <classpath> - <pathelement location="${saxon.home}/saxon.jar"/> - <pathelement path="${java.class.path}"/> - </classpath> - <arg value="manual.xml" /> + <echo>Running xsltproc</echo> + <exec dir="${docoutput.dir}" failonerror="true" executable="xsltproc"> <arg value="manual.xsl" /> - </java> + <arg value="manual.xml" /> + </exec> - <java fork="true" dir="${docoutput.dir}/ja" failonerror="true" classname="com.icl.saxon.StyleSheet" > - <classpath> - <pathelement location="${saxon.home}/saxon.jar"/> - <pathelement path="${java.class.path}"/> - </classpath> - <arg value="../manual_ja.xml" /> + <exec dir="${docoutput.dir}/ja" failonerror="true" executable="xsltproc"> <arg value="../manual.xsl" /> - </java> + <arg value="../manual_ja.xml" /> + </exec> </target> <!--
