feat: update eclipse-jdt-ui to 4.26

Jenkinsfile

@@ -0,0 +1,34 @@
+pipeline {
+	options {
+		timeout(time: 40, unit: 'MINUTES')
+		buildDiscarder(logRotator(numToKeepStr:'5'))
+		timestamps()
+	}
+	agent {
+		label "centos-latest"
+	}
+	tools {
+		maven 'apache-maven-latest'
+		jdk 'openjdk-jdk17-latest'
+	}
+	stages {
+		stage('Build') {
+			steps {
+				wrap([$class: 'Xvnc', useXauthority: true]) {
+					sh """
+					mvn -f pom.xml -Dmaven.compiler.failOnWarning=true -DskipTests=false -Dmaven.repo.local=$WORKSPACE/.m2/repository \
+						clean verify --batch-mode -Pbuild-individual-bundles -Pbree-libs -Papi-check
+					"""
+				}
+			}
+			post {
+				always {
+					archiveArtifacts artifacts: '*.log,*/target/work/data/.metadata/*.log,*/tests/target/work/data/.metadata/*.log,apiAnalyzer-workspace/.metadata/*.log', allowEmptyArchive: true
+					recordIssues aggregatingResults: true, enabledForFailure: true, qualityGates: [[threshold: 1, type: 'DELTA', unstable: false]], tools: [acuCobol()]
+					publishIssues issues:[scanForIssues(tool: java()), scanForIssues(tool: mavenConsole())]
+					junit '**/target/surefire-reports/*.xml'
+				}
+			}
+		}
+	}
+}

README.md

@@ -38,19 +38,19 @@ Public forum for Eclipse JDT users.
 
 - <http://www.eclipse.org/forums/eclipse.tools.jdt>
 
-Search for bugs:
+Search for bugs/issues:
 ----------------
 
-This project uses Bugzilla to track ongoing development and issues.
+This project uses Github issues to track ongoing development and issues.
 
