Implement PKCS authentication

Jenkinsfile

@@ -18,7 +18,6 @@ pipeline {
 					sh """
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 						-Pbree-libs -Papi-check -Pjavadoc \
-      						-Dmaven.test.failure.ignore=true \
 						-Dcompare-version-with-baselines.skip=false \
 						-Dmaven.compiler.failOnWarning=false \
 						-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
@@ -31,8 +30,8 @@ pipeline {
 					archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log', allowEmptyArchive: true
 					junit '**/target/surefire-reports/TEST-*.xml'
 					discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
-					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
-					recordIssues publishAllIssues:false, tools: [mavenConsole(), javaDoc()]
+					recordIssues tools: [eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
+					recordIssues tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
 				}
 			}
 		}

debug/org.eclipse.debug.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.core; singleton:=true
-Bundle-Version: 3.21.400.qualifier
+Bundle-Version: 3.21.300.qualifier
 Bundle-Activator: org.eclipse.debug.core.DebugPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java

@@ -17,10 +17,8 @@
 
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -68,7 +66,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	/**
 	 * The configuration that was launched, or null.
 	 */
-	private volatile ILaunchConfiguration fConfiguration = null;
+	private ILaunchConfiguration fConfiguration= null;
 
 	/**
 	 * The system processes associated with
@@ -80,7 +78,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	 * The source locator to use in the debug session
 	 * or <code>null</code> if not supported.
 	 */
-	private volatile ISourceLocator fLocator = null;
+	private ISourceLocator fLocator= null;
 
 	/**
 	 * The mode this launch was launched in.
@@ -90,7 +88,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 	/**
 	 * Table of client defined attributes
 	 */
-	private final Map<String, String> fAttributes = new ConcurrentHashMap<>();
+	private HashMap<String, String> fAttributes;
 
 	/**
 	 * Flag indicating that change notification should
@@ -321,20 +319,20 @@ public ILaunchConfiguration getLaunchConfiguration() {
 	 */
 	@Override
 	public void setAttribute(String key, String value) {
-		Objects.requireNonNull(key);
-		if (value == null) {
-			// ConcurrentHashMap does not allow null values
-			fAttributes.remove(key);
-		} else {
-			fAttributes.put(key, value);
+		if (fAttributes == null) {
+			fAttributes = new HashMap<>(5);
 		}
+		fAttributes.put(key, value);
 	}
 
 	/**
 	 * @see ILaunch#getAttribute(String)
 	 */
 	@Override
 	public String getAttribute(String key) {
+		if (fAttributes == null) {
+			return null;
+		}
 		return fAttributes.get(key);
 	}
 
@@ -345,7 +343,7 @@ public String getAttribute(String key) {
 	public IDebugTarget[] getDebugTargets() {
 		readLock.lock();
 		try {
-			return fTargets.toArray(IDebugTarget[]::new);
+			return fTargets.toArray(new IDebugTarget[fTargets.size()]);
 		} finally {
 			readLock.unlock();
 		}

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IProcess.java

@@ -20,29 +20,16 @@
 import org.eclipse.debug.core.ILaunch;
 
 /**
- * A process represents a program running in normal (non-debug) mode. Processes
- * support setting and getting of client defined attributes. This way, clients
- * can annotate a process with any extra information important to them. For
- * example, classpath annotations, or command line arguments used to launch the
- * process may be important to a client.
+ * A process represents a program running in normal (non-debug) mode.
+ * Processes support setting and getting of client defined attributes.
+ * This way, clients can annotate a process with any extra information
+ * important to them. For example, classpath annotations, or command
+ * line arguments used to launch the process may be important to a client.
  * <p>
- * Clients may implement this interface, however, the debug plug-in provides an
- * implementation of this interface for a <code>java.lang.Process</code>.
+ * Clients may implement this interface, however, the debug plug-in
+ * provides an implementation of this interface for a
+ * <code>java.lang.Process</code>.
  * </p>
- *
- * If implementing custom launches it is important to fire event whenever the
- * process state changes in the following way:
- *
- * <pre>
- * DebugPlugin manager = DebugPlugin.getDefault();
- * if (manager != null) {
- * 	manager.fireDebugEventSet(new DebugEvent[] {
- * 			new DebugEvent(this, DebugEvent.CREATE) });
- * }
- * </pre>
- *
- * otherwise the UI will probably show faulty state for your process and launch.
- *
  * @see org.eclipse.debug.core.DebugPlugin#newProcess(ILaunch, Process, String)
  */
 public interface IProcess extends IAdaptable, ITerminate {

debug/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java

@@ -17,10 +17,9 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -69,9 +68,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 	private Process fProcess;
 
 	/**
-	 * This process's exit value.
-	 *
-	 * synchronized by this
+	 * This process's exit value
 	 */
 	private int fExitValue;
 
@@ -99,17 +96,17 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
 	/**
 	 * Table of client defined attributes
 	 */
-	private final Map<String, String> fAttributes = new ConcurrentHashMap<>();
+	private Map<String, String> fAttributes;
 
 	/**
 	 * Whether output from the process should be captured or swallowed
 	 */
-	private final boolean fCaptureOutput;
+	private boolean fCaptureOutput = true;
 
 	/**
 	 * Whether the descendants of this process should be terminated too
 	 */
-	private final boolean fTerminateDescendants;
+	private boolean fTerminateDescendants = true;
 
 	private final String fThreadNameSuffix;
 
@@ -144,16 +141,14 @@ public RuntimeProcess(ILaunch launch, Process process, String name, Map<String,
 		String captureOutput = launch.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT);
 		fCaptureOutput = !("false".equals(captureOutput)); //$NON-NLS-1$
 
-		boolean terminateDescendants = true;
 		try {
 			ILaunchConfiguration launchConfiguration = launch.getLaunchConfiguration();
 			if (launchConfiguration != null) {
-				terminateDescendants = launchConfiguration.getAttribute(DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
+				fTerminateDescendants = launchConfiguration.getAttribute(DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
 			}
 		} catch (CoreException e) {
 			DebugPlugin.log(e);
 		}
-		fTerminateDescendants = terminateDescendants;
 		fThreadNameSuffix = getPidInfo(process, launch);
 
 		fStreamsProxy = createStreamsProxy();
@@ -269,9 +264,7 @@ public void terminate() throws DebugException {
 				try { // (in total don't wait longer than TERMINATION_TIMEOUT)
 					long waitStart = System.currentTimeMillis();
 					if (process.waitFor(TERMINATION_TIMEOUT, TimeUnit.MILLISECONDS)) {
-						synchronized (this) {
-							fExitValue = process.exitValue();
-						}
+						fExitValue = process.exitValue();
 						if (waitFor(descendants, waitStart)) {
 							return;
 						}
@@ -426,25 +419,26 @@ protected void fireChangeEvent() {
 	 */
 	@Override
 	public void setAttribute(String key, String value) {
-		Objects.requireNonNull(key);
-		if (value == null) {
-			// ConcurrentHashMap does not allow null values
-			if (fAttributes.remove(key) != null) {
-				fireChangeEvent();
-			}
-		} else {
-			String origVal = fAttributes.put(key, value);
-			if (!Objects.equals(origVal, value)) {
-				fireChangeEvent();
-			}
+		if (fAttributes == null) {
+			fAttributes = new HashMap<>(5);
 		}
+		Object origVal = fAttributes.get(key);
+		if (origVal != null && origVal.equals(value)) {
+			return; //nothing changed.
+		}
+
+		fAttributes.put(key, value);
+		fireChangeEvent();
 	}
 
 	/**
 	 * @see IProcess#getAttribute(String)
 	 */
 	@Override
 	public String getAttribute(String key) {
+		if (fAttributes == null) {
+			return null;
+		}
 		return fAttributes.get(key);
 	}
 

debug/org.eclipse.debug.ui.launchview/OSGI-INF/org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" deactivate="deactivate" immediate="true" name="org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" activate="activate" deactivate="deactivate" immediate="true" name="org.eclipse.debug.ui.launchview.internal.model.LaunchViewModel">
    <service>
       <provide interface="org.eclipse.debug.ui.launchview.internal.model.ILaunchModel"/>
    </service>

debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.18.400.qualifier
+Bundle-Version: 3.18.300.qualifier
 Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java

@@ -13,11 +13,6 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.commands.actions;
 
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchManager;
@@ -27,11 +22,9 @@
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.debug.ui.actions.DebugCommandAction;
-import org.eclipse.debug.ui.contexts.DebugContextEvent;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 
@@ -56,7 +49,9 @@ public void dispose() {
 	private void attachSelfToLaunchManager() {
 		ILaunchManager launchManager = getLaunchManager();
 		launchManager.addLaunchListener(this);
-		setEnabled(canTerminate());
+		// heuristic... rather than updating all the time, just assume there's
+		// something that's not terminated.
+		setEnabled(launchManager.getLaunches().length > 0);
 	}
 
 	private ILaunchManager getLaunchManager() {
@@ -108,12 +103,12 @@ protected Class<ITerminateHandler> getCommandType() {
 
 	@Override
 	public void launchesTerminated(ILaunch[] launches) {
-		setEnabled(canTerminate());
+		setEnabled(getLaunchManager().getLaunches().length > 0);
 	}
 
 	@Override
 	public void launchesAdded(ILaunch[] launches) {
-		setEnabled(canTerminate());
+		setEnabled(true);
 	}
 
 	@Override
@@ -122,7 +117,7 @@ public void launchesChanged(ILaunch[] launches) {
 
 	@Override
 	public void launchesRemoved(ILaunch[] launches) {
-		setEnabled(canTerminate());
+		setEnabled(getLaunchManager().getLaunches().length > 0);
 	}
 
 	@Override
@@ -141,32 +136,4 @@ public void init(IWorkbenchWindow window) {
 		super.init(window);
 		attachSelfToLaunchManager();
 	}
-
-	@Override
-	protected boolean getInitialEnablement() {
-		return canTerminate();
-	}
-
-	private boolean canTerminate() {
-		return Arrays.stream(getLaunchManager().getLaunches()).anyMatch(ILaunch::canTerminate);
-	}
-
-	@Override
-	public void runWithEvent(Event event) {
-		for (ILaunch l : getLaunchManager().getLaunches()) {
-			try {
-				if (l.canTerminate()) {
-					l.terminate();
-				}
-			} catch (DebugException e) {
-				ILog.get().log(Status.warning("Unable to terminate launch: " + e.getMessage(), e)); //$NON-NLS-1$
-			}
-		}
-		setEnabled(canTerminate());
-	}
-
-	@Override
-	public void debugContextChanged(DebugContextEvent event) {
-		setEnabled(canTerminate());
-	}
 }

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java

@@ -248,6 +248,8 @@ public ProcessConsole(IProcess process, IConsoleColorProvider colorProvider, Str
 
 		colorProvider.connect(fProcess, this);
 
+		setName(computeName());
+
 		Color color = fColorProvider.getColor(IDebugUIConstants.ID_STANDARD_INPUT_STREAM);
 		if (fInput instanceof IOConsoleInputStream) {
 			((IOConsoleInputStream)fInput).setColor(color);
@@ -554,9 +556,6 @@ private synchronized void disposeStreams() {
 	protected void init() {
 		super.init();
 		DebugPlugin.getDefault().addDebugEventListener(this);
-		// computeName() after addDebugEventListener()
-		// see https://github.com/eclipse-jdt/eclipse.jdt.debug/issues/390
-		setName(computeName());
 		if (fProcess.isTerminated()) {
 			closeStreams();
 			resetName();

debug/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform</artifactId>
-    <version>4.32.0-SNAPSHOT</version>
+    <version>4.31.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.platform</groupId>