SPECS/maven.spec

@@ -5,7 +5,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.2
-Release:        4%{?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,8 +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}
 
 %if 0%{?fedora}
 Requires(post): (alternatives if fedora-release >= 30 else chkconfig)
@@ -89,6 +87,14 @@ Requires(postun): chkconfig
 # /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}.
@@ -114,28 +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-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-devel
-Conflicts: maven-jdk-binding
-
-%description -n %{?module_prefix}%{name}-openjdk11
-Configures Maven to run with OpenJDK 11.
-
 %{?javadoc_package}
 
 %prep
@@ -238,11 +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}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
-echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
-
 
 %post -n %{?module_prefix}%{name}
 update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
@@ -277,21 +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
-
 
 %changelog
-* 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