-- <https://bugs.eclipse.org/bugs/buglist.cgi?product=JDT;component=UI>
+- [https://github.com/eclipse-jdt/eclipse.jdt.ui/issues](https://github.com/eclipse-jdt/eclipse.jdt.ui/issues)
 
-Create a new bug:
+Create a new bug/issue:
 -----------------
 
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+Be sure to search for existing issue before you create another one. Remember that contributions are always welcome!
 
-- <https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JDT;component=UI>
+- [https://github.com/eclipse-jdt/eclipse.jdt.ui/issues](https://github.com/eclipse-jdt/eclipse.jdt.ui/issues)
 
 Contact:
 --------

debian/build.xml

@@ -25,7 +25,7 @@
 
   <!-- Eclipse Java Code Manipulation Functionality -->
   <target name="org.eclipse.jdt.core.manipulation" depends="org.eclipse.ltk.core.refactoring">
-    <make-bundle name="org.eclipse.jdt.core.manipulation" basedir="." depends="org.eclipse.ltk.core.refactoring">
+    <make-bundle name="org.eclipse.jdt.core.manipulation" basedir="." depends="org.eclipse.ltk.core.refactoring" release="11">
       <pathelement path="/usr/share/java/eclipse-core-contenttype.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-expressions.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-filebuffers.jar"/>
@@ -68,7 +68,7 @@
 
   <!-- Eclipse Java Development Tools JUnit core support -->
   <target name="org.eclipse.jdt.junit.core" depends="org.eclipse.jdt.junit.runtime">
-    <make-bundle name="org.eclipse.jdt.junit.core" basedir="." depends="org.eclipse.jdt.junit.runtime">
+    <make-bundle name="org.eclipse.jdt.junit.core" basedir="." depends="org.eclipse.jdt.junit.runtime" release="11">
       <pathelement path="/usr/share/java/eclipse-core-expressions.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-resources.jar"/>
@@ -100,7 +100,7 @@
 
   <!-- Eclipse Java Development Tools UI -->
   <target name="org.eclipse.jdt.ui" depends="org.eclipse.jdt.core.manipulation,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring">
-    <make-bundle name="org.eclipse.jdt.ui" basedir="." depends="org.eclipse.jdt.core.manipulation,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring">
+    <make-bundle name="org.eclipse.jdt.ui" basedir="." depends="org.eclipse.jdt.core.manipulation,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring" release="11">
       <pathelement path="/usr/share/java/eclipse-compare.jar"/>
       <pathelement path="/usr/share/java/eclipse-compare-core.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-commands.jar"/>

debian/changelog

@@ -1,3 +1,23 @@
+eclipse-jdt-ui (4.26-1) unstable; urgency=medium
+
+  * New upstream release
+    - Depend on libeclipse-jdt-core-java (>= 3.32)
+    - Build more bundles with Java 11
+  * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <[email protected]>  Thu, 05 Jan 2023 12:19:29 +0100
+
+eclipse-jdt-ui (4.23-1) unstable; urgency=medium
+
+  * New upstream release
+    - Depend on libeclipse-core-resources-java (>= 3.16)
+    - Depend on libeclipse-jface-text-java (>= 3.20)
+    - Build org.eclipse.jdt.ui with Java 11
+  * Standards-Version updated to 4.6.1
+  * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <[email protected]>  Fri, 09 Dec 2022 09:32:38 +0100
+
 eclipse-jdt-ui (4.21-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected]
 Uploaders: Emmanuel Bourg <[email protected]>
 Build-Depends:
  debhelper-compat (= 13),
- default-jdk,
+ default-jdk (>= 2:1.11),
  ant,
  junit,
  junit4,
@@ -17,16 +17,16 @@ Build-Depends:
  libeclipse-core-filebuffers-java,
  libeclipse-core-filesystem-java,
  libeclipse-core-jobs-java,
- libeclipse-core-resources-java,
+ libeclipse-core-resources-java (>= 3.16),
  libeclipse-core-runtime-java,
  libeclipse-core-variables-java,
  libeclipse-debug-core-java,
  libeclipse-debug-ui-java,
  libeclipse-help-java,
- libeclipse-jdt-core-java (>= 3.20),
+ libeclipse-jdt-core-java (>= 3.32),
  libeclipse-jdt-launching-java (>= 3.11),
  libeclipse-jface-java (>= 3.14),
- libeclipse-jface-text-java (>= 3.16),
+ libeclipse-jface-text-java (>= 3.20),
  libeclipse-search-java,
  libeclipse-team-core-java,
  libeclipse-team-ui-java,
@@ -48,7 +48,7 @@ Build-Depends:
  libicu4j-java,
  libswt-gtk-4-java,
  eclipse-debian-helper
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-jdt-ui.git
 Vcs-Browser: https://salsa.debian.org/java-team/eclipse-jdt-ui
 Homepage: https://www.eclipse.org/jdt/ui/
@@ -112,7 +112,7 @@ Depends:
  libeclipse-core-jobs-java,
  libeclipse-core-resources-java,
  libeclipse-core-runtime-java,
- libeclipse-jdt-core-java (>= 3.20),
+ libeclipse-jdt-core-java (>= 3.32),
  libeclipse-jdt-launching-java,
  libeclipse-text-java (>= 3.8),
  libequinox-common-java,
@@ -275,7 +275,7 @@ Depends:
  libeclipse-jdt-core-java (>= 3.16),
  libeclipse-jdt-launching-java (>= 3.11),
  libeclipse-jface-java (>= 3.14),
- libeclipse-jface-text-java (>= 3.16),
+ libeclipse-jface-text-java (>= 3.20),
  libeclipse-search-java,
  libeclipse-team-core-java,
  libeclipse-team-ui-java,
@@ -332,7 +332,7 @@ Depends:
  libeclipse-core-filebuffers-java,
  libeclipse-core-filesystem-java,
  libeclipse-core-jobs-java,
- libeclipse-core-resources-java,
+ libeclipse-core-resources-java (>= 3.16),
  libeclipse-core-runtime-java,
  libeclipse-text-java,
  libequinox-common-java,

debian/copyright

@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Eclipse JDT UI
-Source: https://github.com/eclipse/eclipse.jdt.ui
+Source: https://github.com/eclipse-jdt/eclipse.jdt.ui
 Files-Excluded: *.jar
                 *.class
                 */testresources/*.zip

debian/watch

@@ -1,3 +1,3 @@
 version=4
 opts="mode=git,repack,compression=xz,uversionmangle=s/_/./g" \
-https://git.eclipse.org/r/jdt/eclipse.jdt.ui refs/tags/R([\d_]+[az]?)
+https://github.com/eclipse-jdt/eclipse.jdt.ui refs/tags/R([\d_]+[az]?)

org.eclipse.jdt.astview.feature/feature.xml

@@ -2,13 +2,13 @@
 <feature
       id="org.eclipse.jdt.astview.feature"
       label="AST View"
-      version="1.1.13.qualifier"
+      version="1.1.15.qualifier"
       provider-name="Eclipse.org"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
    <description>
-      AST View for Eclipse 2020-12 and later (jdt.core 3.24)
+      AST View for Eclipse 2021-12 and later (jdt.core 3.28)
    </description>
 
    <license url="%licenseURL">
@@ -20,8 +20,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jdt.core" version="3.24.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.22.0" match="compatible"/>
+      <import plugin="org.eclipse.jdt.core" version="3.31.0" match="compatible"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.27.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>

org.eclipse.jdt.astview.feature/pom.xml

@@ -14,10 +14,10 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt.astview.feature</artifactId>
-  <version>1.1.13-SNAPSHOT</version>
+  <version>1.1.15-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

org.eclipse.jdt.astview/META-INF/MANIFEST.MF

@@ -3,8 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.astview
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.astview; singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Eclipse-SourceReferences: scm:git:https://git.eclipse.org/r/jdt/eclipse.jdt.ui.git;path="org.eclipse.jdt.astview";tag=R4_4
+Bundle-Version: 1.5.200.qualifier
 Bundle-Activator: org.eclipse.jdt.astview.ASTViewPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

org.eclipse.jdt.astview/pom.xml

@@ -14,10 +14,10 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.21.0-SNAPSHOT</version>
+    <version>4.26.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.astview</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2021 IBM Corporation and others.
+ * Copyright (c) 2000, 2022 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -138,6 +138,9 @@
 public class ASTView extends ViewPart implements IShowInSource, IShowInTargetList {
 
 	static final int JLS_LATEST= AST.getJLSLatest();
+	private static final int JLS19= ASTHelper.JLS19;
+	private static final int JLS18= ASTHelper.JLS18;
+	private static final int JLS17= ASTHelper.JLS17;
 	private static final int JLS16= ASTHelper.JLS16;
 	private static final int JLS15= ASTHelper.JLS15;
 	private static final int JLS14= ASTHelper.JLS14;
@@ -509,6 +512,9 @@ public ASTView() {
 				case JLS14:
 				case JLS15:
 				case JLS16:
+				case JLS17:
+				case JLS18:
+				case JLS19:
 					fCurrentASTLevel= level;
 			}
 		} catch (NumberFormatException e) {
@@ -1131,6 +1137,9 @@ public void run() {
 				new ASTLevelToggle("AST Level 1&4 (14)", JLS14), //$NON-NLS-1$
 				new ASTLevelToggle("AST Level 1&5 (15)", JLS15), //$NON-NLS-1$
 				new ASTLevelToggle("AST Level 1&6 (16)", JLS16), //$NON-NLS-1$
+				new ASTLevelToggle("AST Level 1&7 (17)", JLS17), //$NON-NLS-1$
+				new ASTLevelToggle("AST Level 1&8 (18)", JLS18), //$NON-NLS-1$
+				new ASTLevelToggle("AST Level 1&9 (19)", JLS19), //$NON-NLS-1$
 		};
 
 		fAddToTrayAction= new Action() {

org.eclipse.jdt.core.manipulation/.settings/.api_filters

@@ -8,4 +8,62 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="core extension/org/eclipse/jdt/internal/corext/dom/ASTFlattener.java" type="org.eclipse.jdt.internal.corext.dom.ASTFlattener">
+        <filter comment="Java preview feature API" id="640712815">
+            <message_arguments>
+                <message_argument value="ASTNode"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="accept(ASTVisitor)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Java preview feature API" id="640712815">
+            <message_arguments>
+                <message_argument value="ASTNode"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getAST()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Java preview feature API" id="640712815">
+            <message_arguments>
+                <message_argument value="GuardedPattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getExpression()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Java preview feature API" id="640712815">
+            <message_arguments>
+                <message_argument value="GuardedPattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getPattern()"/>
+            </message_arguments>
+        </filter>
+        <filter id="640712815">
+            <message_arguments>
+                <message_argument value="RecordPattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getPatternName()"/>
+            </message_arguments>
+        </filter>
+        <filter id="640712815">
+            <message_arguments>
+                <message_argument value="RecordPattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getPatternType()"/>
+            </message_arguments>
+        </filter>
+        <filter id="640712815">
+            <message_arguments>
+                <message_argument value="RecordPattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="patterns()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Java preview feature API" id="640712815">
+            <message_arguments>
+                <message_argument value="TypePattern"/>
+                <message_argument value="ASTFlattener"/>
+                <message_argument value="getPatternVariable()"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>