6 changed files with 101 additions and 245 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/apache-maven-3.6.3-src.tar.gz
+SOURCES/apache-maven-3.6.2-src.tar.gz
--- a/.maven.metadata
+++ b/.maven.metadata
@ -1 +1 @@
-ccf441f3bf7f477301ebc80742cbda1da73c30a2 SOURCES/apache-maven-3.6.3-src.tar.gz
+373ffbe9fc88e5facbe10d7a6f6badd243545ade SOURCES/apache-maven-3.6.2-src.tar.gz
--- a/SOURCES/0001-Adapt-mvn-script.patch
+++ b/SOURCES/0001-Adapt-mvn-script.patch
@ -1,14 +1,14 @@
-From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
+From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 1 Feb 2017 14:54:26 +0100
 Subject: [PATCH 1/4] Adapt mvn script

 ---
- apache-maven/src/bin/mvn | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ apache-maven/src/bin/mvn | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)

 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c6617..739501af4 100755
+index a554c6617..0c07ba6e2 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
@@ -22,7 +22,7 @@
@ -20,11 +20,11 @@ index a554c6617..739501af4 100755
 #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
 #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
 # -----------------------------------------------------------------------------
-@@ -33,12 +33,18 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
+@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
     . /etc/mavenrc
   fi
 
-+  if [ -z "$JAVA_HOME" ] ; then
+  if [ -f /etc/java/maven.conf ] ; then
 +    . /etc/java/maven.conf
 +  fi
 +
@ -34,12 +34,18 @@ index a554c6617..739501af4 100755
 
 fi
 
+if [ -f /usr/share/java-utils/java-functions ] ; then
+  . /usr/share/java-utils/java-functions
+  set_jvm
+  set_javacmd
+fi
 +export JAVA_HOME
+export JAVACMD
 +
 # OS specific support. $var _must_ be set to either true or false.
 cygwin=false;
 mingw=false;
-@@ -63,7 +67,8 @@ done
+@@ -63,7 +75,8 @@ done
 
 saveddir=`pwd`
 
--- a/SOURCES/0003-Use-non-shaded-HTTP-wagon.patch
+++ b/SOURCES/0003-Use-non-shaded-HTTP-wagon.patch
@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Use non-shaded HTTP wagon
 2 files changed, 16 deletions(-)

 diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
-index 82e12a3..f02a45e 100644
+index 2686570af..d22ae121d 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@ under the License.
@ -33,12 +33,12 @@ index 82e12a3..f02a45e 100644
 -      </exclusions>
     </dependency>
     <dependency>
-       <!-- this is included in Wagon Http
+       <groupId>org.slf4j</groupId>
 diff --git a/pom.xml b/pom.xml
-index 44e287a..cdef69c 100644
+index 237cdc39e..85436c54d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -328,7 +328,6 @@ under the License.
+@@ -324,7 +324,6 @@ under the License.
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-http</artifactId>
         <version>${wagonVersion}</version>
@ -47,5 +47,5 @@ index 44e287a..cdef69c 100644
           <exclusion>
             <groupId>commons-logging</groupId>
 -- 
-2.24.1
+2.21.0

--- a/SOURCES/0004-Remove-dependency-on-powermock.patch
+++ b/SOURCES/0004-Remove-dependency-on-powermock.patch
@ -8,7 +8,7 @@ Subject: [PATCH] Remove dependency on powermock
 1 file changed, 66 deletions(-)

 diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
-index 45800d6..fbf3b23 100644
+index b66abca..a5b2aa0 100644
 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
 +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -36,8 +36,6 @@ import java.util.concurrent.FutureTask;
@ -92,5 +92,5 @@ index 45800d6..fbf3b23 100644
         throws Exception
     {
 -- 
-2.24.1
+2.21.0

--- a/SPECS/maven.spec
+++ b/SPECS/maven.spec
@ -1,21 +1,19 @@
-%bcond_with bootstrap
-
-%global bundled_slf4j_version 1.7.30
+%global bundled_slf4j_version 1.7.28
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}

 Name:           maven
 Epoch:          1
-Version:        3.6.3
-Release:        15%{?dist}
+Version:        3.6.2
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
 License:        ASL 2.0 and MIT
