Merge pull request #169 from scottslewis/master

Build for 3.15.5 (no httpclient45)
eclipse · Jan 24, 2025 · 0a5c133 · 0a5c133
2 parents 6d306c7 + 31456e2
commit 0a5c133
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 118 deletions.
diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true
 Automatic-Module-Name: org.eclipse.ecf.doc
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.0.0,4.0.0)",

diff --git a/doc/bundles/org.eclipse.ecf.doc/build.properties b/doc/bundles/org.eclipse.ecf.doc/build.properties
@@ -30,17 +30,12 @@ jars.extra.classpath = platform:/plugin/org.eclipse.ecf,\
                        platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.console,\
                        platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy,\
                        platform:/plugin/org.eclipse.ecf.provider,\
-                       platform:/plugin/org.eclipse.ecf.provider.dnssd,\
                        platform:/plugin/org.eclipse.ecf.provider.filetransfer,\
-                       platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient45,\
                        platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient5,\
-                       platform:/plugin/org.eclipse.ecf.provider.jslp,\
+                       platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclientjava,\
                        platform:/plugin/org.eclipse.ecf.provider.remoteservice,\
-                       platform:/plugin/org.eclipse.ecf.provider.r_osgi,\
                        platform:/plugin/org.eclipse.ecf.remoteservice,\
                        platform:/plugin/org.eclipse.ecf.remoteservice.asyncproxy,\
                        platform:/plugin/org.eclipse.ecf.remoteservice.eventadmin,\
-                       platform:/plugin/org.eclipse.ecf.remoteservice.rest,\
-                       platform:/plugin/org.eclipse.ecf.remoteservice.servlet,\
                        platform:/plugin/org.eclipse.ecf.sharedobject,\
                        platform:/plugin/org.eclipse.osgi.services.remoteserviceadmin
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>org.eclipse.ecf.doc</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
@@ -30,8 +30,8 @@
                   <additionalArgument>-Xdoclint:none</additionalArgument>
                   <additionalArgument>-splitindex</additionalArgument>
                   <additionalArgument>-use</additionalArgument>
-                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.4 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.4 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.5 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.5 API"</additionalArgument>
                   <additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
                   <additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
                   <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>

diff --git a/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml b/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
@@ -31,21 +31,17 @@
             <topic href="html/reference/api/org/eclipse/ecf/osgi/services/remoteserviceadmin/package-summary.html" label="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/comm/package-summary.html" label="org.eclipse.ecf.provider.comm"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/comm/tcp/package-summary.html" label="org.eclipse.ecf.provider.comm.tcp"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/dnssd/package-summary.html" label="org.eclipse.ecf.provider.dnssd"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/package-summary.html" label="org.eclipse.ecf.provider.filetransfer"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/browse/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.browse"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/events/socket/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.events.socket"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient45/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient5/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
+            <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclientjava/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/identity/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.identity"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/outgoing/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.outgoing"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/retrieve/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.retrieve"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/util/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/generic/package-summary.html" label="org.eclipse.ecf.provider.generic"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/generic/gmm/package-summary.html" label="org.eclipse.ecf.provider.generic.gmm"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/jslp/container/package-summary.html" label="org.eclipse.ecf.provider.jslp.container"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/jslp/identity/package-summary.html" label="org.eclipse.ecf.provider.jslp.identity"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/r_osgi/identity/package-summary.html" label="org.eclipse.ecf.provider.r_osgi.identity"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/remoteservice/generic/package-summary.html" label="org.eclipse.ecf.provider.remoteservice.generic"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/util/package-summary.html" label="org.eclipse.ecf.provider.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/package-summary.html" label="org.eclipse.ecf.remoteservice"/>
@@ -55,11 +51,6 @@
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/eventadmin/serialization/package-summary.html" label="org.eclipse.ecf.remoteservice.eventadmin.serialization"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/events/package-summary.html" label="org.eclipse.ecf.remoteservice.events"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/provider/package-summary.html" label="org.eclipse.ecf.remoteservice.provider"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/package-summary.html" label="org.eclipse.ecf.remoteservice.rest"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/client/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.client"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/identity/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.identity"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/util/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.util"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/servlet/package-summary.html" label="org.eclipse.ecf.remoteservice.servlet"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/package-summary.html" label="org.eclipse.ecf.remoteservice.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/tracker/package-summary.html" label="org.eclipse.ecf.remoteservice.util.tracker"/>
             <topic href="html/reference/api/org/osgi/service/remoteserviceadmin/package-summary.html" label="org.osgi.service.remoteserviceadmin"/>

diff --git a/pom.xml b/pom.xml
@@ -137,8 +137,6 @@
     <module>providers/bundles/org.eclipse.ecf.provider.datashare.nio</module>
     <module>providers/bundles/org.eclipse.ecf.provider.discovery</module>
     <module>providers/bundles/org.eclipse.ecf.provider.dnssd</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava</module>
@@ -189,7 +187,6 @@
     <module>releng/features/org.eclipse.ecf.discovery.jmdns.feature</module>
     <module>releng/features/org.eclipse.ecf.discovery.slp.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.feature</module>
-    <module>releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature</module>
     <module>releng/features/org.eclipse.ecf.osgi.services.feature</module>

diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF SDK for Eclipse"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"

diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.core</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature"
       label="ECF Remote Services SDK for Bndtools"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature"
       label="ECF Remote Services SDK for Eclipse"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
       label="ECF Remote Services SDK for OSGi clients and servers"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">