diff options
author | Jay Arthanareeswaran | 2020-09-16 06:36:23 +0000 |
---|---|---|
committer | Jay Arthanareeswaran | 2020-09-16 06:45:51 +0000 |
commit | 4c371e3a2501310da0c68dff0c1258b08c8debed (patch) | |
tree | f2f16de056d0b85af321a552e4c57a6b37d4e0e2 | |
parent | 27b53ca171a19db4794ec310f4e339e876ea495f (diff) | |
download | eclipse.jdt.core-4c371e3a2501310da0c68dff0c1258b08c8debed.tar.gz eclipse.jdt.core-4c371e3a2501310da0c68dff0c1258b08c8debed.tar.xz eclipse.jdt.core-4c371e3a2501310da0c68dff0c1258b08c8debed.zip |
Post Java 15 merge, update bundle versions and fix API errorsI20200916-0410
Change-Id: Ic6fd0af52a150c89791dac88a9ecb3cf225a8102
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>
35 files changed, 77 insertions, 93 deletions
diff --git a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF index b06ef4fb34..028493cf52 100644 --- a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true -Bundle-Version: 3.6.700.qualifier +Bundle-Version: 3.6.800.qualifier Bundle-Localization: plugin Export-Package: com.sun.mirror.apt, com.sun.mirror.declaration, diff --git a/org.eclipse.jdt.apt.core/pom.xml b/org.eclipse.jdt.apt.core/pom.xml index 079d66bb7f..0a439bdb08 100644 --- a/org.eclipse.jdt.apt.core/pom.xml +++ b/org.eclipse.jdt.apt.core/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.apt.core</artifactId> - <version>3.6.700-SNAPSHOT</version> + <version>3.6.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF index 865576a6fb..68e5461434 100644 --- a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.apt.tests; singleton:=true -Bundle-Version: 3.4.700.qualifier +Bundle-Version: 3.4.800.qualifier Bundle-ClassPath: apt.jar, aptext.jar, . diff --git a/org.eclipse.jdt.apt.tests/pom.xml b/org.eclipse.jdt.apt.tests/pom.xml index 855c2777b2..13c21d585a 100644 --- a/org.eclipse.jdt.apt.tests/pom.xml +++ b/org.eclipse.jdt.apt.tests/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.apt.tests</artifactId> - <version>3.4.700-SNAPSHOT</version> + <version>3.4.800-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> <testSuite>${project.artifactId}</testSuite> diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF index 8f839a0465..db6bf91103 100644 --- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.compiler.apt.tests;singleton:=true -Bundle-Version: 1.1.1300.qualifier +Bundle-Version: 1.1.1400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jdt.compiler.apt.tests/pom.xml b/org.eclipse.jdt.compiler.apt.tests/pom.xml index 1b0aa756ee..38596ed2a0 100644 --- a/org.eclipse.jdt.compiler.apt.tests/pom.xml +++ b/org.eclipse.jdt.compiler.apt.tests/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.compiler.apt.tests</artifactId> - <version>1.1.1300-SNAPSHOT</version> + <version>1.1.1400-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/org.eclipse.jdt.compiler.apt/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt/META-INF/MANIFEST.MF index b2496861eb..86c21fe3ae 100644 --- a/org.eclipse.jdt.compiler.apt/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.apt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName Bundle-SymbolicName: org.eclipse.jdt.compiler.apt;singleton:=true -Bundle-Version: 1.3.1100.qualifier +Bundle-Version: 1.3.1200.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Fragment-Host: org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)" diff --git a/org.eclipse.jdt.compiler.apt/pom.xml b/org.eclipse.jdt.compiler.apt/pom.xml index 17e076d944..0a4f37e0de 100644 --- a/org.eclipse.jdt.compiler.apt/pom.xml +++ b/org.eclipse.jdt.compiler.apt/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.compiler.apt</artifactId> - <version>1.3.1100-SNAPSHOT</version> + <version>1.3.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF index e64e12b710..a89b3884a7 100644 --- a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.compiler.tool.tests -Bundle-Version: 1.2.800.qualifier +Bundle-Version: 1.2.900.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jdt.compiler.tool.tests/pom.xml b/org.eclipse.jdt.compiler.tool.tests/pom.xml index 0750e71b17..3b68c0dc27 100644 --- a/org.eclipse.jdt.compiler.tool.tests/pom.xml +++ b/org.eclipse.jdt.compiler.tool.tests/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.compiler.tool.tests</artifactId> - <version>1.2.800-SNAPSHOT</version> + <version>1.2.900-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> <testSuite>${project.artifactId}</testSuite> diff --git a/org.eclipse.jdt.compiler.tool/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool/META-INF/MANIFEST.MF index 344b6d0247..6792902e4c 100644 --- a/org.eclipse.jdt.compiler.tool/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.tool/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName Bundle-SymbolicName: org.eclipse.jdt.compiler.tool;singleton:=true -Bundle-Version: 1.2.1000.qualifier +Bundle-Version: 1.2.1100.qualifier Bundle-Vendor: %providerName Bundle-Localization: compiler_tool_fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jdt.compiler.tool/pom.xml b/org.eclipse.jdt.compiler.tool/pom.xml index 5f754ed5e5..adbc161120 100644 --- a/org.eclipse.jdt.compiler.tool/pom.xml +++ b/org.eclipse.jdt.compiler.tool/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.compiler.tool</artifactId> - <version>1.2.1000-SNAPSHOT</version> + <version>1.2.1100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF index fa6a80b791..48ccc37f34 100644 --- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.compiler;singleton:=true -Bundle-Version: 3.12.1350.qualifier +Bundle-Version: 3.12.1400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests.compiler, diff --git a/org.eclipse.jdt.core.tests.compiler/pom.xml b/org.eclipse.jdt.core.tests.compiler/pom.xml index 9e969116bd..ae1f53446d 100644 --- a/org.eclipse.jdt.core.tests.compiler/pom.xml +++ b/org.eclipse.jdt.core.tests.compiler/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core.tests.compiler</artifactId> - <version>3.12.1350-SNAPSHOT</version> + <version>3.12.1400-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF index 3c82a7b86f..bfe5fed044 100644 --- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.model;singleton:=true -Bundle-Version: 3.10.1350.qualifier +Bundle-Version: 3.10.1400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests, diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml index 476e9114ea..6078f18f28 100644 --- a/org.eclipse.jdt.core.tests.model/pom.xml +++ b/org.eclipse.jdt.core.tests.model/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core.tests.model</artifactId> - <version>3.10.1350-SNAPSHOT</version> + <version>3.10.1400-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF index ff6d741313..a86dab3372 100644 --- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core.tests.performance -Bundle-Version: 3.10.700.qualifier +Bundle-Version: 3.10.800.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.jdt.core.tests.performance, diff --git a/org.eclipse.jdt.core.tests.performance/pom.xml b/org.eclipse.jdt.core.tests.performance/pom.xml index c5fddef1b8..abe2a2706f 100644 --- a/org.eclipse.jdt.core.tests.performance/pom.xml +++ b/org.eclipse.jdt.core.tests.performance/pom.xml @@ -20,7 +20,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core.tests.performance</artifactId> - <version>3.10.700-SNAPSHOT</version> + <version>3.10.800-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> <testSuite>${project.artifactId}</testSuite> diff --git a/org.eclipse.jdt.core/.settings/.api_filters b/org.eclipse.jdt.core/.settings/.api_filters index 0d8904b8a8..bbc682ea0a 100644 --- a/org.eclipse.jdt.core/.settings/.api_filters +++ b/org.eclipse.jdt.core/.settings/.api_filters @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jdt.core" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="3.23.100"/> - <message_argument value="3.23.0"/> - </message_arguments> - </filter> - </resource> <resource path="compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java" type="org.eclipse.jdt.core.compiler.CategorizedProblem"> <filter comment="Java 14" id="576725006"> <message_arguments> @@ -31,13 +23,13 @@ <message_argument value="2098909"/> </message_arguments> </filter> - <filter comment="Record preview 2 changes" id="405864542"> + <filter comment="Java 15 Merge" id="405864542"> <message_arguments> <message_argument value="org.eclipse.jdt.core.compiler.IProblem"/> <message_argument value="RecordCanonicalConstructorShouldBePublic"/> </message_arguments> </filter> - <filter id="405864542"> + <filter comment="Java 15 Merge" id="405864542"> <message_arguments> <message_argument value="org.eclipse.jdt.core.compiler.IProblem"/> <message_argument value="RecordIsAReservedTypeName"/> @@ -161,13 +153,13 @@ </filter> </resource> <resource path="dom/org/eclipse/jdt/core/dom/Modifier.java" type="org.eclipse.jdt.core.dom.Modifier$ModifierKeyword"> - <filter comment="For Java 15" id="336658481"> + <filter comment="Java 15 Merge" id="336658481"> <message_arguments> <message_argument value="org.eclipse.jdt.core.dom.Modifier.ModifierKeyword"/> <message_argument value="NON_SEALED_KEYWORD"/> </message_arguments> </filter> - <filter comment="For Java 15" id="336658481"> + <filter comment="Java 15 Merge" id="336658481"> <message_arguments> <message_argument value="org.eclipse.jdt.core.dom.Modifier.ModifierKeyword"/> <message_argument value="SEALED_KEYWORD"/> @@ -175,7 +167,7 @@ </filter> </resource> <resource path="dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java" type="org.eclipse.jdt.core.dom.ModuleQualifiedName"> - <filter id="576778288"> + <filter comment="Java 15 Merge" id="576778288"> <message_arguments> <message_argument value="Name"/> <message_argument value="ModuleQualifiedName"/> @@ -206,14 +198,6 @@ </message_arguments> </filter> </resource> - <resource path="dom/org/eclipse/jdt/core/dom/RecordDeclaration.java" type="org.eclipse.jdt.core.dom.RecordDeclaration"> - <filter comment="method not needed" id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.jdt.core.dom.RecordDeclaration"/> - <message_argument value="getTypes()"/> - </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> @@ -255,7 +239,7 @@ </filter> </resource> <resource path="dom/org/eclipse/jdt/core/dom/TypeDeclaration.java" type="org.eclipse.jdt.core.dom.TypeDeclaration"> - <filter comment="Added For Java 15" id="336658481"> + <filter comment="Java 15 Merge" id="336658481"> <message_arguments> <message_argument value="org.eclipse.jdt.core.dom.TypeDeclaration"/> <message_argument value="PERMITS_TYPES_PROPERTY"/> @@ -303,7 +287,7 @@ </filter> </resource> <resource path="model/org/eclipse/jdt/core/util/IClassFileReader.java" type="org.eclipse.jdt.core.util.IClassFileReader"> - <filter comment="Permitted Subclasses for JEP 360 Sealed Types" id="404000815"> + <filter comment="Java 15 Merge" id="404000815"> <message_arguments> <message_argument value="org.eclipse.jdt.core.util.IClassFileReader"/> <message_argument value="getPermittedSubclassesAttribute()"/> diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF index a9d73c5e62..9ee7dc3fc8 100644 --- a/org.eclipse.jdt.core/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true -Bundle-Version: 3.23.100.qualifier +Bundle-Version: 3.24.0.qualifier Bundle-Activator: org.eclipse.jdt.core.JavaCore Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java index c9ff4d220a..3973f5d967 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java @@ -1221,7 +1221,7 @@ void setSourceStart(int sourceStart); int JavadocInvalidProvidesClassName = Javadoc + Internal + 1808; /** @since 3.20 */ int JavadocInvalidProvidesClass = Javadoc + Internal + 1809; - /** @since 3.23 */ + /** @since 3.24*/ int JavadocInvalidModuleQualification = Javadoc + Internal + 1810; /** @@ -2119,7 +2119,7 @@ void setSourceStart(int sourceStart); int PreviewFeatureNotSupported = Compliance + 1105; /** @since 3.20*/ int PreviewFeaturesNotAllowed = PreviewRelated + 1106; - /** @since 3.23 */ + /** @since 3.24*/ int FeatureNotSupported = Compliance + 1107; /** @since 3.13 */ @@ -2275,7 +2275,7 @@ void setSourceStart(int sourceStart); /** @since 3.22 * @noreference preview feature error */ int RecordCanonicalConstructorHasThrowsClause = PreviewRelated + 1735; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RecordCanonicalConstructorVisibilityReduced = PreviewRelated + 1736; /** @since 3.22 @@ -2293,7 +2293,7 @@ void setSourceStart(int sourceStart); /** @since 3.22 * @noreference preview feature error */ int RecordInstanceInitializerBlockInRecord = PreviewRelated + 1741; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RestrictedTypeName = PreviewRelated + 1742; /** @since 3.22 @@ -2338,23 +2338,23 @@ void setSourceStart(int sourceStart); /** @since 3.22 * @noreference preview feature error */ int RecordCannotDefineRecordInLocalType= PreviewRelated + 1756; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RecordComponentsCannotHaveModifiers= PreviewRelated + 1757; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RecordIllegalParameterNameInCanonicalConstructor = PreviewRelated + 1758; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RecordIllegalExplicitFinalFieldAssignInCompactConstructor = PreviewRelated + 1759; /** @since 3.23 * @noreference preview feature error */ int RecordMissingExplicitConstructorCallInNonCanonicalConstructor= PreviewRelated + 1760; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int RecordIllegalStaticModifierForLocalClassOrInterface = PreviewRelated + 1761; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int LocalStaticsIllegalVisibilityModifierForInterfaceLocalType = PreviewRelated + 1765; /* records - end */ @@ -2366,52 +2366,52 @@ void setSourceStart(int sourceStart); int PatternVariableNotInScope = PreviewRelated + 1780; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedMissingClassModifier = PreviewRelated + 1850; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedDisAllowedNonSealedModifierInClass = PreviewRelated + 1851; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedSuperClassDoesNotPermit = PreviewRelated + 1852; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedSuperInterfaceDoesNotPermit = PreviewRelated + 1853; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedMissingSealedModifier = PreviewRelated + 1854; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedMissingInterfaceModifier = PreviewRelated + 1855; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedDuplicateTypeInPermits = PreviewRelated + 1856; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedNotDirectSuperClass = PreviewRelated + 1857; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedPermittedTypeOutsideOfModule = PreviewRelated + 1858; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedPermittedTypeOutsideOfPackage = PreviewRelated + 1859; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedSealedTypeMissingPermits = PreviewRelated + 1860; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedInterfaceIsSealedAndNonSealed = PreviewRelated + 1861; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedDisAllowedNonSealedModifierInInterface = PreviewRelated + 1862; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedNotDirectSuperInterface = PreviewRelated + 1863; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedLocalDirectSuperTypeSealed = PreviewRelated + 1864; - /** @since 3.23 + /** @since 3.24 * @noreference preview feature error */ int SealedAnonymousClassCannotExtendSealedType = PreviewRelated + 1865; /* Java15 errors - end */ diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java index 2311abf2a3..85627cf624 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java @@ -357,7 +357,7 @@ public final class AST { * up to and including Java SE 15(aka JDK 15). * </p> * - * @since 3.23 + * @since 3.24 */ public static final int JLS15 = 15; diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java index 8e78b603e4..358658bf6a 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java @@ -991,7 +991,7 @@ public abstract class ASTNode { * Node type constant indicating a node of type * <code>ModuleQualifiedName</code>. * @see ModuleQualifiedName - * @since 3.23 + * @since 3.24 */ public static final int MODULE_QUALIFIED_NAME = 103; diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/Modifier.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/Modifier.java index 56cf3a63b6..90e0cd5c1a 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/Modifier.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/Modifier.java @@ -108,12 +108,12 @@ public final class Modifier extends ASTNode implements IExtendedModifier { public static final ModifierKeyword DEFAULT_KEYWORD = new ModifierKeyword("default", DEFAULT);//$NON-NLS-1$ /** - * @since 3.23 + * @since 3.24 */ public static final ModifierKeyword SEALED_KEYWORD = new ModifierKeyword("sealed", SEALED);//$NON-NLS-1$ /** - * @since 3.23 + * @since 3.24 */ public static final ModifierKeyword NON_SEALED_KEYWORD = new ModifierKeyword("non-sealed", NON_SEALED);//$NON-NLS-1$ @@ -328,14 +328,14 @@ public final class Modifier extends ASTNode implements IExtendedModifier { /** * "sealed" modifier constant (bit mask). * Applicable only to types. - * @since 3.23 + * @since 3.24 */ public static final int SEALED = 0x0200; /** * "non-sealed" modifier constant (bit mask). * Applicable only to types. - * @since 3.23 + * @since 3.24 */ public static final int NON_SEALED = 0x1000; @@ -520,7 +520,7 @@ public final class Modifier extends ASTNode implements IExtendedModifier { * @param flags the modifier flags * @return <code>true</code> if the <code>SEALED</code> bit is set * and <code>false</code> otherwise - * @since 3.23 + * @since 3.24 */ public static boolean isSealed(int flags) { return (flags & SEALED) != 0; @@ -533,7 +533,7 @@ public final class Modifier extends ASTNode implements IExtendedModifier { * @param flags the modifier flags * @return <code>true</code> if the <code>NON_SEALED</code> bit is set * and <code>false</code> otherwise - * @since 3.23 + * @since 3.24 */ public static boolean isNonSealed(int flags) { return (flags & NON_SEALED) != 0; @@ -762,7 +762,7 @@ public final class Modifier extends ASTNode implements IExtendedModifier { * Answer true if the receiver is the sealed modifier, false otherwise. * * @return true if the receiver is the sealed modifier, false otherwise - * @since 3.23 + * @since 3.24 */ public boolean isSealed() { return this.modifierKeyword == ModifierKeyword.SEALED_KEYWORD; @@ -772,7 +772,7 @@ public final class Modifier extends ASTNode implements IExtendedModifier { * Answer true if the receiver is the non-sealed modifier, false otherwise. * * @return true if the receiver is the non-sealed modifier, false otherwise - * @since 3.23 + * @since 3.24 */ public boolean isNonSealed() { return this.modifierKeyword == ModifierKeyword.NON_SEALED_KEYWORD; diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java index a964b57c84..fbea5c0134 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java @@ -30,7 +30,7 @@ import java.util.List; *
*
* @noinstantiate This class is not intended to be instantiated by clients.
- * @since 3.23
+ * @since 3.24
*
*/
@SuppressWarnings("rawtypes")
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java index 5602a229b5..4cc1d2c390 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java @@ -63,7 +63,7 @@ public class TextBlock extends Expression { * @return a list of property descriptors (element type: * {@link StructuralPropertyDescriptor}) - * @since 3.23 + * @since 3.24 */ public static List propertyDescriptors(int apiLevel) { return PROPERTY_DESCRIPTORS; @@ -142,7 +142,7 @@ public class TextBlock extends Expression { * * @return the string literal token, including enclosing double * quotes and embedded escapes - * @since 3.23 + * @since 3.24 */ public String getEscapedValue() { return this.escapedValue; @@ -162,7 +162,7 @@ public class TextBlock extends Expression { * @param token the string literal token, including enclosing double * quotes and embedded escapes * @exception IllegalArgumentException if the argument is incorrect - * @since 3.23 + * @since 3.24 */ public void setEscapedValue(String token) { // update internalSetEscapedValue(String) if this is changed @@ -214,7 +214,7 @@ public class TextBlock extends Expression { * * @return the string value without enclosing triple quotes * @exception IllegalArgumentException if the literal value cannot be converted - * @since 3.23 + * @since 3.24 */ public String getLiteralValue() { char[] escaped = getEscapedValue().toCharArray(); diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeDeclaration.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeDeclaration.java index 57c1325f53..bb605f0d4b 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeDeclaration.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeDeclaration.java @@ -140,7 +140,7 @@ public class TypeDeclaration extends AbstractTypeDeclaration { /** * The "permitsTypes" structural property of this node type (element type: {@link Type}) (added in JLS15 API). - * @since 3.23 + * @since 3.24 */ public static final ChildListPropertyDescriptor PERMITS_TYPES_PROPERTY = new ChildListPropertyDescriptor(TypeDeclaration.class, "permitsTypes", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$ @@ -752,7 +752,7 @@ public class TypeDeclaration extends AbstractTypeDeclaration { * @return the live list of types * (element type: {@link Type}) * @exception UnsupportedOperationException if this operation is not used with Java 15 and preview enabled - * @since 3.23 + * @since 3.24 */ public List permittedTypes() { // more efficient than just calling unsupportedIn2() to check diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java index 8fe20ea15b..ed5170d475 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java @@ -199,7 +199,7 @@ public final class Flags { * Note that this flag's value is internal and is not defined in the * Virtual Machine specification. * </p> - * @since 3.23 + * @since 3.24 * @noreference This field is not intended to be referenced by clients as it is a part of Java preview feature. */ public static final int AccSealed = ExtraCompilerModifiers.AccSealed; @@ -209,7 +209,7 @@ public final class Flags { * Note that this flag's value is internal and is not defined in the * Virtual Machine specification. * </p> - * @since 3.23 + * @since 3.24 * @noreference This field is not intended to be referenced by clients as it is a part of Java preview feature. */ public static final int AccNonSealed = ExtraCompilerModifiers.AccNonSealed; diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java index 733c9b90a5..97b5198dbf 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java @@ -3120,7 +3120,7 @@ public final class JavaCore extends Plugin { public static final String VERSION_14 = "14"; //$NON-NLS-1$ /** * Configurable option value: {@value}. - * @since 3.23 + * @since 3.24 * @category OptionValue */ public static final String VERSION_15 = "15"; //$NON-NLS-1$ diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java index 297f1f5364..6e9967a17d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java @@ -209,7 +209,7 @@ public interface IAttributeNamesConstants { char[] RECORD = "Record".toCharArray(); //$NON-NLS-1$ /** * "PermittedSubclasses" attribute (JVMS 15). - * @since 3.23 + * @since 3.24 */ char[] PERMITTED_SUBCLASSES = "PermittedSubclasses".toCharArray(); //$NON-NLS-1$ diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IClassFileReader.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IClassFileReader.java index 22b21f38b6..524330be46 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IClassFileReader.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IClassFileReader.java @@ -140,7 +140,7 @@ public interface IClassFileReader { * Answer back the permitted subclasses attribute of this .class file, null if none. * * @return the permitted subclasses attribute of this .class file, null if none - * @since 3.23 + * @since 3.24 */ default IPermittedSubclassesAttribute getPermittedSubclassesAttribute() { return null; diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttribute.java index 467bb00f69..ac46b3ccf3 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttribute.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttribute.java @@ -17,7 +17,7 @@ package org.eclipse.jdt.core.util; * Description of permitted subclasses attribute as described in the JVM * specifications. * - * @since 3.23 + * @since 3.24 */ public interface IPermittedSubclassesAttribute extends IClassFileAttribute { diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttributeEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttributeEntry.java index 3c3dc95677..23b1541ba6 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttributeEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IPermittedSubclassesAttributeEntry.java @@ -17,7 +17,7 @@ package org.eclipse.jdt.core.util; * Description of permitted subclasses attribute as described in the JVM * specifications. * - * @since 3.23 + * @since 3.24 */ public interface IPermittedSubclassesAttributeEntry { diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml index 52b5ceaaae..b2593719c1 100644 --- a/org.eclipse.jdt.core/pom.xml +++ b/org.eclipse.jdt.core/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>3.23.100-SNAPSHOT</version> + <version>3.24.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchConstants.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchConstants.java index 81412140de..dffc9be342 100644 --- a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchConstants.java +++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchConstants.java @@ -498,7 +498,7 @@ public interface IJavaSearchConstants { * When this flag is set, only {@link TypeReferenceMatch} matches will be * returned. *</p> - * @since 3.23 + * @since 3.24 * @noreference permit type reference * @category limitTo */ |