Accepting request 1193877 from Java:packages

fix build breakages

OBS-URL: https://build.opensuse.org/request/show/1193877
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-ecf?expand=0&rev=12

eclipse-ecf.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 14 09:06:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * explicit-httpcore-bundle.patch
+    + require the org.apache.httpcomponents.httpcore explicitely,
+      since it is not pulled in transitively any more
+
 -------------------------------------------------------------------
 Thu Jun 13 10:29:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

eclipse-ecf.spec

@@ -41,6 +41,7 @@ Source0:        https://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.e
 Patch0:         0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
 # Unneeded dep on JDT prevents bootstrap mode
 Patch1:         0002-Remove-unneeded-dep-on-jdt-annotations.patch
+Patch2:         explicit-httpcore-bundle.patch
 BuildRequires:  apache-commons-codec
 BuildRequires:  apache-commons-logging
 BuildRequires:  build-helper-maven-plugin
@@ -129,6 +130,7 @@ find . -type f -name "*.class" -exec rm {} \;
 
 %patch -P 0 -p1
 %patch -P 1 -p1
+%patch -P 2 -p1
 
 # Extend the objectweb-asm requirements
 sed -i -e 's/org\.objectweb\.asm;version="\[5\.0\.1,8\.0\.0)"/org\.objectweb\.asm;version="\[5\.0\.1,10\.0\.0)"/g' \

explicit-httpcore-bundle.patch

@@ -0,0 +1,36 @@
+--- org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF	2024-08-14 10:22:46.437642999 +0200
++++ org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF	2024-08-14 11:03:29.439421526 +0200
+@@ -41,7 +41,8 @@
+  org.osgi.util.tracker
+ Require-Bundle: org.eclipse.equinox.common,
+  org.eclipse.ecf,
+- org.eclipse.ecf.identity
++ org.eclipse.ecf.identity,
++ org.apache.httpcomponents.httpcore
+ Service-Component: META-INF/dspresent.xml
+ Bundle-Localization: plugin
+ Provide-Capability: osgi.remoteserviceadmin.distribution; configs:List<String>="ecf.rest.client"; version:Version=1.1 
+--- org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF	2024-08-14 10:22:46.520976959 +0200
++++ org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF	2024-08-14 10:48:22.672602938 +0200
+@@ -9,7 +9,8 @@
+ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
+  org.eclipse.ecf.provider.filetransfer;bundle-version="[3.0.0,4.0.0)",
+  org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",
+- org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)"
++ org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)",
++ org.apache.httpcomponents.httpcore
+ Eclipse-LazyStart: true
+ Import-Package: org.apache.http;version="4.1.0",
+  org.apache.http.auth;version="4.1.0",
+--- org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF	2024-08-14 10:22:46.527643676 +0200
++++ org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF	2024-08-14 10:43:17.970302496 +0200
+@@ -11,7 +11,8 @@
+ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
+  org.eclipse.ecf.provider.filetransfer;bundle-version="[3.2.200,4.0.0)",
+  org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)",
+- org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)"
++ org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)",
++ org.apache.httpcomponents.httpcore
+ Import-Package: org.apache.http;version="[4.4.0,5.0.0)",
+  org.apache.http.auth;version="[4.5.0,5.0.0)",
+  org.apache.http.client;version="[4.5.0,5.0.0)",