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/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