pool/tycho
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 961206 from Java:packages

Browse Source 
Do not hardcode java 8 dependency

OBS-URL: https://build.opensuse.org/request/show/961206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tycho?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2022-03-12 16:15:30 +00:00 committed by Git OBS Bridge
commit 579a096bc9
3 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tycho-sourcetarget.patch Normal file
View File

@ -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 @@
<version>${tycho-version}</version>
<configuration>
<compilerId>jdt</compilerId>
- <source>1.5</source>
- <target>jsr14</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
--- 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 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- make sure we use minimum source/target level as this code will be run in old JVMs -->
- <source>1.3</source>
- <target>1.1</target>
+ <source>1.6</source>
+ <target>1.6</target>
<compilerId>jdt</compilerId>
</configuration>
<dependencies>

9
tycho.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Mar 12 09:50:44 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

11
tycho.spec
View File

@ -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
@ -346,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