Switch back to OpenJDK 1.8.0

javapackages-tools.spec

@@ -19,12 +19,12 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e /python-bytecompile/d)
 %endif
 
-%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk
-%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk
+%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk
+%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk
 
 Name:           javapackages-tools
 Version:        5.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -51,15 +51,13 @@ Requires:       coreutils
 Requires:       findutils
 Requires:       which
 # default JRE
-Requires:       java-11-openjdk-headless
+Requires:       java-1.8.0-openjdk-headless
 
 Provides:       jpackage-utils = %{version}-%{release}
 # These could be generated automatically, but then we would need to
 # depend on javapackages-local for dependency generator.
 Provides:       mvn(com.sun:tools) = SYSTEM
 Provides:       mvn(sun.jdk:jconsole) = SYSTEM
-# XXX temp provide
-Provides:       java-headless = 1:11
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -108,14 +106,12 @@ Requires:       xmvn-install
 Requires:       xmvn-subst
 Requires:       xmvn-resolve
 # Java build systems don't have hard requirement on java-devel, so it should be there
-Requires:       java-11-openjdk-devel
+Requires:       java-1.8.0-openjdk-devel
 Requires:       %{python_interpreter}
 Requires:       %{python_prefix}-lxml
 Requires:       %{python_prefix}-six
 Obsoletes:      %{python_prefix}-javapackages < %{version}-%{release}
 Obsoletes:      python-javapackages < %{version}-%{release}
-# XXX temp provide
-Provides:       java-devel = 1:11
 
 %description -n javapackages-local
 This package provides non-essential macros and scripts to support Java packaging.
@@ -181,6 +177,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 %{_datadir}/xmvn/config.d
 
 %changelog
+* Wed Jan 22 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
+- Switch back to OpenJDK 1.8.0
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6
 - Mass rebuild for javapackages-tools 201902