From 23c83cf10ae73e1bc7256386b81fa475caa9ee9f Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Tue, 30 Apr 2024 14:40:22 -0700 Subject: [PATCH] Feature and bundle version updates --- framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF | 2 +- framework/bundles/org.eclipse.ecf.ssl/build.properties | 1 + framework/bundles/org.eclipse.ecf.ssl/pom.xml | 3 +-- .../src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java | 5 ----- releng/features/org.eclipse.ecf.base.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml | 3 +-- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF index 6a78c4755f..4b1554d63a 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ssl Automatic-Module-Name: org.eclipse.ecf.ssl -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Fragment-Host: org.eclipse.ecf Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.osgi.service.security diff --git a/framework/bundles/org.eclipse.ecf.ssl/build.properties b/framework/bundles/org.eclipse.ecf.ssl/build.properties index cdd2db7f1f..20776e6148 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/build.properties +++ b/framework/bundles/org.eclipse.ecf.ssl/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html +jre.compilation.profile = J2SE-1.5 diff --git a/framework/bundles/org.eclipse.ecf.ssl/pom.xml b/framework/bundles/org.eclipse.ecf.ssl/pom.xml index d332a8c564..8de3fe944a 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/pom.xml +++ b/framework/bundles/org.eclipse.ecf.ssl/pom.xml @@ -8,8 +8,7 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf org.eclipse.ecf.ssl - 1.3.0-SNAPSHOT + 1.3.100-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java index 1de579bb22..06dcedea31 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java @@ -25,11 +25,7 @@ public static SSLContext getSSLContext(String protocols) { try { resultContext = SSLContext.getDefault(); } catch (NoSuchAlgorithmException pkiNotAvailableERR) { - // TODO Auto-generated catch block - // e.printStackTrace(); - if (protocols != null) { - String[] httpsProtocols = protocols.split(","); // trim to make sure for (int i = 0; i < httpsProtocols.length; i++) @@ -53,7 +49,6 @@ public static SSLContext getSSLContext(String protocols) { // just continue to look for SSLContexts with the next // protocolName } - } } } diff --git a/releng/features/org.eclipse.ecf.base.feature/feature.xml b/releng/features/org.eclipse.ecf.base.feature/feature.xml index 80072c82c9..d70f7d8585 100644 --- a/releng/features/org.eclipse.ecf.base.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.base.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml index 447ae00d12..ea6d8c8486 100644 --- a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml index a9505d9951..6a7d4c2aac 100644 --- a/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml @@ -8,8 +8,7 @@ 1.0.0-SNAPSHOT ../../../ - org.eclipse.ecf org.eclipse.ecf.core.ssl.feature - 1.1.501-SNAPSHOT + 1.1.600-SNAPSHOT eclipse-feature