Skip to content

Commit fe15866

Browse files
committed
Brute force update of the target platform to latest Orbit versions
#95
1 parent 1349fb6 commit fe15866

File tree

25 files changed

+624
-63
lines changed

25 files changed

+624
-63
lines changed

examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<plugins>
2929
<plugin id="com.mycorp.examples.osgi.async"/>
3030
<plugin id="com.mycorp.examples.osgi.async.consumer"/>
31-
<plugin id="javax.servlet"/>
31+
<plugin id="jakarta.servlet.jsp-api"/>
3232
<plugin id="org.apache.commons.logging"/>
3333
<plugin id="org.apache.felix.gogo.command"/>
3434
<plugin id="org.apache.felix.gogo.runtime"/>

examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<plugins>
2929
<plugin id="com.mycorp.examples.osgi.async"/>
3030
<plugin id="com.mycorp.examples.osgi.async.impl"/>
31-
<plugin id="javax.servlet"/>
31+
<plugin id="jakarta.servlet.jsp-api"/>
3232
<plugin id="org.apache.commons.logging"/>
3333
<plugin id="org.apache.felix.gogo.command"/>
3434
<plugin id="org.apache.felix.gogo.runtime"/>

examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<plugin id="org.eclipse.osgi.services"/>
6363
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
6464
<plugin id="org.eclipse.osgi.util"/>
65-
<plugin id="org.json"/>
65+
<plugin id="json"/>
6666
</plugins>
6767

6868
<configurations>

examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<plugins>
3131
<plugin id="com.mycorp.examples.timeservice.async"/>
3232
<plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/>
33-
<plugin id="javax.servlet"/>
33+
<plugin id="jakarta.servlet.jsp-api"/>
3434
<plugin id="org.apache.commons.logging"/>
3535
<plugin id="org.apache.felix.gogo.command"/>
3636
<plugin id="org.apache.felix.gogo.runtime"/>

examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<plugin id="org.eclipse.osgi.services"/>
6767
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
6868
<plugin id="org.eclipse.osgi.util"/>
69-
<plugin id="org.json"/>
69+
<plugin id="json"/>
7070
</plugins>
7171

7272
<configurations>

examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<plugins>
3131
<plugin id="com.mycorp.examples.timeservice.async"/>
3232
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
33-
<plugin id="javax.servlet"/>
33+
<plugin id="jakarta.servlet.jsp-api"/>
3434
<plugin id="org.apache.commons.logging"/>
3535
<plugin id="org.apache.felix.gogo.command"/>
3636
<plugin id="org.apache.felix.gogo.runtime"/>

examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<plugin id="org.eclipse.osgi.services"/>
6666
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
6767
<plugin id="org.eclipse.osgi.util"/>
68-
<plugin id="org.json"/>
68+
<plugin id="json"/>
6969
</plugins>
7070

7171
<configurations>

examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugins>
3737
<plugin id="com.mycorp.examples.timeservice.async"/>
3838
<plugin id="com.mycorp.examples.timeservice.host"/>
39-
<plugin id="javax.servlet"/>
39+
<plugin id="jakarta.servlet.jsp-api"/>
4040
<plugin id="org.apache.commons.commons-codec"/>
4141
<plugin id="org.apache.commons.logging"/>
4242
<plugin id="org.apache.felix.gogo.command"/>
@@ -80,7 +80,7 @@
8080
<plugin id="org.eclipse.osgi.services"/>
8181
<plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
8282
<plugin id="org.eclipse.osgi.util"/>
83-
<plugin id="org.json"/>
83+
<plugin id="json"/>
8484
</plugins>
8585

8686
<configurations>

examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/start/AccountStart.java

+12-29
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
*****************************************************************************/
1313
package org.eclipse.ecf.internal.example.collab.start;
1414

