updated to 6.1

Sync with fedora

java-runtime-decompiler.spec

@@ -1,28 +1,33 @@
 Summary: Application for extraction and decompilation of JVM byte code
 Name: java-runtime-decompiler
-Version: 5.1
+Version: 6.1
 Release: 1%{?dist}
 License: GPLv3
 URL: https://github.com/pmikova/java-runtime-decompiler
 Source0: https://github.com/pmikova/%{name}/archive/%{name}-%{version}.tar.gz
 Source1: java-runtime-decompiler
 Source3: jrd.desktop
-Patch0: remove_rsyntaxtextarea.patch
 Patch1: systemFernflower.patch
 Patch2: systemProcyon.patch
+Patch3: rsyntaxVersion.patch
 Patch4: systemCfr.patch
 Patch5: systemJasm.patch
 Patch6: systemJcoder.patch
-
+Patch7: removeMultilineSpotbugs.patch
 
 BuildArch: noarch
 BuildRequires: maven-local
 BuildRequires: byteman
+BuildRequires: rsyntaxtextarea
+BuildRequires: junit5
+BuildRequires: ant-junit5
 BuildRequires: junit
 BuildRequires: ant-junit
 BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit5
 BuildRequires: maven-surefire
 BuildRequires: maven-surefire-plugin
+BuildRequires: maven-clean-plugin
 BuildRequires: java-11-devel
 BuildRequires: google-gson
 BuildRequires: desktop-file-utils
@@ -48,20 +53,32 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p1
 
 %build
 pushd runtime-decompiler
 %pom_remove_plugin :maven-jar-plugin
 popd
-export JAVA_TOOL_OPTIONS="-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none"
+%pom_remove_plugin :spotbugs-maven-plugin
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :formatter-maven-plugin
+%pom_remove_dep :spotbugs-annotations
+a=`find | grep ".*\.java$"`
+for x in $a ; do 
+  #grep -e ".*SuppressFBWarnings.*" $x && echo "^ $x ^"
+  sed "s/.*SuppressFBWarnings.*//g" $x -i
+done
+
+#export JAVA_TOOL_OPTIONS="-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none"
 export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-%mvn_build -f
+
+%mvn_build -f --xmvn-javadoc -- -Plegacy
 $JAVA_HOME/bin/java -cp /usr/share/java/classpathless-compiler/classpathless-compiler.jar:runtime-decompiler/target/runtime-decompiler-%{version}.jar org.jrd.backend.data.Help > %{name}.1
 
 %install
@@ -103,6 +120,17 @@ desktop-file-install --vendor="fedora"                     \
 %license LICENSE
 
 %changelog
+* Sun Dec 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0.pre.3-1
+- bumped sources to upstream rc candidate
+
+* Sun Dec 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0.pre.2-1
+- bumped sources to upstream pre release
+
+* Thu Aug 12 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0.pre.1-1
+- umped sources to upstream pre release
+- adapted jcoder plugin
+- todo, patch for removed plugins
+
 * Thu Aug 12 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-1
 - bumped to final sources