Bug 582706 - Upgrade base target to Eclipse 2022-12 and Xtext 2.29
diff --git a/org.eclipse.handly.examples.basic.ui/META-INF/MANIFEST.MF b/org.eclipse.handly.examples.basic.ui/META-INF/MANIFEST.MF
index d581f96..0e22bab 100644
--- a/org.eclipse.handly.examples.basic.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly.examples.basic.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.xtext.ui.shared,
org.eclipse.ui,
org.eclipse.ui.editors;bundle-version="3.14.0",
- org.eclipse.ui.ide;bundle-version="3.18.0",
+ org.eclipse.ui.ide;bundle-version="3.20.0",
org.eclipse.ui.navigator;bundle-version="3.10.0"
-Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)"
+Import-Package: org.apache.log4j;version="[1.2.19,2.0.0)"
Export-Package: org.eclipse.handly.examples.basic.ui.model
diff --git a/org.eclipse.handly.examples.basic/META-INF/MANIFEST.MF b/org.eclipse.handly.examples.basic/META-INF/MANIFEST.MF
index 94b0df9..b233a44 100644
--- a/org.eclipse.handly.examples.basic/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly.examples.basic/META-INF/MANIFEST.MF
@@ -20,9 +20,9 @@
org.eclipse.emf.common,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.equinox.common;resolution:=optional,
- org.eclipse.xtext.xbase.lib;bundle-version="2.25.0",
- org.objectweb.asm;bundle-version="9.1.0";resolution:=optional
-Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)";resolution:=optional
+ org.eclipse.xtext.xbase.lib;bundle-version="2.29.0",
+ org.objectweb.asm;bundle-version="9.4.0";resolution:=optional
+Import-Package: org.apache.log4j;version="[1.2.19,2.0.0)";resolution:=optional
Export-Package: org.eclipse.handly.examples.basic,
org.eclipse.handly.examples.basic.foo,
org.eclipse.handly.examples.basic.foo.impl,
diff --git a/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/foo/impl/FooPackageImpl.java b/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/foo/impl/FooPackageImpl.java
index 3243872..c86f28a 100644
--- a/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/foo/impl/FooPackageImpl.java
+++ b/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/foo/impl/FooPackageImpl.java
@@ -64,7 +64,6 @@
{
super(eNS_URI, FooFactory.eINSTANCE);
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/serializer/FooSemanticSequencer.java b/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/serializer/FooSemanticSequencer.java
index 0017bd8..03823b8 100644
--- a/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/serializer/FooSemanticSequencer.java
+++ b/org.eclipse.handly.examples.basic/src-gen/org/eclipse/handly/examples/basic/serializer/FooSemanticSequencer.java
@@ -49,11 +49,13 @@
}
/**
+ * <pre>
* Contexts:
* Def returns Def
*
* Constraint:
* (name=ID params+=ID? params+=ID*)
+ * </pre>
*/
protected void sequence_Def(ISerializationContext context, Def semanticObject) {
genericSequencer.createSequence(context, semanticObject);
@@ -61,11 +63,13 @@
/**
+ * <pre>
* Contexts:
* Unit returns Unit
*
* Constraint:
* ((vars+=Var+ defs+=Def+) | defs+=Def+)?
+ * </pre>
*/
protected void sequence_Unit(ISerializationContext context, Unit semanticObject) {
genericSequencer.createSequence(context, semanticObject);
@@ -73,11 +77,13 @@
/**
+ * <pre>
* Contexts:
* Var returns Var
*
* Constraint:
* name=ID
+ * </pre>
*/
protected void sequence_Var(ISerializationContext context, Var semanticObject) {
if (errorAcceptor != null) {
diff --git a/org.eclipse.handly.examples.jmodel.tests/src/org/eclipse/handly/internal/examples/jmodel/WorkingCopyTest.java b/org.eclipse.handly.examples.jmodel.tests/src/org/eclipse/handly/internal/examples/jmodel/WorkingCopyTest.java
index d5071cc..12183fb 100644
--- a/org.eclipse.handly.examples.jmodel.tests/src/org/eclipse/handly/internal/examples/jmodel/WorkingCopyTest.java
+++ b/org.eclipse.handly.examples.jmodel.tests/src/org/eclipse/handly/internal/examples/jmodel/WorkingCopyTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2022 1C-Soft LLC.
+ * Copyright (c) 2015, 2023 1C-Soft LLC.
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which is available at
@@ -51,7 +51,7 @@
public class WorkingCopyTest
extends NoJobsWorkspaceTestCase
{
- private static final int AST_LEVEL = AST.JLS_Latest;
+ private static final int AST_LEVEL = AST.getJLSLatest();
private CompilationUnit workingCopy;
private List<IProblem> problems;
diff --git a/org.eclipse.handly.examples.jmodel/src/org/eclipse/handly/internal/examples/jmodel/CompilationUnit.java b/org.eclipse.handly.examples.jmodel/src/org/eclipse/handly/internal/examples/jmodel/CompilationUnit.java
index d885eb7..3fa7775 100644
--- a/org.eclipse.handly.examples.jmodel/src/org/eclipse/handly/internal/examples/jmodel/CompilationUnit.java
+++ b/org.eclipse.handly.examples.jmodel/src/org/eclipse/handly/internal/examples/jmodel/CompilationUnit.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2022 1C-Soft LLC.
+ * Copyright (c) 2015, 2023 1C-Soft LLC.
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which is available at
@@ -242,7 +242,7 @@
static final Property<Integer> AST_LEVEL = Property.get(
CompilationUnit.class.getName() + ".astLevel", //$NON-NLS-1$
- Integer.class).withDefault(AST.JLS_Latest);
+ Integer.class).withDefault(AST.getJLSLatest());
static final Property<Boolean> STRUCTURAL_AST = Property.get(
CompilationUnit.class.getName() + ".structuralAst", //$NON-NLS-1$
Boolean.class).withDefault(true);
diff --git a/org.eclipse.handly.examples/META-INF/MANIFEST.MF b/org.eclipse.handly.examples/META-INF/MANIFEST.MF
index c2efb43..2b3269f 100644
--- a/org.eclipse.handly.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly.examples/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)",
+Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.20.0,3.0.0)",
org.eclipse.core.resources,
org.eclipse.ui.ide
diff --git a/org.eclipse.handly.ui/META-INF/MANIFEST.MF b/org.eclipse.handly.ui/META-INF/MANIFEST.MF
index 0375037..f3f9d87 100644
--- a/org.eclipse.handly.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly.ui/META-INF/MANIFEST.MF
@@ -9,17 +9,17 @@
Bundle-Activator: org.eclipse.handly.internal.ui.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.15.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.18.0,4.0.0)",
org.eclipse.handly;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.search;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.14.0,4.0.0)",
org.eclipse.text;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.18.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.22.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.201.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.14.0,4.0.0)",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.0,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.20.0,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.10.0,4.0.0)";resolution:=optional
Export-Package: org.eclipse.handly.ui,
org.eclipse.handly.ui.action,
diff --git a/org.eclipse.handly.xtext-feature/feature.xml b/org.eclipse.handly.xtext-feature/feature.xml
index 83e3df2..3ea67c9 100644
--- a/org.eclipse.handly.xtext-feature/feature.xml
+++ b/org.eclipse.handly.xtext-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2022 1C-Soft LLC and others.
+ Copyright (c) 2014, 2023 1C-Soft LLC 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
@@ -34,7 +34,7 @@
<requires>
<import feature="org.eclipse.handly" version="1.8.0" match="equivalent"/>
- <import feature="org.eclipse.xtext.ui" version="2.25.0" match="compatible"/>
+ <import feature="org.eclipse.xtext.ui" version="2.29.0" match="compatible"/>
</requires>
<plugin
diff --git a/org.eclipse.handly.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.handly.xtext.ui/META-INF/MANIFEST.MF
index d0d845a..56309b2 100644
--- a/org.eclipse.handly.xtext.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly.xtext.ui/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@
Bundle-Activator: org.eclipse.handly.internal.xtext.ui.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)",
org.eclipse.handly;bundle-version="[1.8.0,2.0.0)",
org.eclipse.handly.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.xtext.ui;bundle-version="[2.25.0,2.34.0)",
- org.eclipse.xtext.common.types;bundle-version="[2.25.0,2.34.0)";resolution:=optional,
- org.eclipse.ui.ide;bundle-version="[3.18.0,4.0.0)"
+ org.eclipse.xtext.ui;bundle-version="[2.29.0,2.34.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.29.0,2.34.0)";resolution:=optional,
+ org.eclipse.ui.ide;bundle-version="[3.20.0,4.0.0)"
Export-Package: org.eclipse.handly.xtext.ui.callhierarchy,
org.eclipse.handly.xtext.ui.editor,
org.eclipse.handly.xtext.ui.outline,
diff --git a/org.eclipse.handly/META-INF/MANIFEST.MF b/org.eclipse.handly/META-INF/MANIFEST.MF
index eaabe5e..44138c9 100644
--- a/org.eclipse.handly/META-INF/MANIFEST.MF
+++ b/org.eclipse.handly/META-INF/MANIFEST.MF
@@ -9,13 +9,13 @@
Bundle-Activator: org.eclipse.handly.internal.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.9.0,2.0.0)",
org.eclipse.text;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.15.0,4.0.0)";resolution:=optional,
- org.eclipse.ltk.core.refactoring;bundle-version="[3.11.0,4.0.0)";resolution:=optional,
- org.eclipse.ui;bundle-version="[3.119.0,4.0.0)";resolution:=optional
+ org.eclipse.core.resources;bundle-version="[3.18.0,4.0.0)";resolution:=optional,
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.13.0,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.201.0,4.0.0)";resolution:=optional
Export-Package: org.eclipse.handly,
org.eclipse.handly.buffer,
org.eclipse.handly.context,
diff --git a/targets/base/base.target b/targets/base/base.target
index 8518346..caec8ea 100644
--- a/targets/base/base.target
+++ b/targets/base/base.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
- Copyright (c) 2014, 2022 1C-Soft LLC and others.
+ Copyright (c) 2014, 2023 1C-Soft LLC 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
@@ -15,33 +15,21 @@
<target name="Base Platform">
<!--
Currently, the Base Platform includes:
- * Eclipse Project SDK 4.20 (2021-06)
- * Xtext SDK 2.25 and dependencies
+ * Eclipse Project SDK 4.26 (2022-12)
+ * Xtext SDK 2.29 and dependencies
-->
<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/>
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/2021-06/202106161001"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/releases/2022-12/202212071000"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.draw2d" version="0.0.0"/>
-<unit id="org.eclipse.ecf" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer" version="0.0.0"/>
-<unit id="org.eclipse.ecf.identity" version="0.0.0"/>
-<unit id="org.eclipse.ecf.provider.filetransfer" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xpand" version="0.0.0"/>
-<unit id="org.eclipse.xtend" version="0.0.0"/>
-<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
-<unit id="org.objectweb.asm" version="0.0.0"/>
-<unit id="com.google.guava" version="0.0.0"/>
-<unit id="com.google.inject" version="0.0.0"/>
-<unit id="io.github.classgraph" version="0.0.0"/>
</location>
</locations>
</target>
diff --git a/tools/base.p2f b/tools/base.p2f
index ea9456c..8a510c6 100644
--- a/tools/base.p2f
+++ b/tools/base.p2f
@@ -2,39 +2,39 @@
<?p2f version='1.0.0'?>
<p2f version='1.0.0'>
<ius size='7'>
- <iu id='org.eclipse.sdk.ide' version='4.20.0.I20210611-1600'>
+ <iu id='org.eclipse.sdk.ide' version='4.26.0.I20221123-1800'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06/'/>
+ <repository location='http://download.eclipse.org/releases/2022-12/'/>
</repositories>
</iu>
- <iu id='org.eclipse.egit.feature.group' version='5.12.0.202106070339-r'>
+ <iu id='org.eclipse.egit.feature.group' version='6.4.0.202211300538-r'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06/'/>
+ <repository location='http://download.eclipse.org/releases/2022-12/'/>
</repositories>
</iu>
- <iu id='org.eclipse.m2e.feature.feature.group' version='1.18.0.20210603-1206'>
+ <iu id='org.eclipse.m2e.feature.feature.group' version='2.1.2.20221130-2239'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06/'/>
+ <repository location='http://download.eclipse.org/releases/2022-12/'/>
</repositories>
</iu>
- <iu id='org.eclipse.xtext.sdk.feature.group' version='2.25.0.v20210301-1429'>
+ <iu id='org.eclipse.xtext.sdk.feature.group' version='2.29.0.v20221121-1054'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06'/>
+ <repository location='http://download.eclipse.org/releases/2022-12'/>
</repositories>
</iu>
- <iu id='org.eclipse.emf.mwe.sdk.feature.group' version='1.6.1.v20210218-2134'>
+ <iu id='org.eclipse.emf.mwe.sdk.feature.group' version='1.8.0.v20221117-1134'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06'/>
+ <repository location='http://download.eclipse.org/releases/2022-12'/>
</repositories>
</iu>
- <iu id='org.eclipse.emf.mwe2.language.sdk.feature.group' version='2.12.1.v20210218-2134'>
+ <iu id='org.eclipse.emf.mwe2.language.sdk.feature.group' version='2.14.0.v20221117-1134'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06'/>
+ <repository location='http://download.eclipse.org/releases/2022-12'/>
</repositories>
</iu>
- <iu id='org.eclipse.emf.sdk.feature.group' version='2.26.0.v20210506-1425'>
+ <iu id='org.eclipse.emf.sdk.feature.group' version='2.32.0.v20221121-1400'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/2021-06/'/>
+ <repository location='http://download.eclipse.org/releases/2022-12/'/>
</repositories>
</iu>
</ius>
