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`
  

SPECS/maven.spec

@@ -5,7 +5,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.2
-Release:        9%{?dist}
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -24,7 +24,7 @@ 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
+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)
@@ -74,10 +74,6 @@ Summary: %{summary}
 %endif
 
 Requires: %{?module_prefix}%{name}-lib = %{epoch}:%{version}-%{release}
-Requires: %{?module_prefix}%{name}-jdk-binding
-Suggests: %{?module_prefix}%{name}-openjdk11 = %{epoch}:%{version}-%{release}
-
-Requires: which
 
 %if 0%{?fedora}
 Requires(post): (alternatives if fedora-release >= 30 else chkconfig)
@@ -87,6 +83,18 @@ Requires(post): chkconfig
 Requires(postun): chkconfig
 %endif
 
+# Require full javapackages-tools since maven-script uses
+# /usr/share/java-utils/java-functions
+Requires: javapackages-tools
+
+# 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
+
 %if 0%{?module_prefix:1}
 %description -n %{module_prefix}%{name}
 %{summary}.
@@ -112,42 +120,6 @@ Provides:       bundled(slf4j) = %{bundled_slf4j_version}
 %description -n %{?module_prefix}%{name}-lib
 Core part of Apache Maven that can be used as a library.
 
-%package -n %{?module_prefix}%{name}-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 -n %{?module_prefix}%{name}-openjdk8
-Configures Maven to run with OpenJDK 8.
-
-%package -n %{?module_prefix}%{name}-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 -n %{?module_prefix}%{name}-openjdk11
-Configures Maven to run with OpenJDK 11.
-
-%package -n %{?module_prefix}%{name}-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 -n %{?module_prefix}%{name}-openjdk17
-Configures Maven to run with OpenJDK 17.
-
 %{?javadoc_package}
 
 %prep
@@ -250,12 +222,6 @@ 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 -n %{?module_prefix}%{name}
 update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
@@ -271,7 +237,6 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %doc README.md
 %license LICENSE NOTICE
 %{homedir}
-%exclude %{homedir}/bin/mvn*
 %dir %{confdir}
 %dir %{confdir}/logging
 %config(noreplace) %{_sysconfdir}/m2%{?maven_version_suffix}.conf
@@ -279,7 +244,6 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %config(noreplace) %{confdir}/logging/simplelogger.properties
 
 %files -n %{?module_prefix}%{name}
-%{homedir}/bin/mvn*
 %ghost %{_bindir}/mvn
 %ghost %{_bindir}/mvnDebug
 %{_datadir}/bash-completion
@@ -292,43 +256,8 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %{_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
-* Thu Feb 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-9
-- Turn hard dependency on java-devel into a weak dependencny
-- Add missing Requires on which
-- Resolves: rhbz#2129825, rhbz#2008121
-
-* Wed Jan 25 2023 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-8
-- Do not override JAVA_HOME set by user
-- Resolves: rhbz#2164351
-
-* Tue Nov 16 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-7
-- Add maven-openjdk17
-- Resolves: rhbz#1991521
-
-* Thu Dec 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-6
-- Move launcher scripts from maven-lib to maven package
-
-* Wed May 20 2020 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-5
-- Drop dependency on javapackages-tools
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-4
-- Build with OpenJDK 8
-- Implement JDK bindings
-
-* Wed Dec 11 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-3
-- Require OpenJDK 11 for runtime
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-2
 - Mass rebuild for javapackages-tools 201902