Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
[eclipse/xtext#2127] Update to EMF 2022-03 (2.29.0)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
  • Loading branch information
cdietrich committed Dec 5, 2022
1 parent 1674494 commit 50f1bc1
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 27 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtend.core,
org.hamcrest.core;bundle-version="1.1.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.equinox.common;bundle-version="3.9.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.20.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",
org.eclipse.core.resources;bundle-version="3.12.0",
Expand Down
57 changes: 40 additions & 17 deletions org.eclipse.xtend.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,61 @@ Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtend.core;x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.compiler;x-friends:="org.eclipse.xtend.m2e,org.eclipse.xtend.ide.tests",
Export-Package: org.eclipse.xtend.core;x-friends:="org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.compiler;x-friends:="org.eclipse.xtend.m2e,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.compiler.batch,
org.eclipse.xtend.core.conversion;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.conversion;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.documentation;x-internal:=true,
org.eclipse.xtend.core.findReferences;x-internal:=true,
org.eclipse.xtend.core.formatting2;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.formatting2;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.imports;x-internal:=true,
org.eclipse.xtend.core.jvmmodel;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.tests,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.linking;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.macro;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.tests,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.macro.declaration;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.jvmmodel;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.tests,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.linking;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.macro;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.tests,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.macro.declaration;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.naming;x-internal:=true,
org.eclipse.xtend.core.parser;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.parser;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.parser.antlr;x-friends:="org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.parser.antlr.internal;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.resource;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.richstring;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.parser.antlr.internal;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.resource;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.richstring;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.richstring.impl;x-internal:=true,
org.eclipse.xtend.core.richstring.util;x-internal:=true,
org.eclipse.xtend.core.scoping;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.scoping;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.serializer;x-internal:=true,
org.eclipse.xtend.core.services;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.services;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common",
org.eclipse.xtend.core.tasks;x-internal:=true,
org.eclipse.xtend.core.typesystem;x-internal:=true,
org.eclipse.xtend.core.typing;x-friends:="org.eclipse.xtend.ide",
org.eclipse.xtend.core.validation;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.xtend;x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.validation;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.xtend;x-friends:="org.eclipse.xtend.ide,
org.eclipse.xtend.ide.common,
org.eclipse.xtend.ide.tests",
org.eclipse.xtend.core.xtend.impl;x-internal:=true,
org.eclipse.xtend.core.xtend.util;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.emf.ecore;bundle-version="2.20.0";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
org.eclipse.xtext.common.types;visibility:=reexport,
org.eclipse.xtext.xbase;visibility:=reexport,
org.eclipse.xtext,
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtend.core/model/RichStrings.genmodel
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
modelDirectory="/org.eclipse.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core"
modelName="RichStrings" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
<foreignModel>RichStrings.ecore</foreignModel>
<genPackages prefix="ProcessedRichString" basePackage="org.eclipse.xtend.core" disposableProviderFactory="true"
fileExtensions="__richstrings" ecorePackage="RichStrings.ecore#/">
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtend.core/model/Xtend.genmodel
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
modelDirectory="/org.eclipse.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core"
modelName="Xtend" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false"
runtimeVersion="2.29" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
<foreignModel>Xtend.ecore</foreignModel>
<genPackages prefix="Xtend" basePackage="org.eclipse.xtend.core" disposableProviderFactory="true"
ecorePackage="Xtend.ecore#/">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.examples/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtend.examples;singleton:=true
Bundle-Version: 2.30.0.qualifier
Require-Bundle: org.eclipse.ui;bundle-version="3.109.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.emf.common.ui;bundle-version="2.18.0"
org.eclipse.emf.common.ui;bundle-version="2.20.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtend.lib,
org.eclipse.xtext,
org.eclipse.xtext.xbase.testing,
org.eclipse.jdt.core,
org.eclipse.emf.codegen;bundle-version="2.19.0",
org.eclipse.emf.codegen;bundle-version="2.22.0",
org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional,
org.eclipse.equinox.common
Export-Package: extract,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtend.core,
org.eclipse.core.resources;bundle-version="3.12.0",
org.eclipse.jdt.core;bundle-version="3.13.102",
org.eclipse.pde.core;bundle-version="3.11.101",
org.eclipse.emf.codegen.ecore;bundle-version="2.20.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",
org.apache.ant;bundle-version="1.10.1",
org.eclipse.xtend.ide,
org.eclipse.ui.ide;bundle-version="3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: Eclipse Xtext
Bundle-ClassPath: .
Require-Bundle: com.google.inject;bundle-version="5.0.1",
org.eclipse.emf.ecore;bundle-version="2.20.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.9.1",
org.eclipse.emf.mwe2.runtime;bundle-version="2.9.1",
org.eclipse.xtend.lib,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.standalone/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Bundle-Version: 2.30.0.qualifier
Require-Bundle: org.eclipse.xtend.core;visibility:=reexport,
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
org.eclipse.jdt.core;bundle-version="3.13.102";visibility:=reexport,
org.eclipse.emf.codegen;bundle-version="2.19.0";visibility:=reexport
org.eclipse.emf.codegen;bundle-version="2.22.0";visibility:=reexport
Import-Package: org.apache.log4j;version="1.2.19"

0 comments on commit 50f1bc1

Please sign in to comment.