From 6a974faf185b75106c39a6c2132d82a3bfd7aa8d Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Thu, 8 Aug 2024 12:00:27 -0700 Subject: [PATCH] Fixes for https://github.com/eclipse/ecf/issues/120 --- .../org.eclipse.ecf.console/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++-- .../META-INF/MANIFEST.MF | 5 ++-- ....ecf.internal.console.ContainerCommand.xml | 20 +++++++++++++ .../org.eclipse.ecf.console/build.properties | 4 ++- .../bundles/org.eclipse.ecf.console/pom.xml | 2 +- .../.classpath | 18 ++++++++++-- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++--- .../META-INF/MANIFEST.MF | 5 ++-- ....remoteserviceadmin.console.RSACommand.xml | 28 +++++++++++++++++++ .../build.properties | 4 ++- .../pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +++--- .../META-INF/MANIFEST.MF | 4 +-- ...2.Win32HttpClientConfigurationModifier.xml | 4 +++ ...tpclient45.win32.Win32NTLMProxyHandler.xml | 7 +++++ .../pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++--- .../META-INF/MANIFEST.MF | 4 +-- ...sfer.httpclient45.ECFHttpClientFactory.xml | 7 +++++ .../pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- ...2.Win32HttpClientConfigurationModifier.xml | 4 +++ ...ttpclient5.win32.Win32NTLMProxyHandler.xml | 7 +++++ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- ...nsfer.httpclient5.ECFHttpClientFactory.xml | 7 +++++ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- ...er.httpclientjava.ECFHttpClientFactory.xml | 7 +++++ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- ....tooling.bndtools.PreferencesComponent.xml | 5 ++++ .../pom.xml | 2 +- 38 files changed, 169 insertions(+), 46 deletions(-) create mode 100644 framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml create mode 100644 osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml create mode 100644 tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml diff --git a/framework/bundles/org.eclipse.ecf.console/.classpath b/framework/bundles/org.eclipse.ecf.console/.classpath index e801ebfb46..81fe078c20 100644 --- a/framework/bundles/org.eclipse.ecf.console/.classpath +++ b/framework/bundles/org.eclipse.ecf.console/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs index f2525a8b92..8c9943d50c 100644 --- a/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF index 8e404ece77..4519884320 100644 --- a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF @@ -4,9 +4,9 @@ Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.console Automatic-Module-Name: org.eclipse.ecf.console Bundle-Vendor: %plugin.provider -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.100.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional, org.eclipse.ecf.core;version="[3.0.0,4.0.0)", org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)", @@ -18,3 +18,4 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional Export-Package: org.eclipse.ecf.console;version="1.0.0" +Service-Component: OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml diff --git a/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml b/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml new file mode 100644 index 0000000000..cafe3f6456 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml @@ -0,0 +1,20 @@ + + + + listcontainers +lcs +listnamespaces +lns +listtypedescriptions +lctds +listconfigs +lcfgs + + + + + + + + + \ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.console/build.properties b/framework/bundles/org.eclipse.ecf.console/build.properties index d6bbd0d7b9..10cca5b8f9 100644 --- a/framework/bundles/org.eclipse.ecf.console/build.properties +++ b/framework/bundles/org.eclipse.ecf.console/build.properties @@ -3,5 +3,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties,\ - about.html + about.html,\ + OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml,\ + OSGI-INF/ jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.console/pom.xml b/framework/bundles/org.eclipse.ecf.console/pom.xml index 150fbac090..38d0b537c6 100644 --- a/framework/bundles/org.eclipse.ecf.console/pom.xml +++ b/framework/bundles/org.eclipse.ecf.console/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.console - 1.4.0-SNAPSHOT + 1.4.100-SNAPSHOT eclipse-plugin diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.classpath b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.classpath index b9a5b1ec64..7931ec26b9 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.classpath +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.settings/org.eclipse.jdt.core.prefs b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.settings/org.eclipse.jdt.core.prefs index 2cedb0a849..d4540a53f9 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.settings/org.eclipse.jdt.core.prefs +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF index ea93e97ea1..83d204287c 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin.console -Bundle-Version: 1.3.1.qualifier +Bundle-Version: 1.3.200.qualifier Bundle-Vendor: %bundle.provider -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: bundle Bundle-ActivationPolicy: lazy Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional, @@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional, org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)" Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin.console +Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml new file mode 100644 index 0000000000..ab56662c90 --- /dev/null +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml @@ -0,0 +1,28 @@ + + + + listexports +lexps +listimports +limps +unexportservice +unexpsvc +unimportservice +unimpsvc +rsadebug +exportservice +expsvc +importservice +impsvc +updateservice +updsvc + + + + + + + + + + \ No newline at end of file diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties index 916f73db6d..c62f73bf82 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties @@ -2,4 +2,6 @@ source.. = src/ bin.includes = META-INF/,\ .,\ about.html,\ - bundle.properties + bundle.properties,\ + OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml,\ + OSGI-INF/ diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml index bd2cec347f..49f11c884a 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml @@ -9,6 +9,6 @@ ../../../ org.eclipse.ecf.osgi.services.remoteserviceadmin.console - 1.3.1-SNAPSHOT + 1.3.200-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath index ed0eb24c50..a7bc712151 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.classpath @@ -1,6 +1,6 @@ - + diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.settings/org.eclipse.jdt.core.prefs index 859758e52e..80afd7dcc3 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.settings/org.eclipse.jdt.core.prefs @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,8 +134,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/META-INF/MANIFEST.MF index 7599a052b2..861791e59f 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient45.win32;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient45.win32 -Bundle-Version: 1.0.500.qualifier +Bundle-Version: 1.0.600.qualifier Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ClassPath: . Require-Bundle: org.eclipse.osgi.services;bundle-version="[3.4.0,4.0.0)", org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)", diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml new file mode 100644 index 0000000000..2739d3209c --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml new file mode 100644 index 0000000000..135a45b206 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/pom.xml index e3ab6834fc..d1f0dbbcf9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclient45.win32 - 1.0.500-SNAPSHOT + 1.0.600-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath index eca7bdba8f..81fe078c20 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.classpath @@ -1,6 +1,6 @@ - + diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs index 5ee738340f..a9e0d22188 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.settings/org.eclipse.jdt.core.prefs @@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -93,6 +94,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -131,8 +133,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF index 43a28cd08e..35308b0225 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient45;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient45 -Bundle-Version: 1.0.600.qualifier +Bundle-Version: 1.0.700.qualifier Bundle-Localization: plugin Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient45.Activator Bundle-ClassPath: . @@ -53,5 +53,5 @@ Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient45;vers org.eclipse.ecf.provider.filetransfer.retrieve, org.eclipse.ecf.provider.filetransfer.util" Service-Component: OSGI-INF/services/*.xml -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml new file mode 100644 index 0000000000..46ed9c121e --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml index e249159805..751fbf0882 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclient45 - 1.0.600-SNAPSHOT + 1.0.700-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.classpath b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.classpath index bc57d2383d..5508535a40 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.classpath @@ -1,6 +1,6 @@ - + diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.settings/org.eclipse.jdt.core.prefs index c363877577..a3fea2ba21 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/.settings/org.eclipse.jdt.core.prefs @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF index 77c4c6fa37..b64acc6a04 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient5.win32;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient5.win32 -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml new file mode 100644 index 0000000000..94e504848b --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml new file mode 100644 index 0000000000..0e2f32e345 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml index 59c55e1899..8a0089eee2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclient5.win32 - 1.1.0-SNAPSHOT + 1.1.100-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF index 7c20522a0b..cd48cf1ff9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient5;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient5 @@ -63,3 +63,4 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient5;version="1.0.0", org.eclipse.ecf.provider.filetransfer.httpclient5;version="1.0.0" Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient5.Activator +Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml new file mode 100644 index 0000000000..b2875847b7 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml index 94121ab7bb..75c7d8c4e2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclient5 - 1.1.0-SNAPSHOT + 1.1.100-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF index 8b9a487d70..0c8c1d81dd 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclientjava;singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.300.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclientjava @@ -30,3 +30,4 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava;version="1.0.0", org.eclipse.ecf.provider.filetransfer.httpclientjava;version="1.0.0" Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.Activator +Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml new file mode 100644 index 0000000000..ca4c2ad45f --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml index 4fd5c83a64..ef3085d374 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclientjava - 2.0.200-SNAPSHOT + 2.0.300-SNAPSHOT eclipse-plugin diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF index aa9f52bb37..9c3cd1dd4e 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.bndtools;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Import-Package: org.eclipse.core.resources, org.eclipse.jface.resource, org.osgi.service.component.annotations;version="1.3.0";resolution:=optional @@ -16,3 +16,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.bndtools Bundle-ActivationPolicy: lazy Bundle-Localization: plugin +Service-Component: OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml new file mode 100644 index 0000000000..097266f4b7 --- /dev/null +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml index 8c9f5eadc2..ac45ae8163 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml @@ -5,7 +5,7 @@ org.eclipse.ecf ecf-parent - 1.0.0-SNAPSHOT + 1.0.100-SNAPSHOT ../../../ org.eclipse.ecf.remoteservices.tooling.bndtools