From 572e9ce9cc31b9a15e547ce729944056aa0bfb53ccddb45277bb2d2f8251ee54 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Mar 2021 17:44:47 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=16 --- tycho.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho.spec b/tycho.spec index 5820889..49d9593 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,7 +1,7 @@ # -# spec file for package tycho +# spec file for package tycho-bootstrap # -# Copyright (c) 2020 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 From bc97f3a3fbc5bebe56147cc2b3f74c8510272a5412a212a05ff601601bd051cb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 26 Apr 2021 15:04:53 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=17 --- tycho.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho.spec b/tycho.spec index 49d9593..5820889 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,7 +1,7 @@ # -# spec file for package tycho-bootstrap +# spec file for package tycho # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From e6f7d8444248c1e4c245da25aa0aa989f008bc0d10e24f1f744b8b18f8dc2d70 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 10 Mar 2022 12:36:02 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=18 --- tycho-sourcetarget.patch | 48 ++++++++++++++++++++++++++++++++++++++++ tycho.spec | 9 ++++---- 2 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 tycho-sourcetarget.patch diff --git a/tycho-sourcetarget.patch b/tycho-sourcetarget.patch new file mode 100644 index 0000000..8b9da01 --- /dev/null +++ b/tycho-sourcetarget.patch @@ -0,0 +1,48 @@ +--- org.eclipse.tycho-tycho-1.6.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/resources/testbuild.properties 2020-01-13 12:02:41.000000000 +0100 ++++ org.eclipse.tycho-tycho-1.6.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/resources/testbuild.properties 2022-03-10 13:28:41.858463524 +0100 +@@ -1,7 +1,7 @@ + source..=foo/,bar/ + output..=bin/ +-javacSource= 1.3 +-javacTarget=1.1 ++javacSource= 1.6 ++javacTarget=1.6 + jre.compilation.profile= JavaSE-1.6 + forceContextQualifier=20120101000000 + bin.includes=folder/,file.txt +--- org.eclipse.tycho-tycho-1.6.0/tycho-compiler-plugin/src/test/resources/projects/executionEnvironment/p003/pom.xml 2020-01-13 12:02:41.000000000 +0100 ++++ org.eclipse.tycho-tycho-1.6.0/tycho-compiler-plugin/src/test/resources/projects/executionEnvironment/p003/pom.xml 2022-03-10 13:29:01.442582579 +0100 +@@ -19,8 +19,8 @@ + ${tycho-version} + + jdt +- 1.5 +- jsr14 ++ 1.6 ++ 1.6 + + + +--- org.eclipse.tycho-tycho-1.6.0/tycho-compiler-plugin/src/test/resources/projects/executionEnvironment/p005/build.properties 2020-01-13 12:02:41.000000000 +0100 ++++ org.eclipse.tycho-tycho-1.6.0/tycho-compiler-plugin/src/test/resources/projects/executionEnvironment/p005/build.properties 2022-03-10 13:28:53.602534948 +0100 +@@ -2,5 +2,5 @@ + output.. = bin/ + bin.includes = META-INF/,\ + . +-javacSource=1.5 +-javacTarget=jsr14 ++javacSource=1.6 ++javacTarget=1.6 +--- org.eclipse.tycho-tycho-1.6.0/tycho-lib-detector/pom.xml 2020-01-13 12:02:41.000000000 +0100 ++++ org.eclipse.tycho-tycho-1.6.0/tycho-lib-detector/pom.xml 2022-03-10 13:26:55.181814007 +0100 +@@ -28,8 +28,8 @@ + maven-compiler-plugin + + +- 1.3 +- 1.1 ++ 1.6 ++ 1.6 + jdt + + diff --git a/tycho.spec b/tycho.spec index 5820889..199dfd0 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,7 +1,7 @@ # -# spec file for package tycho +# spec file for package tycho-bootstrap # -# Copyright (c) 2020 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 @@ -64,6 +64,7 @@ Patch5: 0006-Mockito-does-not-have-test-scope.patch # Fix incorrect generated requires Patch6: 0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch +Patch10: tycho-sourcetarget.patch Patch100: fedoraproject-p2-bootstrap-fix.patch BuildRequires: bash BuildRequires: fdupes @@ -110,9 +111,6 @@ BuildRequires: mvn(org.ow2.asm:asm-tree) BuildRequires: mvn(org.ow2.asm:asm-util) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildConflicts: java >= 9 -BuildConflicts: java-devel >= 9 -BuildConflicts: java-headless >= 9 Requires: ecj >= 4.7.3a-1 # maven-clean-plugin is bound to "initialize" Maven phase for # "eclipse-repository" projects @@ -207,6 +205,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch10 -p1 %patch100 # Unneeded for RPM builds From 56e1e31c0e0016c9e68330cee35b2ae6653022607cce20d20b67c93f81415fbf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 10 Mar 2022 21:01:21 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=19 --- tycho.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tycho.spec b/tycho.spec index 199dfd0..8310548 100644 --- a/tycho.spec +++ b/tycho.spec @@ -111,6 +111,9 @@ BuildRequires: mvn(org.ow2.asm:asm-tree) BuildRequires: mvn(org.ow2.asm:asm-util) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildConflicts: java >= 9 +BuildConflicts: java-devel >= 9 +BuildConflicts: java-headless >= 9 Requires: ecj >= 4.7.3a-1 # maven-clean-plugin is bound to "initialize" Maven phase for # "eclipse-repository" projects From 1bf0827ec8e28273058f18057f66ba05a0cf6d94e124977b69a394320ad099a6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 15:58:43 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=20 --- tycho.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/tycho.spec b/tycho.spec index 8310548..199dfd0 100644 --- a/tycho.spec +++ b/tycho.spec @@ -111,9 +111,6 @@ BuildRequires: mvn(org.ow2.asm:asm-tree) BuildRequires: mvn(org.ow2.asm:asm-util) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildConflicts: java >= 9 -BuildConflicts: java-devel >= 9 -BuildConflicts: java-headless >= 9 Requires: ecj >= 4.7.3a-1 # maven-clean-plugin is bound to "initialize" Maven phase for # "eclipse-repository" projects From 4943b0b9541cbfeed06664bdfee20b761c3d19d08558b2e8a9c8cf9ee44564ee Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 20:42:57 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=21 --- tycho.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.spec b/tycho.spec index 199dfd0..6fb266d 100644 --- a/tycho.spec +++ b/tycho.spec @@ -345,7 +345,7 @@ sed -i ' %endif %{mvn_build} %{no_javadoc} -f -- \ -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \ - -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap + -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dsource=8 %{mvn_artifact} fedoraproject-p2/org.fedoraproject.p2/pom.xml From 98dd81c9ed81f70490a2f61f30bffd9e5b11e11e5a1fe9dd65050e6cf83bd7b6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 12 Mar 2022 09:53:13 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=22 --- tycho.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tycho.changes b/tycho.changes index f7d76eb..320cd0c 100644 --- a/tycho.changes +++ b/tycho.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Mar 12 09:50:44 UTC 2022 - Fridrich Strba + +- Do not force building with java 1.8, but with any java >= 1.8 +- Added patch: + * tycho-sourcetarget.patch + + build with source/target levels 1.6, which allows to build + with javas >= 9 + ------------------------------------------------------------------- Fri Jul 3 09:59:22 UTC 2020 - Fridrich Strba