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.
- Increment versions for bundles with baseline replace problems.

Author: merks

.github/workflows/maven.yml

@@ -16,15 +16,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
-        maven-version: 3.9.6
+        maven-version: 3.9.12
     - name: Build with Maven
       run: mvn clean verify -Pbaseline-checks  -DskipTests=true

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.identity/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true
 Automatic-Module-Name: org.eclipse.ecf.identity
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.10.1.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator
 Bundle-Localization: plugin
 Bundle-Vendor: %plugin.provider

framework/bundles/org.eclipse.ecf.identity/pom.xml

@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.identity</artifactId>
-  <version>3.10.0-SNAPSHOT</version>
+  <version>3.10.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

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>