diff --git a/NOTICE.md b/NOTICE.md index 8348d8d26a4..b2750d9cdc7 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -70,19 +70,19 @@ Google Gson (2.9.x) * License: Apache License, 2.0 -Google Guava (30.1) +Google Guava (32.0.1) * License: Apache License 2.0 -Google Guice / Inject Core API (5.0.1) +Google Guice / Inject Core API (7.0.0) * License: Apache License, 2.0 -Gradle Wrapper (7.4) +Gradle Wrapper (8) * License: Apache License, 2.0 -guava gwt (30.1) +guava gwt (32.0.1) * License: Apache License, 2.0 diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index a81502a9601..96299f9d64e 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.xtend.core, org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.equinox.common;bundle-version="3.16.0", org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", - com.google.guava;bundle-version="[30.1.0,31.0.0)", - com.google.inject;bundle-version="5.0.1", + com.google.guava;bundle-version="[32.0.1,33.0.0)", + com.google.inject;bundle-version="7.0.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.emf.ecore, org.eclipse.xtext.builder, @@ -27,6 +27,7 @@ Require-Bundle: org.eclipse.xtend.core, org.eclipse.xtext.builder.standalone, org.eclipse.xtext.java Import-Package: javax.inject;version="1.0.0", + jakarta.inject;version="2.0.1", org.apache.log4j;version="1.2.24", org.apache.log4j.spi;version="1.2.24", org.junit;version="4.13.2", diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF index d2763b8cb53..3998e080a36 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples-client Bundle-Version: 2.32.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[30.1.0,31.0.0)", + com.google.guava;bundle-version="[32.0.1,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.32.0", xtend-annotation-examples;bundle-version="2.4.3" Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF index f8b00adc2cd..93744e437ae 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples Bundle-Version: 2.32.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[30.1.0,31.0.0)", + com.google.guava;bundle-version="[32.0.1,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.32.0", org.junit;bundle-version="4.13.2", org.eclipse.xtend.core, diff --git a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF index 2a285172ea5..16bb1ceef6d 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.6.0", org.eclipse.xtend.ide, org.eclipse.ui;bundle-version="3.201.0", org.eclipse.jdt.ui;bundle-version="3.26.0", - com.google.inject;bundle-version="5.0.1", + com.google.inject;bundle-version="7.0.0", org.eclipse.xtext.ui, org.hamcrest.library;bundle-version="1.3.0", org.eclipse.xtend.core, diff --git a/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant b/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant index 70719bf3040..6ef1926404f 100644 --- a/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant +++ b/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant @@ -35,8 +35,12 @@ + + + + @@ -59,6 +63,11 @@ + diff --git a/org.eclipse.xtend.lib.gwt.test/pom.xml b/org.eclipse.xtend.lib.gwt.test/pom.xml index c59d87ec4c2..b7a39e96c8f 100644 --- a/org.eclipse.xtend.lib.gwt.test/pom.xml +++ b/org.eclipse.xtend.lib.gwt.test/pom.xml @@ -15,7 +15,7 @@ A test that ensures our GWT compatibility. - 2.8.2 + 2.10.0 diff --git a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml index ad1b3f70da9..13bcd342b03 100644 --- a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml +++ b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml @@ -16,7 +16,7 @@ com.google.guava guava - 30.1-jre + 32.0.1-jre org.eclipse.xtext diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index 415dde976a4..f17587a6cc4 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.32.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . -Require-Bundle: com.google.inject;bundle-version="5.0.1", +Require-Bundle: com.google.inject;bundle-version="7.0.0", org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.mwe2.lib;bundle-version="2.14.0", org.eclipse.emf.mwe2.runtime;bundle-version="2.14.0", diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml index 5e996cdd35e..6f28146575c 100644 --- a/org.eclipse.xtend.sdk.feature/feature.xml +++ b/org.eclipse.xtend.sdk.feature/feature.xml @@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0 - + diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index d29e9d2f37f..4b3fe6e1f41 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.32.0.qualifier Require-Bundle: org.eclipse.xtend.core;visibility:=reexport, - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport, org.eclipse.emf.codegen;bundle-version="2.22.0";visibility:=reexport Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index 0e88a000b6f..de24c0935fa 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -48,8 +48,8 @@ Export-Package: org.eclipse.xtext.builder, Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, - com.google.guava;bundle-version="[30.1.0,31.0.0)", - com.google.inject;bundle-version="5.0.1", + com.google.guava;bundle-version="[32.0.1,33.0.0)", + com.google.inject;bundle-version="7.0.0", org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy, diff --git a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java index e8fccfe0394..3bffd5202b9 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java +++ b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 2023 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. diff --git a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/xtext/ui/JdtBasedConstructorScopeTest.java b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/xtext/ui/JdtBasedConstructorScopeTest.java index c0db3e1c701..beaa5124d8f 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/xtext/ui/JdtBasedConstructorScopeTest.java +++ b/org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/xtext/ui/JdtBasedConstructorScopeTest.java @@ -8,12 +8,15 @@ *******************************************************************************/ package org.eclipse.xtext.common.types.access.xtext.ui; +import static org.junit.Assume.*; + import java.util.AbstractList; import java.util.ArrayList; import java.util.List; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory; import org.eclipse.xtext.common.types.access.jdt.MockJavaProjectProvider; import org.eclipse.xtext.common.types.access.xtext.AbstractConstructorScopeTest; @@ -24,6 +27,7 @@ import org.eclipse.xtext.scoping.IScope; import org.junit.Before; import org.junit.Test; +import org.osgi.framework.Version; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -50,6 +54,7 @@ public void setUp() throws Exception { } @Test public void testGetContents_01() { + assumeTrue(JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3,31,0)) >= 0); Iterable contents = constructorScope.getAllElements(); assertFalse(Iterables.any(contents, new Predicate() { @Override @@ -60,6 +65,7 @@ public boolean apply(IEObjectDescription input) { } @Test public void testGetContents_02() { + assumeTrue(JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3,31,0)) >= 0); Iterable contents = constructorScope.getAllElements(); assertFalse(Iterables.any(contents, new Predicate() { @Override @@ -70,6 +76,7 @@ public boolean apply(IEObjectDescription input) { } @Test public void testGetContents_03() { + assumeTrue(JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3,31,0)) >= 0); Iterable contents = constructorScope.getAllElements(); assertTrue(Iterables.any(contents, new Predicate() { @Override @@ -80,6 +87,7 @@ public boolean apply(IEObjectDescription input) { } @Test public void testGetContents_04() { + assumeTrue(JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3,31,0)) >= 0); Iterable contents = constructorScope.getAllElements(); assertTrue(Iterables.any(contents, new Predicate() { @Override diff --git a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java index 7c3e94ccead..45b2f6d43e3 100644 --- a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java +++ b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 2023 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -3573,7 +3573,10 @@ public void testFindTypeByName_AbstractMultimap_02() { .getOnlyElement(type.findAllFeaturesByName("containsValue")); assertNotNull(containsValue); JvmFormalParameter firstParam = containsValue.getParameters().get(0); - assertEquals(0, firstParam.getAnnotations().size()); + assertEquals(1, firstParam.getAnnotations().size()); + JvmAnnotationReference annotationReference = firstParam.getAnnotations().get(0); + JvmAnnotationType annotationType = annotationReference.getAnnotation(); + assertEquals("java:/Objects/javax.annotation.CheckForNull", EcoreUtil.getURI(annotationType).trimFragment().toString()); } @Test diff --git a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/ClasspathTypeProviderTest.java b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/ClasspathTypeProviderTest.java index 7321b63bdc0..b2ba797c7aa 100644 --- a/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/ClasspathTypeProviderTest.java +++ b/org.eclipse.xtext.common.types.tests/tests/org/eclipse/xtext/common/types/access/impl/ClasspathTypeProviderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 2023 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -17,9 +17,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.common.types.JvmArrayType; import org.eclipse.xtext.common.types.JvmDeclaredType; -import org.eclipse.xtext.common.types.JvmFormalParameter; import org.eclipse.xtext.common.types.JvmGenericType; -import org.eclipse.xtext.common.types.JvmOperation; import org.eclipse.xtext.common.types.JvmType; import org.eclipse.xtext.common.types.TypesFactory; import org.eclipse.xtext.common.types.access.IMirror; @@ -35,7 +33,6 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.google.common.collect.Iterables; import com.google.inject.Inject; /** @@ -281,17 +278,6 @@ public ClasspathTypeProvider getTypeProvider() { protected String getCollectionParamName() { return "arg0"; } - - @Override - @Test - public void testFindTypeByName_AbstractMultimap_02() { - String typeName = "com.google.common.collect.AbstractMultimap"; - JvmGenericType type = (JvmGenericType) getTypeProvider().findTypeByName(typeName); - JvmOperation containsValue = (JvmOperation) Iterables.getOnlyElement(type.findAllFeaturesByName("containsValue")); - assertNotNull(containsValue); - JvmFormalParameter firstParam = containsValue.getParameters().get(0); - assertEquals(0, firstParam.getAnnotations().size()); - } @Override @Test diff --git a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF index 9b9fc58e11f..39a9565f4ca 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport, org.eclipse.ui;bundle-version="3.201.0", org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.jdt.core;bundle-version="3.29.0", - com.google.inject;bundle-version="5.0.1", + com.google.inject;bundle-version="7.0.0", org.eclipse.xtext, org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.core.resources;bundle-version="3.16.100", @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport, org.eclipse.jdt.core.manipulation;bundle-version="1.16.0", org.eclipse.xtext.smap;resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.edit;resolution:=optional;visibility:=reexport;x-installation:=greedy, - com.google.guava;bundle-version="[30.1.0,31.0.0)", + com.google.guava;bundle-version="[32.0.1,33.0.0)", org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24" Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index 73f951b6979..3bec8d80fff 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -8,11 +8,11 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", - com.google.inject;bundle-version="5.0.1", + com.google.inject;bundle-version="7.0.0", org.eclipse.xtext, org.objectweb.asm;bundle-version="[9.5.0,9.6.0)", org.eclipse.xtend.lib, - com.google.guava;bundle-version="[30.1.0,31.0.0)", + com.google.guava;bundle-version="[32.0.1,33.0.0)", io.github.classgraph;bundle-version="4.8.149" Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional, org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 497b69f72bf..1a3a0e21d7c 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -147,27 +147,32 @@ com.google.errorprone error_prone_annotations - 2.3.4 + 2.18.0 com.google.guava guava-gwt - 30.1-jre + 32.0.1-jre com.google.guava guava-testlib - 30.1-jre + 32.0.1-jre com.google.guava guava - 30.1-jre + 32.0.1-jre com.google.inject guice - 5.0.1 + 7.0.0 + + + jakarta.inject + jakarta.inject-api + 2.0.1 io.github.classgraph diff --git a/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java b/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java index e0af3c9daca..8ad7a51985c 100644 --- a/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java +++ b/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2009, 2023 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. diff --git a/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/java/tests/ReusedTypeProviderTest.java b/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/java/tests/ReusedTypeProviderTest.java index fb5f8aed67c..34c24cf83f7 100644 --- a/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/java/tests/ReusedTypeProviderTest.java +++ b/org.eclipse.xtext.java.tests/src/org/eclipse/xtext/java/tests/ReusedTypeProviderTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -16,10 +16,13 @@ import java.util.List; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.xtext.build.BuildRequest; import org.eclipse.xtext.build.IncrementalBuilder; import org.eclipse.xtext.build.IndexState; import org.eclipse.xtext.build.Source2GeneratedMapping; +import org.eclipse.xtext.common.types.JvmAnnotationReference; +import org.eclipse.xtext.common.types.JvmAnnotationType; import org.eclipse.xtext.common.types.JvmFormalParameter; import org.eclipse.xtext.common.types.JvmGenericType; import org.eclipse.xtext.common.types.JvmOperation; @@ -125,7 +128,10 @@ public void testFindTypeByName_AbstractMultimap_02() { .getOnlyElement(type.findAllFeaturesByName("containsValue")); Assert.assertNotNull(containsValue); JvmFormalParameter firstParam = containsValue.getParameters().get(0); - Assert.assertEquals(0, firstParam.getAnnotations().size()); + assertEquals(1, firstParam.getAnnotations().size()); + JvmAnnotationReference annotationReference = firstParam.getAnnotations().get(0); + JvmAnnotationType annotationType = annotationReference.getAnnotation(); + assertEquals("java:/Objects/javax.annotation.CheckForNull", EcoreUtil.getURI(annotationType).trimFragment().toString()); } @Test diff --git a/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF index ad65fa3e954..651d3b4f42c 100644 --- a/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.32.0.qualifier Require-Bundle: org.junit, org.eclipse.xtext.junit4, - com.google.inject;bundle-version="5.0.1", + com.google.inject;bundle-version="7.0.0", org.eclipse.xtext Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.xtext.junit4.tests diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 194708edb6e..c754fd53839 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.mwe.core;bundle-version="1.8.0", org.eclipse.emf.mwe2.lib;bundle-version="2.14.0", org.junit;bundle-version="4.13.2", - org.aopalliance;bundle-version="1.0.0" + org.aopalliance;bundle-version="1.0.0", + com.google.inject;bundle-version="7.0.0";visibility:=reexport, + com.google.guava;bundle-version="[32.0.1,33.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Import-Package: org.apache.commons.logging;version="1.2.0", diff --git a/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/trace/AbstractInstallDebugInfoMojo.java b/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/trace/AbstractInstallDebugInfoMojo.java index fa9124c4659..ea744082df7 100644 --- a/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/trace/AbstractInstallDebugInfoMojo.java +++ b/org.eclipse.xtext.maven.plugin/src/main/java/org/eclipse/xtext/maven/trace/AbstractInstallDebugInfoMojo.java @@ -19,7 +19,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.eclipse.xtext.ISetup; diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 92ae4afc76d..9aa8c540722 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml index ed22d6862f9..cd7c1fcf695 100644 --- a/org.eclipse.xtext.redist.feature/feature.xml +++ b/org.eclipse.xtext.redist.feature/feature.xml @@ -28,8 +28,8 @@ SPDX-License-Identifier: EPL-2.0 version="0.0.0"/> - - + + diff --git a/org.eclipse.xtext.runtime.feature/feature.xml b/org.eclipse.xtext.runtime.feature/feature.xml index 270b4ee18c5..02e070fcaa4 100644 --- a/org.eclipse.xtext.runtime.feature/feature.xml +++ b/org.eclipse.xtext.runtime.feature/feature.xml @@ -24,9 +24,9 @@ SPDX-License-Identifier: EPL-2.0 %license - + - + diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF index e37b1496334..ac263ea8aaa 100644 --- a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF @@ -11,8 +11,12 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.lsp4j;resolution:=optional, org.eclipse.lsp4j.jsonrpc;resolution:=optional, org.eclipse.xtend.lib, - org.eclipse.xtext.testing -Import-Package: org.apache.log4j;version="1.2.24", + org.eclipse.xtext.testing, + com.google.inject;bundle-version="7.0.0";visibility:=reexport, + com.google.guava;bundle-version="[32.0.1,33.0.0)" +Import-Package: javax.inject;version="1.0.0", + jakarta.inject;version="2.0.1", + org.apache.log4j;version="1.2.24", org.apache.log4j.spi;version="1.2.24", org.junit.jupiter.api;version="[5.1.0,6.0.0)", org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)", diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF index 65146cb1cd8..3bbb04ac23e 100644 --- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;visibility:=reexport, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtend.lib;resolution:=optional, - com.google.guava;bundle-version="[30.1.0,31.0.0)", + com.google.guava;bundle-version="[32.0.1,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index bc6e8ad3cdb..3e86a4faf95 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index e1b4acf212d..73d8f28b3bb 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 84c14a5e0b9..1aac3c13462 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index 9539ee60538..c64597057d7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index 98545a28b1c..d68ef13a37b 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index a902a554c71..87f09083ca8 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index a925890d9f7..2dd25c8abbf 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -20,7 +20,8 @@ - + + diff --git a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF index 8687b74629b..e5184cd5082 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates.tests Bundle-Version: 2.32.0.qualifier Bundle-Localization: plugin -Require-Bundle: com.google.inject;bundle-version="5.0.1", +Require-Bundle: com.google.inject;bundle-version="7.0.0", org.eclipse.xtext.ui.codetemplates, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.ui;bundle-version="3.201.0", diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 47f8f205aef..66696a12f1a 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -48,9 +48,11 @@ Export-Package: org.eclipse.xtext.util; org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.tests" Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", - com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport, - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.guava;bundle-version="[32.0.1,33.0.0)";visibility:=reexport, + com.google.inject;bundle-version="7.0.0";visibility:=reexport, + com.google.guava.failureaccess;bundle-version="1.0.1", javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, + jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtend.lib Import-Package: org.apache.log4j;version="1.2.24" Automatic-Module-Name: org.eclipse.xtext.util diff --git a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF index ced6d3cc100..552e01cf9de 100644 --- a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Version: 2.32.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport, - com.google.guava;bundle-version="[30.1.0,31.0.0)", - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.guava;bundle-version="[32.0.1,33.0.0)", + com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="2.26.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext;resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF index 78cf7cbb9ad..30f69db3678 100644 --- a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.32.0.qualifier Export-Package: org.eclipse.xtend2.lib, org.eclipse.xtext.xbase.lib Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)" +Require-Bundle: com.google.guava;bundle-version="[32.0.1,33.0.0)" Bundle-Vendor: %Vendor-Name Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF index 59a88a92dfc..302785f66ee 100644 --- a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Export-Package: org.eclipse.xtend2.lib;version="2.32.0", org.eclipse.xtext.xbase.lib;version="2.32.0", org.eclipse.xtext.xbase.lib.internal;x-internal:="true", org.eclipse.xtext.xbase.lib.util;version="2.32.0" -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport +Require-Bundle: com.google.guava;bundle-version="[32.0.1,33.0.0)";visibility:=reexport Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: org.eclipse.xtext.xbase.lib Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index 1b85b3d1d0e..e2c3a787114 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ Bundle-Vendor: Eclipse Xtext Export-Package: org.eclipse.xtext.xbase.tests, org.eclipse.xtext.xbase.tests.interpreter Import-Package: javax.inject;version="1.0.0", + jakarta.inject;version="2.0.0", org.apache.log4j;version="1.2.24", org.junit;version="4.13.2", org.junit.rules;version="4.13.2", diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF index db25da8c4e8..7dbca24fe17 100644 --- a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Version: 2.32.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport, - com.google.guava;bundle-version="[30.1.0,31.0.0)", - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.guava;bundle-version="[32.0.1,33.0.0)", + com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.xbase.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF index 800c43ee34e..e10161a535a 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.xtext.ui.graph, org.eclipse.xtext.testing, - com.google.inject;bundle-version="5.0.1", + com.google.inject;bundle-version="7.0.0", org.eclipse.xtext, org.eclipse.draw2d;bundle-version="3.10.100", org.eclipse.xtext.xtext.ui diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index 3d56ca528e0..bd1580d3fc2 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -87,7 +87,8 @@ class TargetPlatformProject extends ProjectDescriptor { - + + diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 2ae6e906326..99a41bab694 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -188,7 +188,10 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); + _builder.newLine(); + _builder.append("\t\t\t"); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index 5f91c627d04..22f840dc182 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -222,7 +222,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, org.eclipse.emf.common;bundle-version="2.24.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport, - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.emf.mwe.core;bundle-version="1.8.0";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.8.0";resolution:=optional;visibility:=reexport, diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java b/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java index b74f9291551..24cad21acd2 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java +++ b/org.eclipse.xtext/src/org/eclipse/xtext/service/ProviderModule.java @@ -32,16 +32,16 @@ protected void bindToInstance(LinkedBindingBuilder bind, Object instance @SuppressWarnings("unchecked") @Override protected void bindToClass(LinkedBindingBuilder bind, Class value) { - bind.toProvider((Class>) value); + bind.toProvider((Class>) value); } @Override public Type getKeyType() { Type keyType = super.getKeyType(); if (!isInstanceOf(keyType, com.google.inject.Provider.class)) { - if (isInstanceOf(keyType, javax.inject.Provider.class)) { + if (isInstanceOf(keyType, jakarta.inject.Provider.class)) { if (!isClassBinding()) - throw new IllegalStateException("The method "+getMethod().getName()+" returns javax.inject.Provider, but this kind of binding is allowed only for com.google.inject.Provider."); + throw new IllegalStateException("The method "+getMethod().getName()+" returns jakarta.inject.Provider, but this kind of binding is allowed only for com.google.inject.Provider."); } else { throw new IllegalStateException("The method "+getMethod().getName()+" is expected to return a Class> or directly Provider."); } diff --git a/xtext-latest.target b/xtext-latest.target index c931eed1b50..8e32e18094c 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -13,7 +13,7 @@ - + @@ -53,8 +53,10 @@ - - + + + + diff --git a/xtext-r202203.target b/xtext-r202203.target index e35d6c6a568..d4b9875d6b6 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -13,7 +13,7 @@ - + @@ -55,8 +55,10 @@ - - + + + + diff --git a/xtext-r202206.target b/xtext-r202206.target index 6e404aa1aac..cb080c4e205 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -54,8 +54,10 @@ - - + + + + diff --git a/xtext-r202209.target b/xtext-r202209.target index 90a7023c286..82ed9ee0440 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -13,7 +13,7 @@ - + @@ -54,8 +54,10 @@ - - + + + + diff --git a/xtext-r202212.target b/xtext-r202212.target index ae74d82b85b..4e01302a844 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -49,8 +49,10 @@ - - + + + + diff --git a/xtext-r202303.target b/xtext-r202303.target index b1ca3675e91..7f9c3443b1b 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -50,8 +50,10 @@ - - + + + + diff --git a/xtext-r202306.target b/xtext-r202306.target index 72f90435ad1..d1ef8efafc6 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -50,8 +50,10 @@ - - + + + +