15-
import java.util.Collection;
16-
import java.util.HashMap;
17-
import java.util.Iterator;
18-
import java.util.Map;
15+
import java.util.*;
1916
import org.eclipse.core.runtime.IStatus;
2017
import org.eclipse.core.runtime.Status;
2118
import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -41,8 +38,7 @@ private String normalizeURI(String uri) {
4138

4239
public void removeConnectionDetails(ConnectionDetails cd) {
4340
try {
44-
Preferences preferences = new InstanceScope()
45-
.getNode(ClientPlugin.PLUGIN_ID);
41+
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
4642
Preferences connections = preferences.node(SAVED);
4743
String[] targets = connections.childrenNames();
4844
for (int i = 0; i < targets.length; i++) {
@@ -55,10 +51,7 @@ public void removeConnectionDetails(ConnectionDetails cd) {
5551
}
5652
connections.flush();
5753
} catch (BackingStoreException e) {
58-
ClientPlugin.getDefault().getLog().log(
59-
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
60-
BACKING_STORE_LOAD_ERROR,
61-
Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
54+
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
6255
}
6356
}
6457

@@ -67,13 +60,11 @@ public Collection getConnectionDetails() {
6760
}
6861

6962
public void saveConnectionDetailsToPreferenceStore() {
70-
Preferences preferences = new InstanceScope()
71-
.getNode(ClientPlugin.PLUGIN_ID);
63+
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
7264
Preferences connections = preferences.node(SAVED);
7365
for (Iterator i = connectionDetails.keySet().iterator(); i.hasNext();) {
7466
String target = (String) i.next();
75-
ConnectionDetails details = (ConnectionDetails) connectionDetails
76-
.get(target);
67+
ConnectionDetails details = (ConnectionDetails) connectionDetails.get(target);
7768
Preferences p = connections.node(target);
7869
p.put(ConnectionDetails.CONTAINER_TYPE, details.getContainerType());
7970
p.put(ConnectionDetails.TARGET_URI, details.getTargetURI());
@@ -83,35 +74,27 @@ public void saveConnectionDetailsToPreferenceStore() {
8374
try {
8475
connections.flush();
8576
} catch (BackingStoreException e) {
86-
ClientPlugin.getDefault().getLog().log(
87-
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
88-
BACKING_STORE_SAVE_ERROR,
89-
Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
77+
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_SAVE_ERROR, Messages.AccountStart_EXCEPTION_SAVING_CONNECTION_DETAILS, e));
9078
}
9179
}
9280

9381
public void loadConnectionDetailsFromPreferenceStore() {
9482
try {
95-
Preferences preferences = new InstanceScope()
96-
.getNode(ClientPlugin.PLUGIN_ID);
83+
Preferences preferences = InstanceScope.INSTANCE.getNode(ClientPlugin.PLUGIN_ID);
9784
Preferences connections = preferences.node(SAVED);
9885
String[] targets = connections.childrenNames();
9986
for (int i = 0; i < targets.length; i++) {
10087
String target = targets[i];
10188
Preferences node = connections.node(target);
10289
if (node != null) {
103-
addConnectionDetails(new ConnectionDetails(node.get(
104-
ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
105-
ConnectionDetails.TARGET_URI, ""), node.get( //$NON-NLS-1$
106-
ConnectionDetails.NICKNAME, ""), node.get( //$NON-NLS-1$
107-
ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
90+
addConnectionDetails(new ConnectionDetails(node.get(ConnectionDetails.CONTAINER_TYPE, ""), node.get( //$NON-NLS-1$
91+
ConnectionDetails.TARGET_URI, ""), //$NON-NLS-1$
92+
node.get(ConnectionDetails.NICKNAME, ""), //$NON-NLS-1$
93+
node.get(ConnectionDetails.PASSWORD, ""))); //$NON-NLS-1$
10894
}
10995
}
11096
} catch (BackingStoreException e) {
111-
ClientPlugin.getDefault().getLog().log(
112-
new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID,
113-
BACKING_STORE_LOAD_ERROR,
114-
Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
97+
ClientPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, ClientPlugin.PLUGIN_ID, BACKING_STORE_LOAD_ERROR, Messages.AccountStart_EXCEPTION_LOADING_CONNECTION_DETAILS, e));
11598
}
11699
}
117100
}

examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@
504504
unpack="false"/>
505505

506506
<plugin
507-
id="javax.servlet.jsp"
507+
id="jakarta.servlet.jsp-api"
508508
download-size="0"
509509
install-size="0"
510510
version="0.0.0"
@@ -743,7 +743,7 @@
743743
unpack="false"/>
744744

745745
<plugin
746-
id="javax.servlet"
746+
id="jakarta.servlet.jsp-api"
747747
download-size="0"
748748
install-size="0"
749749
version="0.0.0"
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
9+
<accessrules>
10+
<accessrule kind="accessible" pattern="org/apache/http/impl/client/*"/>
11+
</accessrules>
12+
</classpathentry>
513
<classpathentry kind="src" path="src"/>
614
<classpathentry kind="output" path="bin"/>
715
</classpath>

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373

7474
<properties>
7575
<tycho-version>2.7.5</tycho-version>
76-
<cbi-version>1.3.2</cbi-version>
77-
<target-platform>2022-03</target-platform>
76+
<cbi-version>1.4.3</cbi-version>
77+
<target-platform>latest-3</target-platform>
7878
<execution-environment>JavaSE-17</execution-environment>
7979
<eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
8080
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>

providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ public void connect(ID aTargetID, IConnectContext connectContext)
190190
// fall back to the search path as last resort
191191
if(aTargetID == null || !(aTargetID instanceof DnsSdServiceTypeID)) {
192192
ResolverConfig config = new ResolverConfig();
193-
Name[] searchPaths = config.searchPath();
194-
if(searchPaths != null && searchPaths.length > 0) {
193+
List searchPaths = config.searchPath();
194+
if(!searchPaths.isEmpty()) {
195195
targetID = new DnsSdServiceTypeID();
196-
targetID.setSearchPath(searchPaths);
196+
targetID.setSearchPath((Name[])searchPaths.toArray(new Name[searchPaths.size()]));
197197
} else {
198198
throw new ContainerConnectException(Messages.DnsSdDiscoveryLocator_No_Target_ID);
199199
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier">
33
<implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier"/>
44
</scr:component>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier">
33
<implementation class="org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier"/>
44
</scr:component>

releng/features/org.eclipse.ecf.examples/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<import plugin="org.eclipse.ecf.examples.remoteservices.common"/>
4949
<import plugin="org.eclipse.ecf.ui"/>
5050
<import plugin="org.eclipse.equinox.common"/>
51-
<import plugin="javax.servlet"/>
51+
<import plugin="jakarta.servlet.jsp-api"/>
5252
<import plugin="org.eclipse.osgi.services"/>
5353
<import plugin="org.eclipse.ecf.remoteservice.ui"/>
5454
<import plugin="org.eclipse.equinox.app"/>

releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
2828
<import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
2929
<import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
3030
<import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
31-
<import plugin="org.json" version="1.0.0" match="compatible"/>
31+
<import plugin="json"/>
3232
</requires>
3333

3434
<plugin

releng/org.eclipse.ecf.releng.repository/category.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
6161
<category name="remoteservices"/>
6262
</feature>
63-
<iu id="org.json" version="0.0.0">
63+
<iu id="json" version="0.0.0">
6464
<category name="sdk"/>
6565
</iu>
6666
<iu id="org.objectweb.asm" version="0.0.0">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?pde version="3.8"?>
3+
<target name="Generated from ECF" sequenceNumber="10">
4+
<locations>
5+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6+
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
7+
<repository location="https://download.eclipse.org/cbi/updates/license"/>
8+
</location>
9+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
10+
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
11+
<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
12+
<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
13+
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
14+
<unit id="org.eclipse.emf.edit.ui" version="0.0.0"/>
15+
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest"/>
16+
</location>
17+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
18+
<unit id="bcpg" version="0.0.0"/>
19+
<unit id="biz.aQute.resolve" version="0.0.0"/>
20+
<unit id="com.ibm.icu" version="0.0.0"/>
21+
<unit id="com.jcraft.jsch" version="0.0.0"/>
22+
<unit id="com.sun.jna.platform" version="0.0.0"/>
23+
<unit id="jakarta.annotation-api" version="0.0.0"/>
24+
<unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
25+
<unit id="jakarta.servlet-api" version="0.0.0"/>
26+
<unit id="jakarta.xml.bind-api" version="0.0.0"/>
27+
<unit id="json" version="0.0.0"/>
28+
<unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
29+
<unit id="junit-jupiter-params" version="0.0.0"/>
30+
<unit id="junit-platform-runner" version="0.0.0"/>
31+
<unit id="junit-platform-suite-engine" version="0.0.0"/>
32+
<unit id="junit-vintage-engine" version="0.0.0"/>
33+
<unit id="org.apache.ant" version="0.0.0"/>
34+
<unit id="org.apache.batik.css" version="0.0.0"/>
35+
<unit id="org.apache.commons.httpclient" version="0.0.0"/>
36+
<unit id="org.apache.commons.jxpath" version="0.0.0"/>
37+
<unit id="org.apache.felix.gogo.runtime" version="0.0.0"/>
38+
<unit id="org.apache.httpcomponents.client5.httpclient5" version="0.0.0"/>
39+
<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
40+
<unit id="org.apache.log4j" version="0.0.0"/>
41+
<unit id="org.apache.lucene.analysis-smartcn" version="0.0.0"/>
42+
<unit id="org.apiguardian.api" version="0.0.0"/>
43+
<unit id="org.bndtools.headless.build.plugin.gradle" version="0.0.0"/>
44+
<unit id="org.bndtools.templates.template" version="0.0.0"/>
45+
<unit id="org.bndtools.templating" version="0.0.0"/>
46+
<unit id="org.osgi.annotation.bundle" version="0.0.0"/>
47+
<unit id="org.osgi.annotation.versioning" version="0.0.0"/>
48+
<unit id="org.osgi.namespace.contract" version="0.0.0"/>
49+
<unit id="org.osgi.namespace.extender" version="0.0.0"/>
50+
<unit id="org.osgi.namespace.service" version="0.0.0"/>
51+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
52+
<unit id="org.osgi.service.device" version="0.0.0"/>
53+
<unit id="org.osgi.service.event" version="0.0.0"/>
54+
<unit id="org.osgi.service.http.whiteboard" version="0.0.0"/>
55+
<unit id="org.osgi.service.metatype.annotations" version="0.0.0"/>
56+
<unit id="org.osgi.service.prefs" version="0.0.0"/>
57+
<unit id="org.osgi.service.provisioning" version="0.0.0"/>
58+
<unit id="org.osgi.service.upnp" version="0.0.0"/>
59+
<unit id="org.osgi.service.useradmin" version="0.0.0"/>
60+
<unit id="org.osgi.service.wireadmin" version="0.0.0"/>
61+
<unit id="org.osgi.util.position" version="0.0.0"/>
62+
<unit id="org.osgi.util.xml" version="0.0.0"/>
63+
<unit id="org.sat4j.pb" version="0.0.0"/>
64+
<unit id="org.tukaani.xz" version="0.0.0"/>
65+
<unit id="org.xbill.dns" version="0.0.0"/>
66+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
67+
</location>
68+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
69+
<unit id="com.sun.syndication" version="0.0.0"/>
70+
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository"/>
71+
</location>
72+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
73+
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
74+
<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
75+
</location>
76+
</locations>
77+
</target>

0 commit comments

Comments
 (0)