From 5cb10a7d23c356dc8d3ce15bb9ea448ab21fee4af727f8b7ec18e01977e8cd72 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Fri, 17 Jan 2020 16:11:57 +0000 Subject: [PATCH] Accepting request 765336 from home:mateialbu:branches:Java:packages - Change build to always use Java 1.8 (bsc#1161025). OBS-URL: https://build.opensuse.org/request/show/765336 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=184 --- tomcat.changes | 5 +++++ tomcat.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 86d4850..b4ad160 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 17 14:26:15 UTC 2020 - Matei Albu + +- Change build to always use Java 1.8 (bsc#1161025). + ------------------------------------------------------------------- Fri Dec 27 10:22:58 UTC 2019 - Matei Albu diff --git a/tomcat.spec b/tomcat.spec index 63dae4c..ed32ee3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -96,7 +96,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.8.0 +BuildRequires: java-devel = 1.8.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit