This commit is contained in:
parent
bc97f3a3fb
commit
e6f7d84442
48
tycho-sourcetarget.patch
Normal file
48
tycho-sourcetarget.patch
Normal 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>
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# 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
|
# Fix incorrect generated requires
|
||||||
Patch6: 0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
|
Patch6: 0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
|
||||||
Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
|
Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
|
||||||
|
Patch10: tycho-sourcetarget.patch
|
||||||
Patch100: fedoraproject-p2-bootstrap-fix.patch
|
Patch100: fedoraproject-p2-bootstrap-fix.patch
|
||||||
BuildRequires: bash
|
BuildRequires: bash
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -110,9 +111,6 @@ BuildRequires: mvn(org.ow2.asm:asm-tree)
|
|||||||
BuildRequires: mvn(org.ow2.asm:asm-util)
|
BuildRequires: mvn(org.ow2.asm:asm-util)
|
||||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||||
BuildConflicts: java >= 9
|
|
||||||
BuildConflicts: java-devel >= 9
|
|
||||||
BuildConflicts: java-headless >= 9
|
|
||||||
Requires: ecj >= 4.7.3a-1
|
Requires: ecj >= 4.7.3a-1
|
||||||
# maven-clean-plugin is bound to "initialize" Maven phase for
|
# maven-clean-plugin is bound to "initialize" Maven phase for
|
||||||
# "eclipse-repository" projects
|
# "eclipse-repository" projects
|
||||||
@ -207,6 +205,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch10 -p1
|
||||||
%patch100
|
%patch100
|
||||||
|
|
||||||
# Unneeded for RPM builds
|
# Unneeded for RPM builds
|
||||||
|
Loading…
Reference in New Issue
Block a user