-URL:            https://maven.apache.org/
+URL:            http://maven.apache.org/
 BuildArch:      noarch

-Source0:        https://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/sources/apache-%{name}-%{version}-src.tar.gz
 Source1:        maven-bash-completion
 Source2:        mvn.1

@ -26,73 +24,88 @@ Patch2:         0002-Invoke-logback-via-reflection.patch
 Patch3:         0003-Use-non-shaded-HTTP-wagon.patch
 Patch4:         0004-Remove-dependency-on-powermock.patch

-BuildRequires:  maven-local-openjdk8
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  mvn(com.google.inject:guice::no_aop:)
-BuildRequires:  mvn(commons-cli:commons-cli)
+BuildRequires:  maven-local
+BuildRequires:  %{?module_prefix}mvn(com.google.inject:guice::no_aop:)
+BuildRequires:  %{?module_prefix}mvn(commons-cli:commons-cli)
 BuildRequires:  mvn(commons-jxpath:commons-jxpath)
-BuildRequires:  mvn(javax.annotation:jsr250-api)
-BuildRequires:  mvn(javax.inject:javax.inject)
+BuildRequires:  %{?module_prefix}mvn(javax.annotation:jsr250-api)
+BuildRequires:  %{?module_prefix}mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  %{?module_prefix}mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-connector-basic)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-impl)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-spi)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-transport-wagon)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
-BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
-BuildRequires:  mvn(org.apache.maven.wagon:wagon-http)
-BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
-BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-api)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-connector-basic)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-impl)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-spi)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-transport-wagon)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.resolver:maven-resolver-util)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.wagon:wagon-file)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.wagon:wagon-http)
+BuildRequires:  %{?module_prefix}mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin) >= 1.10.0
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
-BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) >= 3.2.0
+BuildRequires:  %{?module_prefix}mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
+BuildRequires:  %{?module_prefix}mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
-BuildRequires:  mvn(org.fusesource.jansi:jansi)
-BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
-BuildRequires:  mvn(org.slf4j:slf4j-api)
-BuildRequires:  mvn(org.slf4j:slf4j-simple)
-BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
-BuildRequires:  mvn(org.sonatype.plexus:plexus-sec-dispatcher)
+BuildRequires:  %{?module_prefix}mvn(org.fusesource.jansi:jansi)
+BuildRequires:  mvn(org.mockito:mockito-core) >= 2
+BuildRequires:  %{?module_prefix}mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires:  %{?module_prefix}mvn(org.slf4j:slf4j-api)
+BuildRequires:  %{?module_prefix}mvn(org.slf4j:slf4j-simple)
+BuildRequires:  %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher)
+BuildRequires:  %{?module_prefix}mvn(org.sonatype.plexus:plexus-sec-dispatcher)
 BuildRequires:  mvn(org.xmlunit:xmlunit-core)
 BuildRequires:  mvn(org.xmlunit:xmlunit-matchers)
+
+BuildRequires:  slf4j-sources = %{bundled_slf4j_version}
+
+%if 0%{?module_prefix:1}
+%package -n %{module_prefix}%{name}
+Summary: %{summary}
 %endif

-# XXX
-#BuildRequires:  mvn(org.slf4j:slf4j-simple::sources:) = %{bundled_slf4j_version}
-%if %{without bootstrap}
-BuildRequires:  mvn(org.slf4j:slf4j-simple::sources:)
+Requires: %{?module_prefix}%{name}-lib = %{epoch}:%{version}-%{release}
+
+%if 0%{?fedora}
+Requires(post): (alternatives if fedora-release >= 30 else chkconfig)
+Requires(postun): (alternatives if fedora-release >= 30 else chkconfig)
+%else
+Requires(post): chkconfig
+Requires(postun): chkconfig
 %endif

-Requires: %{name}-lib = %{epoch}:%{version}-%{release}
-Requires: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
-Suggests: %{name}-openjdk11 = %{epoch}:%{version}-%{release}
+# Require full javapackages-tools since maven-script uses
+# /usr/share/java-utils/java-functions
+Requires: javapackages-tools

-Requires: which
+# Theoretically Maven might be usable with just JRE, but typical Maven
+# workflow requires full JDK, so we recommend it here.
+%if 0%{?fedora} || 0%{?rhel} > 7
+Recommends: java-devel
+%else
+Requires: java-devel
+%endif

