Fixes for 3.14.38 build

eclipse · Apr 22, 2023 · 038aad1 · 038aad1
1 parent abe6556
commit 038aad1
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 46 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
@@ -6,9 +6,7 @@ Automatic-Module-Name: org.eclipse.ecf.ssl
 Bundle-Version: 1.3.0.qualifier
 Fragment-Host: org.eclipse.ecf
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: javax.net,
- javax.net.ssl,
- org.eclipse.osgi.service.security
+Import-Package: org.eclipse.osgi.service.security
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ecf.internal.ssl;x-internal:=true
 Bundle-Vendor: %plugin.provider
diff --git a/framework/bundles/org.eclipse.ecf.ui/.classpath b/framework/bundles/org.eclipse.ecf.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters
@@ -22,6 +22,20 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java" type="org.eclipse.ecf.ui.util.PasswordCacheHelper">
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.ecf.ui.util.PasswordCacheHelper"/>
+                <message_argument value="AUTH_SCHEME"/>
+            </message_arguments>
+        </filter>
+        <filter id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.ecf.ui.util.PasswordCacheHelper"/>
+                <message_argument value="FAKE_URL"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java" type="org.eclipse.ecf.ui.wizards.ConfigurationWizardSelectionPage">
         <filter id="643846161">
             <message_arguments>

diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.ui;singleton:=true
 Automatic-Module-Name: org.eclipse.ecf.ui
-Bundle-Version: 2.2.201.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.ui.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
@@ -21,8 +21,7 @@ Export-Package: org.eclipse.ecf.internal.ui;version="2.1.0";x-internal:=true,
  org.eclipse.ecf.ui.wizards;version="2.1.0"
 Eclipse-RegisterBuddy: org.eclipse.ecf
 Eclipse-BuddyPolicy: dependent
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ecf,
  org.eclipse.ecf.presence,
  org.eclipse.jface.text,
@@ -31,5 +30,6 @@ Require-Bundle: org.eclipse.ecf,
  org.eclipse.ecf.filetransfer,
  org.eclipse.ecf.sharedobject
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ui.editors.text;resolution:=optional
+Import-Package: org.eclipse.equinox.security.storage;version="1.0.0",
+ org.eclipse.ui.editors.text;resolution:=optional
 
diff --git a/framework/bundles/org.eclipse.ecf.ui/pom.xml b/framework/bundles/org.eclipse.ecf.ui/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.ui</artifactId>
-  <version>2.2.201-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java
@@ -13,61 +13,39 @@
 
 package org.eclipse.ecf.ui.util;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.core.runtime.*;
 import org.eclipse.ecf.internal.ui.Activator;
+import org.eclipse.equinox.security.storage.*;
 
 /**
  * Helper for caching password via
  * Platform#addAuthorizationInfo(URL, String, String, Map)
  */
 public class PasswordCacheHelper {
 
-	public static final URL FAKE_URL;
-	public static final String AUTH_SCHEME = ""; //$NON-NLS-1$
+	private static final String TOP_NODE = "org.eclipse.ecf.ui"; //$NON-NLS-1$
 	public static final String INFO_PASSWORD = "org.eclipse.ecf.ui.password"; //$NON-NLS-1$
-	private String targetAuthority;
-
-	static {
-		URL temp = null;
-		try {
-			temp = new URL("http://org.eclipse.ecf.ui"); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// Never happens
-		}
-		FAKE_URL = temp;
-	}
+	private ISecurePreferences securePrefs;
 
 	public PasswordCacheHelper(String targetID) {
-		this.targetAuthority = targetID;
-		Assert.isNotNull(this.targetAuthority);
+		this.securePrefs = SecurePreferencesFactory.getDefault().node(TOP_NODE).node(targetID);
 	}
 
 	public boolean savePassword(String password) {
-		Map map = Platform.getAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME);
-		if (map == null) {
-			map = new HashMap(10);
-		}
-		if (password != null)
-			map.put(INFO_PASSWORD, password);
-
 		try {
-			Platform.addAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME, map);
-		} catch (CoreException e) {
+			this.securePrefs.put(INFO_PASSWORD, password, true);
+		} catch (StorageException e) {
 			Activator.log("savePassword", e); //$NON-NLS-1$
 			return false;
 		}
 		return true;
 	}
 
 	public String retrievePassword() {
-		Map map = Platform.getAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME);
-		if (map != null) {
-			return (String) map.get(INFO_PASSWORD);
+		try {
+			return this.securePrefs.get(INFO_PASSWORD, null);
+		} catch (StorageException e) {
+			Activator.log("savePassword", e); //$NON-NLS-1$
+			return null;
 		}
-		return null;
 	}
 }
diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,7 @@
   <properties>
     <tycho-version>2.7.5</tycho-version>
     <cbi-version>1.3.2</cbi-version>
-    <target-platform>2022-03</target-platform>
+    <target-platform>2022-12</target-platform>
     <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>

diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF
@@ -8,4 +8,3 @@ Bundle-Vendor: %plugin.provider
 Fragment-Host: org.eclipse.ecf.provider.filetransfer;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
-Import-Package: javax.net.ssl
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target b/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="2022-12" sequenceNumber="1">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+			<repository location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
+		</location>
+			<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
+			<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+			<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+			<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
+			<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+		</location>
+			<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.edit.ui.source.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/releases/2022-12"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
+			<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
+			<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
+			<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
+			<unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
+			<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
+			<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20221207-1049"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.1.3.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5.source" version="5.1.3.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5-win" version="5.1.3.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5-win.source" version="5.1.3.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5" version="5.1.4.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5.source" version="5.1.4.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.1.4.v20221013-1742"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.1.4.v20221013-1742"/>
+			<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20221112-0806"/>
+			<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20221112-0806"/>
+			<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+			<unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>			
+			<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
+			<unit id="com.sun.jna.source" version="4.5.1.v20210503-0343"/>
+			<unit id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
+			<unit id="com.sun.jna.platform.source" version="4.5.1.v20221112-0806"/>
+			<unit id="com.sun.jna.platform" version="5.8.0.v20221112-0806"/>
+			<unit id="com.sun.jna.platform.source" version="5.8.0.v20221112-0806"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
+			<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
+			<unit id="org.jdom" version="1.1.1.v201101151400"/>
+			<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+			<unit id="org.json" version="1.0.0.v201011060100"/>
+			<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
+			<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
+			<unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/>
+			<unit id="org.objectweb.asm.source" version="9.1.0.v20210209-1849"/>
+			<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.13.v20211010-1849"/>
+			<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.13.v20211010-1849"/>
+			<unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/>
+			<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
+		</location>
+	</locations>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+</target>
diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml
@@ -31,9 +31,9 @@
             <configuration>
               <artifacts>
                  <artifact>
-                  <file>ecf-2021-09.target</file>
+                  <file>ecf-2022-12.target</file>
                   <type>target</type>
-                  <classifier>ecf-2021-09</classifier>
+                  <classifier>ecf-2022-12</classifier>
                 </artifact>
               </artifacts>
             </configuration>