From dadf7316cef9e64973ee2add56a00d39af0454122e846f62d0b1304077a5772c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 07:59:29 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=26 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 241cb4e..50c4e9d 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 1e2db8a..b2ba8b9 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1,7 +1,7 @@ # # spec file for package geronimo-specs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -116,7 +116,7 @@ Patch4: geronimo-specs-j2ee-1.4-pom_xml.patch Patch5: geronimo-specs-corba-2.3-pom_xml.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 @@ -807,7 +807,7 @@ ln -s %{_javadir} external_repo/JPP cp %{SOURCE1000} build.xml %build -ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ +ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ -Didlj=%{java_home}/bin/idlj %install From 1b6efe2f15a1a840921c74566cbf2d9214ac51204fd2971950e8d955b62e9477 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:54:11 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=27 --- geronimo-specs.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 50c4e9d..0ac6d4f 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -2,7 +2,7 @@ Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal - of 1.6 compatibility in OpenJDK 11 + of 1.6 compatibility ------------------------------------------------------------------- Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com From 627ce7a697bfb69522e5592146d776860d2fee9033ba7a63957e74ad55cba9f1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 16 Jul 2018 09:50:17 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=28 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 0ac6d4f..5a5fb90 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 16 09:49:33 UTC 2018 - fstrba@suse.com + +- BuildConflict with java-devel >= 11, since the build uses tools + and APIs removed in jdk11 + ------------------------------------------------------------------- Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index b2ba8b9..5eb2fb7 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -57,7 +57,7 @@ Release: 0 Summary: Geronimo J2EE server J2EE specifications License: Apache-2.0 Group: Development/Languages/Java -Url: http://geronimo.apache.org +URL: http://geronimo.apache.org Source0: %{name}-%{version}-src.tar.bz2 # STEPS TO CREATE THE SOURCE FILE # mkdir geronimo-specs-1.2 @@ -120,6 +120,7 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 +BuildConflicts: java-devel >= 11 # The main package has links to all specs, so it requires all subpackages # except j2ee-schema (not linked) and javadocs Requires: geronimo-annotation-1_0-api = %{version} @@ -158,7 +159,6 @@ Requires: geronimo-servlet-2_5-api = %{version} Requires: geronimo-stax-1_0-api = %{version} Requires: geronimo-ws-metadata-2_0-api = %{version} Obsoletes: geronimo-javadoc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description