-Requires(post): alternatives
-Requires(postun): alternatives
+%if 0%{?module_prefix:1}
+%description -n %{module_prefix}%{name}
+%{summary}.
+%endif

 %description
 Maven is a software project management and comprehension tool. Based on the
 concept of a project object model (POM), Maven can manage a project's build,
 reporting and documentation from a central piece of information.

-%package lib
+%package -n %{?module_prefix}%{name}-lib
 Summary:        Core part of Maven
 # If XMvn is part of the same RPM transaction then it should be
 # installed first to avoid triggering rhbz#1014355.
@ -104,58 +117,25 @@ OrderWithRequires: xmvn-minimal
 # maven-slf4j-provider.jar, together with Maven-specific additions.
 Provides:       bundled(slf4j) = %{bundled_slf4j_version}

-%description lib
+%description -n %{?module_prefix}%{name}-lib
 Core part of Apache Maven that can be used as a library.

-%package openjdk8
-Summary:        OpenJDK 8 binding for Maven
-RemovePathPostfixes: -openjdk8
-Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
-Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-1.8.0-openjdk-headless
-Recommends: java-1.8.0-openjdk-devel
-Conflicts: maven-jdk-binding
-
-%description openjdk8
-Configures Maven to run with OpenJDK 8.
-
-%package openjdk11
-Summary:        OpenJDK 11 binding for Maven
-RemovePathPostfixes: -openjdk11
-Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
-Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-11-openjdk-headless
-Recommends: java-11-openjdk-devel
-Conflicts: maven-jdk-binding
-
-%description openjdk11
-Configures Maven to run with OpenJDK 11.
-
-%package openjdk17
-Summary:        OpenJDK 17 binding for Maven
-RemovePathPostfixes: -openjdk17
-Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
-Requires: maven = %{epoch}:%{version}-%{release}
-Requires: java-17-openjdk-headless
-Recommends: java-17-openjdk-devel
-Conflicts: maven-jdk-binding
-
-%description openjdk17
-Configures Maven to run with OpenJDK 17.
-
 %{?javadoc_package}

 %prep
 %setup -q -n apache-%{name}-%{version}

-find -name '*.java' -exec sed -i 's/\r//' {} +
-find -name 'pom.xml' -exec sed -i 's/\r//' {} +
-
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+# TODO Delete after maven-3.6.3
+# Fix Tycho pomless build
+# https://issues.apache.org/jira/browse/MNG-6765
+# https://github.com/apache/maven/commit/07ab962c85950b034be3216996900920c0204c3a
+sed -i 's/@Named/@Named\( "core-default" \)/' maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
+
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
 find -name '*.class' -delete
@ -214,13 +194,10 @@ install -d -m 755 %{buildroot}%{confdir}
 install -d -m 755 %{buildroot}%{_datadir}/bash-completion/completions/

 cp -a $M2_HOME/{bin,lib,boot} %{buildroot}%{homedir}/
-%if %{without bootstrap}
-xmvn-subst -s -R %{buildroot} -s %{buildroot}%{homedir}
+%if !0%{?sclraw_phase}
+xmvn-subst -R %{buildroot} -s %{buildroot}%{homedir}
 %endif

-# maven uses this hardcoded path in its launcher to locate jansi so we symlink it
-ln -s %{_prefix}/lib/jansi/libjansi.so %{buildroot}%{homedir}/lib/jansi-native/
-
 install -p -m 644 %{SOURCE2} %{buildroot}%{homedir}/bin/
 gzip -9 %{buildroot}%{homedir}/bin/mvn.1
 install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/mvn%{?maven_version_suffix}
@ -245,35 +222,28 @@ ln -s %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/mvn%{maven_version_suf
 ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
 %endif

-# JDK bindings
-install -d -m 755 %{buildroot}%{_javaconfdir}/
-echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
-echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
-echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17

-
-%post
+%post -n %{?module_prefix}%{name}
 update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
 --slave %{_bindir}/mvnDebug mvnDebug %{homedir}/bin/mvnDebug \
 --slave %{_mandir}/man1/mvn.1.gz mvn1 %{homedir}/bin/mvn.1.gz \
 --slave %{_mandir}/man1/mvnDebug.1.gz mvnDebug1 %{homedir}/bin/mvn.1.gz \

-%postun
-if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
+%postun -n %{?module_prefix}%{name}
+[[ $1 -eq 0 ]] && update-alternatives --remove mvn %{homedir}/bin/mvn

-%files lib -f .mfiles
+
+%files -n %{?module_prefix}%{name}-lib -f .mfiles
 %doc README.md
 %license LICENSE NOTICE
 %{homedir}
-%exclude %{homedir}/bin/mvn*
 %dir %{confdir}
 %dir %{confdir}/logging
 %config(noreplace) %{_sysconfdir}/m2%{?maven_version_suffix}.conf
 %config(noreplace) %{confdir}/settings.xml
 %config(noreplace) %{confdir}/logging/simplelogger.properties

-%files
-%{homedir}/bin/mvn*
+%files -n %{?module_prefix}%{name}
 %ghost %{_bindir}/mvn
 %ghost %{_bindir}/mvnDebug
 %{_datadir}/bash-completion
@ -286,119 +256,14 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
 %endif

-%files openjdk8
-%config %{_javaconfdir}/maven.conf-openjdk8
-
-%files openjdk11
-%config %{_javaconfdir}/maven.conf-openjdk11
-
-%files openjdk17
-%config %{_javaconfdir}/maven.conf-openjdk17

 %changelog
-* Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Add missing Requires on which
- Resolves: rhbz#2165596
-
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
- Turn hard dependency on java-devel into a weak dependencny
- Resolves: rhbz#2165593
-
-* Thu Dec 01 2022 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-15
- Do not override JAVA_HOME set by user
- Resolves: rhbz#2096431
-
-* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-14
- Add OpenJDK 17 binding
-
-* Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 1:3.6.3-13
- Create a symlink to jansi shared object
- Related: rhbz#1994935
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.6.3-12
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-11
- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-10
- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-9
- Bootstrap build
- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Dec 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-2
- Move launcher scripts from maven-lib to maven package
-
-* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 1:3.6.3-7
- Update jansi dep to jansi1
-
-* Wed Sep 30 2020 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1:3.6.3-6
- Remove unneeded commons-logging from runtime class path (rhbz#1883751)
- Also remove redundant commons-codec
-
-* Tue Aug 25 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.3-5
- Adapt to cdi-api switch from jboss-interceptor to jakarta-interceptor.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:3.6.3-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 25 2020 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.3-2
- Switch jsr250 to jakarta-anntations.
-
-* Mon May 25 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.3-1
- Update to version 3.6.3.
-
-* Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.2-1
- Update to version 3.6.2.
-
-* Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-6
- Port to modello 1.11.
-
-* Thu Feb 27 2020 Marian Koncek <mkoncek@redhat.com> - 1:3.6.3-1
- Update to upstream version 3.6.3
-
-* Wed Feb 05 2020 Dinesh Prasanth M K <dmoluguw@redhat.com> - 1:3.6.1-5
- Require the updated version of slf4j.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-4
- Build with OpenJDK 8
-
-* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-3
- Implement JDK bindings
-
-* Thu Nov 21 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-3
- Require the correct version of guava.
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-2
 - Mass rebuild for javapackages-tools 201902

-* Mon Nov 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-2
- Fix postun scriptlet.
-
-* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-1
- Update to version 3.6.1.
-
 * Thu Oct 03 2019 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-1
 - Update to upstream version 3.6.2

-* Thu Aug 29 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.5.4-12
- Remove dependency on logback-classic.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Wed Jul 03 2019 Marian Koncek <mkoncek@redhat.com> - 1:3.6.1-5
 - Port to modello version 1.11

@ -408,9 +273,6 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-3
 - Mass rebuild for javapackages-tools 201901

-* Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-10
- Update to Mockito 2
-
 * Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-2
 - Update to Mockito 2

@ -420,18 +282,6 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 * Fri Apr 12 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-6
 - Update SLF4J version to 1.7.26

-* Wed Mar 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.5.4-9
- Fix dependency on alternatives
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Oct 22 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-7
- Revert unwanted dependency change
-
-* Mon Oct 22 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.5.4-6
- Specify alternatives as dep, not chkconfig
-
 * Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:3.5.4-2
 - Require javapackages-tools for maven-lib.