Merge branch 'master' into MW_AutoExpandPathsOfSingleChildren

eclipse-jdt · Apr 3, 2024 · 15f87d0 · 15f87d0
2 parents 736f0d0 + 8aef553
commit 15f87d0
Show file tree

Hide file tree

Showing 58 changed files with 2,346 additions and 335 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.4</version>
+		<version>4.0.6</version>
 	</extension>
 </extensions>
diff --git a/org.eclipse.jdt.astview.feature/build.properties b/org.eclipse.jdt.astview.feature/build.properties
@@ -15,5 +15,4 @@ bin.includes = feature.xml,\
                feature.properties
 src.includes = feature.xml,\
                feature.properties
-jre.compilation.profile = J2SE-1.4
 pom.model.groupId  = org.eclipse.jdt.feature
diff --git a/org.eclipse.jdt.astview/build.properties b/org.eclipse.jdt.astview/build.properties
@@ -17,9 +17,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                META-INF/,\
                .
-
+src.includes = about.html
 source.. = src/
 output.. = bin/
-jre.compilation.profile = JavaSE-1.8
 javacDefaultEncoding.. = UTF-8
 pom.model.groupId  = org.eclipse.jdt
diff --git a/org.eclipse.jdt.bcoview.feature/feature.xml b/org.eclipse.jdt.bcoview.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jdt.bcoview.feature"
       label="Bytecode Outline View"
-      version="1.2.300.qualifier"
+      version="1.2.400.qualifier"
       provider-name="Eclipse.org"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF b/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.bcoview;singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.jdt.bcoview.BytecodeOutlinePlugin
 Bundle-Vendor: %providerName

diff --git a/org.eclipse.jdt.bcoview/build.properties b/org.eclipse.jdt.bcoview/build.properties
@@ -6,7 +6,7 @@ bin.includes = README.md,\
                about.html,\
                plugin.properties,\
                .options
-
+src.includes = about.html
 jars.compile.order = .
 source.. = src/
 output.. = bin/

diff --git a/org.eclipse.jdt.bcoview/pom.xml b/org.eclipse.jdt.bcoview/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.bcoview</artifactId>
-  <version>1.2.300-SNAPSHOT</version>
+  <version>1.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

diff --git a/org.eclipse.jdt.core.manipulation/.settings/.api_filters b/org.eclipse.jdt.core.manipulation/.settings/.api_filters
@@ -37,13 +37,6 @@
                 <message_argument value="getPattern()"/>
             </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"/>