Merge pull request #496 from scottkurz/common-experiment

Switch to CommonTabLite from CDT project
OpenLiberty · Feb 22, 2024 · 10dd97b · 10dd97b
2 parents 49dcf25 + f087b7b
commit 10dd97b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 41 deletions.
diff --git a/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: io.openliberty.tools.eclipse.ui
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.core.commands,
+Import-Package: org.eclipse.cdt.launch.ui,
+ org.eclipse.core.commands,
  org.eclipse.core.expressions,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,

diff --git a/...rty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/ui/launch/LaunchConfigTabGroup.java b/...rty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/ui/launch/LaunchConfigTabGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2022 IBM Corporation and others.
+* Copyright (c) 2022,2024 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,9 @@
 package io.openliberty.tools.eclipse.ui.launch;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.cdt.launch.ui.CommonTabLite;
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
 
 /**
@@ -28,6 +28,6 @@ public class LaunchConfigTabGroup extends AbstractLaunchConfigurationTabGroup {
      */
     @Override
     public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-        setTabs(new ILaunchConfigurationTab[] { new StartTab(), new JRETab(), new SourceLookupTab(), new CommonTab() });
+        setTabs(new ILaunchConfigurationTab[] { new StartTab(), new JRETab(), new SourceLookupTab(), new CommonTabLite() });
     }
 }
diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml
@@ -20,5 +20,5 @@
 
     <repository-reference location="https://download.eclipse.org/jdtls/milestones/1.28.0/repository" enabled="true" />
     <repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.10.0/repository" enabled="true" />
-    <repository-reference location="https://download.eclipse.org/lsp4jakarta/snapshots/0.2.0/repository" enabled="true" />
+    <repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.0/repository" enabled="true" />
 </site>
diff --git a/releng/target-platform-3Q2023/target-platform-3Q2023.target b/releng/target-platform-3Q2023/target-platform-3Q2023.target
@@ -60,6 +60,7 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <repository location="https://download.eclipse.org/tools/cdt/releases/10.6"/>
+            <unit id="org.eclipse.cdt.launch" version="10.3.200.202201122357"/>
             <unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="10.6.2.202205081303"/>
             <unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.source.feature.group" version="10.6.2.202205081303"/>
             <unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="10.6.2.202205081303"/>
@@ -89,44 +90,43 @@
             <repository location="https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/"/>
             <unit id="org.eclipse.buildship.ui" version="3.1.6.v20220511-1359"/>
         </location>
-        <location includeDependencyDepth="none" includeDependencyScopes="compile" missingManifest="generate" type="Maven">
-            <dependencies>
-                <dependency>
-                    <groupId>net.bytebuddy</groupId>
-                    <artifactId>byte-buddy-agent</artifactId>
-                    <version>1.12.17</version>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>net.bytebuddy</groupId>
-                    <artifactId>byte-buddy</artifactId>
-                    <version>1.12.17</version>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                    <version>4.8.1</version>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-junit-jupiter</artifactId>
-                    <version>4.8.1</version>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.objenesis</groupId>
-                    <artifactId>objenesis</artifactId>
-                    <version>3.3</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <repository location="https://download.eclipse.org/lsp4jakarta/snapshots/0.2.0/repository"/>
-            <unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.0"/>
+            <unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.0.0"/>
         </location>
-
+	    <location includeDependencyDepth="none" includeDependencyScopes="compile" missingManifest="generate" type="Maven">
+		    <dependencies>
+			    <dependency>
+				    <groupId>net.bytebuddy</groupId>
+				    <artifactId>byte-buddy-agent</artifactId>
+				    <version>1.12.17</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>net.bytebuddy</groupId>
+				    <artifactId>byte-buddy</artifactId>
+				    <version>1.12.17</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>org.mockito</groupId>
+				    <artifactId>mockito-core</artifactId>
+				    <version>4.8.1</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>org.mockito</groupId>
+				    <artifactId>mockito-junit-jupiter</artifactId>
+				    <version>4.8.1</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>org.objenesis</groupId>
+				    <artifactId>objenesis</artifactId>
+				    <version>3.3</version>
+				    <type>jar</type>
+			    </dependency>
+		    </dependencies>
+	    </location>
     </locations>
 </target>