Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package eclipse for openSUSE:Factory checked
in at 2022-06-13 13:03:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eclipse (Old)
and /work/SRC/openSUSE:Factory/.eclipse.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse"
Mon Jun 13 13:03:09 2022 rev:18 rq:982406 version:4.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/eclipse/eclipse.changes 2022-03-29
21:06:40.569099876 +0200
+++ /work/SRC/openSUSE:Factory/.eclipse.new.1548/eclipse.changes
2022-06-13 13:03:37.105206660 +0200
@@ -1,0 +2,13 @@
+Mon Jun 13 09:27:01 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Fix build with hamcrest 2.2
+- Removed patch:
+ * explicit-hamcrest.patch
+ + not needed any more
+- Modified patch:
+ * eclipse-feature-plugins-to-category-ius.patch
+ * eclipse-patch-out-fileupload-dep.patch
+ + do not require org.hamcrest.* bundles that don't exist in
+ hamcrest 2.x any more
+
+-------------------------------------------------------------------
Old:
----
explicit-hamcrest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eclipse.spec ++++++
--- /var/tmp/diff_new_pack.M1xkNm/_old 2022-06-13 13:03:38.397208315 +0200
+++ /var/tmp/diff_new_pack.M1xkNm/_new 2022-06-13 13:03:38.401208319 +0200
@@ -69,9 +69,7 @@
Patch1: eclipse-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
Patch2: eclipse-ignore-version-when-calculating-home.patch
-# Explicit requirement on hamcrest where it is used directly
-Patch3: explicit-hamcrest.patch
-# Add support for all arches supported by Fedora
+# Add support for all arches supported by us
Patch4: eclipse-secondary-arches.patch
Patch5: eclipse-debug-symbols.patch
# Add support for riscv64
@@ -404,7 +402,6 @@
Group: Development/Libraries/Java
Requires: junit >= 4.12
Requires: junit5 >= 5.4.0
-Requires: osgi(org.hamcrest.core)
Provides: %{name} = %{version}-%{release}
BuildArch: noarch
@@ -502,7 +499,6 @@
%patch0
%patch1
%patch2 -p1
-%patch3
%patch4 -p1
%patch5
%patch6 -p1
++++++ eclipse-feature-plugins-to-category-ius.patch ++++++
--- /var/tmp/diff_new_pack.M1xkNm/_old 2022-06-13 13:03:38.465208401 +0200
+++ /var/tmp/diff_new_pack.M1xkNm/_new 2022-06-13 13:03:38.469208406 +0200
@@ -23,13 +23,12 @@
index e12ef6a13..6deae2a13 100644
--- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
+++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
-@@ -19,6 +19,23 @@
+@@ -19,6 +19,22 @@
%license
</license>
+ <requires>
+ <import plugin="org.junit" />
-+ <import plugin="org.hamcrest.core" />
+ <import plugin="org.junit.jupiter.api" />
+ <import plugin="org.junit.jupiter.engine" />
+ <import plugin="org.junit.jupiter.migrationsupport" />
@@ -457,15 +456,13 @@
index 6d7659ab9..23f4e6524 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-@@ -19,6 +19,15 @@
+@@ -19,6 +19,13 @@
%license
</license>
+ <requires>
+ <import plugin="org.apache.commons.fileupload" />
+ <import plugin="org.apache.commons.io" />
-+ <import plugin="org.hamcrest.core" />
-+ <import plugin="org.hamcrest.library" />
+ <import plugin="org.mockito" />
+ <import plugin="org.objenesis" />
+ </requires>
@@ -540,15 +537,13 @@
index 1f422b76e..9e26326c3 100644
--- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
-@@ -19,6 +19,14 @@
+@@ -19,6 +19,12 @@
%license
</license>
+ <requires>
+ <import plugin="org.junit" />
+ <import plugin="org.easymock" />
-+ <import plugin="org.hamcrest.core" />
-+ <import plugin="org.hamcrest.library" />
+ <import plugin="org.mockito" />
+ </requires>
+
++++++ eclipse-patch-out-fileupload-dep.patch ++++++
--- /var/tmp/diff_new_pack.M1xkNm/_old 2022-06-13 13:03:38.497208442 +0200
+++ /var/tmp/diff_new_pack.M1xkNm/_new 2022-06-13 13:03:38.501208447 +0200
@@ -32,8 +32,8 @@
<requires>
- <import plugin="org.apache.commons.fileupload" />
<import plugin="org.apache.commons.io" />
- <import plugin="org.hamcrest.core" />
- <import plugin="org.hamcrest.library" />
+ <import plugin="org.mockito" />
+ <import plugin="org.objenesis" />
---
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java.orig
2019-06-20 11:48:48.317887414 +0100
+++
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
2019-06-20 11:49:35.106774459 +0100
@@ -79,10 +79,6 @@
