Remove 3rd party includes from features

- Move 3rd party feature includes to the dependencies feature.
- Eliminate errors accessing ambiguous activator class.
- Provide an up-to-date, 2026-03 target file.

Author: merks

framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java

@@ -16,15 +16,12 @@
 
 package org.eclipse.ecf.docshare;
 
-import org.eclipse.ecf.internal.docshare.Messages;
-
 import java.io.*;
 import java.util.Collections;
 import java.util.Map;
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.Assert;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDCreateException;
@@ -34,7 +31,9 @@
 import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.events.IChannelDisconnectEvent;
 import org.eclipse.ecf.docshare.messages.*;
-import org.eclipse.ecf.internal.docshare.*;
+import org.eclipse.ecf.internal.docshare.Activator;
+import org.eclipse.ecf.internal.docshare.DocshareDebugOptions;
+import org.eclipse.ecf.internal.docshare.Messages;
 import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.roster.*;
 import org.eclipse.ecf.sync.*;

framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java

@@ -21,16 +21,16 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.*;
 import org.eclipse.ecf.core.IContainerListener;
 import org.eclipse.ecf.core.events.*;
 import org.eclipse.ecf.core.identity.*;
 import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.core.user.IUser;
 import org.eclipse.ecf.core.util.ECFException;
-import org.eclipse.ecf.internal.presence.ui.*;
+import org.eclipse.ecf.internal.presence.ui.Activator;
+import org.eclipse.ecf.internal.presence.ui.ChatLine;
+import org.eclipse.ecf.internal.presence.ui.Messages;
 import org.eclipse.ecf.internal.presence.ui.preferences.PreferenceConstants;
 import org.eclipse.ecf.internal.ui.actions.SelectProviderAction;
 import org.eclipse.ecf.presence.*;

pom.xml

@@ -69,8 +69,8 @@
   <properties>
     <tycho-version>4.0.10</tycho-version>
     <cbi-version>1.5.2</cbi-version>
-    <target-platform>2024-06</target-platform>
-    <execution-environment>JavaSE-17</execution-environment>
+    <target-platform>2026-03</target-platform>
+    <execution-environment>JavaSE-21</execution-environment>
     <eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
     <project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.dependencies.feature"
       label="ECF DependenciesFeature"
-      version="0.0.1.qualifier"
+      version="0.0.2.qualifier"
       provider-name="Eclipse.org"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -31,4 +31,12 @@
          id="org.apache.httpcomponents.core5.httpcore5-h2"
          version="0.0.0"/>
 
+   <plugin
+         id="jakarta.servlet-api"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.objectweb.asm"
+         version="0.0.0"/>
+
 </feature>

releng/features/org.eclipse.ecf.dependencies.feature/pom.xml

@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.dependencies.feature</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.rosgi.feature"
       label="ECF Remote Services R-OSGi Provider"
-      version="2.1.1.qualifier"
+      version="2.1.2.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -34,8 +34,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
          id="org.eclipse.ecf.provider.r_osgi"
          version="0.0.0"/>
 
-   <plugin
-         id="org.objectweb.asm"
-         version="0.0.0"/>
-
 </feature>

releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml

@@ -10,6 +10,6 @@
   </parent>
 
   <artifactId>org.eclipse.ecf.remoteservice.rosgi.feature</artifactId>
-  <version>2.1.1-SNAPSHOT</version>
+  <version>2.1.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.servlet.feature"
       label="ECF Remote Services Servlet API Feature"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -39,8 +39,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
          id="org.eclipse.ecf.remoteservice.servlet"
          version="0.0.0"/>
 
-   <plugin
-         id="jakarta.servlet-api"
-         version="0.0.0"/>
-
 </feature>

releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml

@@ -10,6 +10,6 @@
   </parent>
 
   <artifactId>org.eclipse.ecf.remoteservice.servlet.feature</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/org.eclipse.ecf.releng.target/ecf-2026-03.target

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Generated from ECF" sequenceNumber="3">
+  <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" 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.bnd.embedded-repo" version="0.0.0"/>
+      <unit id="biz.aQute.resolve" version="0.0.0"/>
+      <unit id="com.github.weisj.jsvg" version="0.0.0"/>
+      <unit id="com.googlecode.javaewah.JavaEWAH" 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="org.apache.ant" version="0.0.0"/>
+      <unit id="org.apache.batik.css" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-logging" version="0.0.0"/>
+      <unit id="org.apache.commons.httpclient" 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.client5.httpclient5-win" version="0.0.0"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
+      <unit id="org.apache.httpcomponents.httpclient.win" 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.templating" version="0.0.0"/>
+      <unit id="org.commonmark.ext-gfm-tables" version="0.0.0"/>
+      <unit id="org.jdom" version="0.0.0"/>
+      <unit id="org.junit" version="0.0.0"/>
+      <unit id="org.mortbay.jasper.mortbay-apache-jsp" version="0.0.0"/>
+      <unit id="org.opentest4j" 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="bndtools.main.feature.feature.group" version="0.0.0"/>
+      <repository location="https://bndtools.org/bndtools.p2.repo/7.1.0"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.security" version="0.0.0"/>
+      <unit id="org.eclipse.jgit" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/egit/updates-stable-nightly"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.39-I-builds"/>
+    </location>
+  </locations>
+</target>