Brute force update of the target platform to latest Orbit versions

#95
eclipse · Apr 5, 2024 · fe15866 · fe15866
1 parent 1349fb6
commit fe15866
Show file tree

Hide file tree

Showing 25 changed files with 624 additions and 63 deletions.
diff --git a/...s/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product b/...s/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product
@@ -28,7 +28,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.osgi.async"/>
       <plugin id="com.mycorp.examples.osgi.async.consumer"/>
-      <plugin id="javax.servlet"/>
+      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>

diff --git a/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product b/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product
@@ -28,7 +28,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.osgi.async"/>
       <plugin id="com.mycorp.examples.osgi.async.impl"/>
-      <plugin id="javax.servlet"/>
+      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>

diff --git a/...rp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product b/...rp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product
@@ -62,7 +62,7 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
       <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.json"/>
+      <plugin id="json"/>
    </plugins>
 
    <configurations>

diff --git a/...examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/...examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -30,7 +30,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/>
-      <plugin id="javax.servlet"/>
+      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>

diff --git a/...m.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product b/...m.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
@@ -66,7 +66,7 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
       <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.json"/>
+      <plugin id="json"/>
    </plugins>
 
    <configurations>

diff --git a/...ycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/...ycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -30,7 +30,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
-      <plugin id="javax.servlet"/>
+      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>

diff --git a/.../bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product b/.../bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
@@ -65,7 +65,7 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
       <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.json"/>
+      <plugin id="json"/>
    </plugins>
 
    <configurations>

diff --git a/...ndles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/...ndles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
@@ -36,7 +36,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.host"/>
-      <plugin id="javax.servlet"/>
+      <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.commons-codec"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
@@ -80,7 +80,7 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
       <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.json"/>
+      <plugin id="json"/>
    </plugins>
 
    <configurations>

