Skip to content

Commit

Permalink
Update bundle and API versions after merge of BETA_JAVA21 (eclipse-jd…
Browse files Browse the repository at this point in the history
…t#1400)

* Update bundle and API versions after merge of BETA_JAVA21

* Make the jdt.core refer the correct version of compiler.batch

* Add required api filters and removed ones not required
  • Loading branch information
jarthana committed Sep 20, 2023
1 parent 36e2847 commit 0b4cf38
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 8 deletions.
23 changes: 23 additions & 0 deletions org.eclipse.jdt.core.compiler.batch/.settings/.api_filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.core.compiler.batch" version="2">
<resource path="src/org/eclipse/jdt/core/compiler/IProblem.java" type="org.eclipse.jdt.core.compiler.IProblem">
<filter id="405864542">
<message_arguments>
<message_argument value="org.eclipse.jdt.core.compiler.IProblem"/>
<message_argument value="CannotMixNullAndNonTypePattern"/>
</message_arguments>
</filter>
<filter id="405864542">
<message_arguments>
<message_argument value="org.eclipse.jdt.core.compiler.IProblem"/>
<message_argument value="CannotMixPatternAndDefault"/>
</message_arguments>
</filter>
<filter id="405864542">
<message_arguments>
<message_argument value="org.eclipse.jdt.core.compiler.IProblem"/>
<message_argument value="OnlyOnePatternCaseLabelAllowed"/>
</message_arguments>
</filter>
</resource>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -2544,7 +2544,7 @@ public interface IProblem {
*/
int RawTypeInRecordPattern = PreviewRelated + 1915;
/**
* @since 3.35
* @since 3.36
* @noreference preview feature
*/
int FalseConstantInGuard = PreviewRelated + 1916;
Expand Down
17 changes: 17 additions & 0 deletions org.eclipse.jdt.core/.settings/.api_filters
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.core" version="2">
<resource path="dom/org/eclipse/jdt/core/dom/AST.java" type="org.eclipse.jdt.core.dom.AST">
<filter id="388194388">
<message_arguments>
<message_argument value="org.eclipse.jdt.core.dom.AST"/>
<message_argument value="JLS_Latest"/>
<message_argument value="20"/>
</message_arguments>
</filter>
</resource>
<resource path="dom/org/eclipse/jdt/core/dom/AbstractTagElement.java" type="org.eclipse.jdt.core.dom.AbstractTagElement">
<filter id="576725006">
<message_arguments>
Expand Down Expand Up @@ -176,6 +185,14 @@
</message_arguments>
</filter>
</resource>
<resource path="dom/org/eclipse/jdt/core/dom/RecordPattern.java" type="org.eclipse.jdt.core.dom.RecordPattern">
<filter id="338755678">
<message_arguments>
<message_argument value="org.eclipse.jdt.core.dom.RecordPattern"/>
<message_argument value="PATTERN_NAME_PROPERTY"/>
</message_arguments>
</filter>
</resource>
<resource path="dom/org/eclipse/jdt/core/dom/SimpleName.java" type="org.eclipse.jdt.core.dom.SimpleName">
<filter id="576778288">
<message_arguments>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
Bundle-Version: 3.35.100.qualifier
Bundle-Version: 3.36.0.qualifier
Bundle-Activator: org.eclipse.jdt.core.JavaCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down Expand Up @@ -47,7 +47,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
org.eclipse.text;bundle-version="[3.6.0,4.0.0)",
org.eclipse.team.core;bundle-version="[3.1.0,4.0.0)";resolution:=optional,
org.eclipse.jdt.core.compiler.batch;bundle-version="3.35.0";visibility:=reexport
org.eclipse.jdt.core.compiler.batch;bundle-version="3.36.0";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-ExtensibleAPI: true
Bundle-ActivationPolicy: lazy
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ public final class AST {
* up to and including Java SE 21(aka JDK 21).
* </p>
*
* @since 3.35
* @since 3.36
*/
public static final int JLS21 = 21;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2540,7 +2540,7 @@ final void supportedOnlyIn20() {
* </p>
*
* @exception UnsupportedOperationException if this operation is not used in JLS21
* @since 3.35
* @since 3.36
*/
final void supportedOnlyIn21() {
if (this.ast.apiLevel < AST.JLS21_INTERNAL) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3188,7 +3188,7 @@ public final class JavaCore extends Plugin {
public static final String VERSION_20 = "20"; //$NON-NLS-1$
/**
* Configurable option value: {@value}.
* @since 3.35
* @since 3.36
* @category OptionValue
*/
public static final String VERSION_21 = "21"; //$NON-NLS-1$
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2021 Eclipse Foundation and others.
Copyright (c) 2012, 2023 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
Expand All @@ -17,7 +17,7 @@
<version>4.30.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.35.100-SNAPSHOT</version>
<version>3.36.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand Down

0 comments on commit 0b4cf38

Please sign in to comment.