Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tycho for openSUSE:Factory checked
in at 2022-03-12 17:15:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tycho (Old)
and /work/SRC/openSUSE:Factory/.tycho.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tycho"
Sat Mar 12 17:15:30 2022 rev:5 rq:961206 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/tycho/tycho.changes 2020-07-16
12:13:35.110669435 +0200
+++ /work/SRC/openSUSE:Factory/.tycho.new.25692/tycho.changes 2022-03-12
17:16:14.394358554 +0100
@@ -1,0 +2,9 @@
+Sat Mar 12 09:50:44 UTC 2022 - Fridrich Strba <fst...@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
+
+-------------------------------------------------------------------
New:
----
tycho-sourcetarget.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tycho.spec ++++++
--- /var/tmp/diff_new_pack.Mu2Ap3/_old 2022-03-12 17:16:15.110359382 +0100
+++ /var/tmp/diff_new_pack.Mu2Ap3/_new 2022-03-12 17:16:15.118359392 +0100
@@ -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 @@
# 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-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 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch10 -p1
%patch100
# Unneeded for RPM builds
@@ -346,7 +345,7 @@
%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
++++++ tycho-sourcetarget.patch ++++++
---
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>