diff --git a/...se.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/start/AccountStart.java b/...se.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/start/AccountStart.java
@@ -12,10 +12,7 @@
  *****************************************************************************/
 package org.eclipse.ecf.internal.example.collab.start;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -41,8 +38,7 @@ private String normalizeURI(String uri) {
 
 	public void removeConnectionDetails(ConnectionDetails cd) {
 		try {
-			Preferences preferences = new InstanceScope()
-					.getNode(ClientPlugin.PLUGIN_ID);
+			Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
 			Preferences connections = preferences.node(SAVED);
 			String[] targets = connections.childrenNames();
 			for (int i = 0; i < targets.length; i++) {
@@ -55,10 +51,7 @@ public void removeConnectionDetails(ConnectionDetails cd) {
 			}
 			connections.flush();
 		} catch (BackingStoreException e) {
-			ClientPlugin.getDefault().getLog().log(
-					new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
-							BACKING_STORE_LOAD_ERROR,
-							Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
+			ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
 		}
 	}
 
@@ -67,13 +60,11 @@ public Collection getConnectionDetails() {
 	}
 
 	public void saveConnectionDetailsToPreferenceStore() {
-		Preferences preferences = new InstanceScope()
-				.getNode(ClientPlugin.PLUGIN_ID);
+		Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
 		Preferences connections = preferences.node(SAVED);
 		for (Iterator i = connectionDetails.keySet().iterator(); i.hasNext();) {
 			String target = (String) i.next();
-			ConnectionDetails details = (ConnectionDetails) connectionDetails
-					.get(target);
+			ConnectionDetails details = (ConnectionDetails) connectionDetails.get(target);
 			Preferences p = connections.node(target);
 			p.put(ConnectionDetails.CONTAINER_TYPE, details.getContainerType());
 			p.put(ConnectionDetails.TARGET_URI, details.getTargetURI());
@@ -83,35 +74,27 @@ public void saveConnectionDetailsToPreferenceStore() {
 		try {
 			connections.flush();
 		} catch (BackingStoreException e) {
-			ClientPlugin.getDefault().getLog().log(
-					new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
-							BACKING_STORE_SAVE_ERROR,
-							Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
+			ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_SAVE_ERROR, Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
 		}
 	}
 
 	public void loadConnectionDetailsFromPreferenceStore() {
 		try {
-			Preferences preferences = new InstanceScope()
-					.getNode(ClientPlugin.PLUGIN_ID);
+			Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
 			Preferences connections = preferences.node(SAVED);
 			String[] targets = connections.childrenNames();
 			for (int i = 0; i < targets.length; i++) {
 				String target = targets[i];
 				Preferences node = connections.node(target);
 				if (node != null) {
-					addConnectionDetails(new ConnectionDetails(node.get(
-							ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
-							ConnectionDetails.TARGET_URI, ""), node.get( //$NON-NLS-1$
-							ConnectionDetails.NICKNAME, ""), node.get( //$NON-NLS-1$
-							ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
+					addConnectionDetails(new ConnectionDetails(node.get(ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
+							ConnectionDetails.TARGET_URI, ""), //$NON-NLS-1$
+							node.get(ConnectionDetails.NICKNAME, ""), //$NON-NLS-1$
+							node.get(ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
 				}
 			}
 		} catch (BackingStoreException e) {
-			ClientPlugin.getDefault().getLog().log(
-					new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
-							BACKING_STORE_LOAD_ERROR,
-							Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
+			ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
 		}
 	}
 }
diff --git a/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml b/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
@@ -504,7 +504,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.servlet.jsp"
+         id="jakarta.servlet.jsp-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -743,7 +743,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.servlet"
+         id="jakarta.servlet.jsp-api"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/apache/http/impl/client/*"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
@@ -73,8 +73,8 @@
 
   <properties>
     <tycho-version>2.7.5</tycho-version>
-    <cbi-version>1.3.2</cbi-version>
-    <target-platform>2022-03</target-platform>
+    <cbi-version>1.4.3</cbi-version>
+    <target-platform>latest-3</target-platform>
     <execution-environment>JavaSE-17</execution-environment>
     <eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>

diff --git a/....eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java b/....eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
@@ -190,10 +190,10 @@ public void connect(ID aTargetID, IConnectContext connectContext)
 		// fall back to the search path as last resort 
 		if(aTargetID == null || !(aTargetID instanceof DnsSdServiceTypeID)) {
 			ResolverConfig config = new ResolverConfig();
-			Name[] searchPaths = config.searchPath();
-			if(searchPaths != null && searchPaths.length > 0) {
+			List searchPaths = config.searchPath();
+			if(!searchPaths.isEmpty()) {
 				targetID = new DnsSdServiceTypeID();
-				targetID.setSearchPath(searchPaths);
+				targetID.setSearchPath((Name[])searchPaths.toArray(new Name[searchPaths.size()]));
 			} else {
 				throw new ContainerConnectException(Messages.DnsSdDiscoveryLocator_No_Target_ID);
 			}

diff --git a/...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml b/...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier">
    <implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier"/>
 </scr:component>
diff --git a/...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml b/...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier">
    <implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier"/>
 </scr:component>
diff --git a/releng/features/org.eclipse.ecf.examples/feature.xml b/releng/features/org.eclipse.ecf.examples/feature.xml
@@ -48,7 +48,7 @@
       <import plugin="org.eclipse.ecf.examples.remoteservices.common"/>
       <import plugin="org.eclipse.ecf.ui"/>
       <import plugin="org.eclipse.equinox.common"/>
-      <import plugin="javax.servlet"/>
+      <import plugin="jakarta.servlet.jsp-api"/>
       <import plugin="org.eclipse.osgi.services"/>
       <import plugin="org.eclipse.ecf.remoteservice.ui"/>
       <import plugin="org.eclipse.equinox.app"/>

diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -28,7 +28,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
       <import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
-      <import plugin="org.json" version="1.0.0" match="compatible"/>
+      <import plugin="json"/>
    </requires>
 
    <plugin

diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -60,7 +60,7 @@
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
       <category name="remoteservices"/>
    </feature>
-   <iu id="org.json" version="0.0.0">
+   <iu id="json" version="0.0.0">
       <category name="sdk"/>
    </iu>
    <iu id="org.objectweb.asm" version="0.0.0">

diff --git a/releng/org.eclipse.ecf.releng.target/ecf-latest-1.target b/releng/org.eclipse.ecf.releng.target/ecf-latest-1.target
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Generated from ECF" sequenceNumber="10">
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.edit.ui" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="bcpg" version="0.0.0"/>
+      <unit id="biz.aQute.resolve" version="0.0.0"/>
+      <unit id="com.ibm.icu" version="0.0.0"/>
+      <unit id="com.jcraft.jsch" version="0.0.0"/>
+      <unit id="com.sun.jna.platform" version="0.0.0"/>
+      <unit id="jakarta.annotation-api" version="0.0.0"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
+      <unit id="jakarta.xml.bind-api" version="0.0.0"/>
+      <unit id="json" version="0.0.0"/>
+      <unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
+      <unit id="junit-jupiter-params" version="0.0.0"/>
+      <unit id="junit-platform-runner" version="0.0.0"/>
+      <unit id="junit-platform-suite-engine" version="0.0.0"/>
+      <unit id="junit-vintage-engine" version="0.0.0"/>
+      <unit id="org.apache.ant" version="0.0.0"/>
+      <unit id="org.apache.batik.css" version="0.0.0"/>
+      <unit id="org.apache.commons.httpclient" version="0.0.0"/>
+      <unit id="org.apache.commons.jxpath" version="0.0.0"/>
+      <unit id="org.apache.felix.gogo.runtime" version="0.0.0"/>
+      <unit id="org.apache.httpcomponents.client5.httpclient5" version="0.0.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
+      <unit id="org.apache.log4j" version="0.0.0"/>
+      <unit id="org.apache.lucene.analysis-smartcn" version="0.0.0"/>
+      <unit id="org.apiguardian.api" version="0.0.0"/>
+      <unit id="org.bndtools.headless.build.plugin.gradle" version="0.0.0"/>
+      <unit id="org.bndtools.templates.template" version="0.0.0"/>
+      <unit id="org.bndtools.templating" version="0.0.0"/>
+      <unit id="org.osgi.annotation.bundle" version="0.0.0"/>
+      <unit id="org.osgi.annotation.versioning" version="0.0.0"/>
+      <unit id="org.osgi.namespace.contract" version="0.0.0"/>
+      <unit id="org.osgi.namespace.extender" version="0.0.0"/>
+      <unit id="org.osgi.namespace.service" version="0.0.0"/>
+      <unit id="org.osgi.service.component.annotations" version="0.0.0"/>
+      <unit id="org.osgi.service.device" version="0.0.0"/>
+      <unit id="org.osgi.service.event" version="0.0.0"/>
+      <unit id="org.osgi.service.http.whiteboard" version="0.0.0"/>
+      <unit id="org.osgi.service.metatype.annotations" version="0.0.0"/>
+      <unit id="org.osgi.service.prefs" version="0.0.0"/>
+      <unit id="org.osgi.service.provisioning" version="0.0.0"/>
+      <unit id="org.osgi.service.upnp" version="0.0.0"/>
+      <unit id="org.osgi.service.useradmin" version="0.0.0"/>
+      <unit id="org.osgi.service.wireadmin" version="0.0.0"/>
+      <unit id="org.osgi.util.position" version="0.0.0"/>
+      <unit id="org.osgi.util.xml" version="0.0.0"/>
+      <unit id="org.sat4j.pb" version="0.0.0"/>
+      <unit id="org.tukaani.xz" version="0.0.0"/>
+      <unit id="org.xbill.dns" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="com.sun.syndication" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
+    </location>
+  </locations>
+</target>