From 941223bb921eacf6925b84ef201c3f0934cf636881dee9a692efbe8145ab9b40 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 07:16:13 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=28 --- eclipse-jgit.spec | 5 ++++- jgit.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index f712527..9e3d834 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,7 +1,7 @@ # # spec file for package eclipse-jgit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,9 @@ BuildRequires: slf4j BuildRequires: tycho BuildRequires: xml-commons-apis BuildRequires: xmvn-subst +BuildConflicts: java >= 12 +BuildConflicts: java-devel >= 12 +BuildConflicts: java-headless >= 12 #!BuildIgnore: eclipse-platform #!BuildIgnore: tycho-bootstrap #!BuildRequires: eclipse-emf-core eclipse-ecf-core diff --git a/jgit.spec b/jgit.spec index 3d19f75..2e1f75a 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,7 +1,7 @@ # # spec file for package jgit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -68,6 +68,9 @@ BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.tukaani:xz) +BuildConflicts: java >= 12 +BuildConflicts: java-devel >= 12 +BuildConflicts: java-headless >= 12 Obsoletes: %{name}-bootstrap BuildArch: noarch From 27cebb5d752bc7de8cbca374f89c1ec166b96a21077a927b44f9f0c01a697b12 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 14:05:35 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=29 --- jgit.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/jgit.spec b/jgit.spec index 2e1f75a..1653785 100644 --- a/jgit.spec +++ b/jgit.spec @@ -68,9 +68,6 @@ BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.tukaani:xz) -BuildConflicts: java >= 12 -BuildConflicts: java-devel >= 12 -BuildConflicts: java-headless >= 12 Obsoletes: %{name}-bootstrap BuildArch: noarch From 5a462d630f2cf8f9c69fec0096a2273b1c54dc89741d3aeef591c88cbe5a7037 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 14:06:52 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=30 --- eclipse-jgit.changes | 6 ++++++ jgit.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index abcce85..0837a8c 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 29 14:06:34 UTC 2022 - Fridrich Strba + +- Force building with Java 11, since tycho is not knowing about any + Java >= 15 + ------------------------------------------------------------------- Fri Jul 30 12:24:56 UTC 2021 - Fridrich Strba diff --git a/jgit.spec b/jgit.spec index 1653785..3d19f75 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,7 +1,7 @@ # # spec file for package jgit # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed