Bump to Eclipse 2021-06

mapping/language/org.eclipse.gemoc.moccml.mapping.xtext/META-INF/MANIFEST.MF

@@ -22,14 +22,14 @@ Require-Bundle: org.eclipse.gemoc.moccml.mapping,
  fr.inria.aoste.timesquare.ccslkernel.library.xtext;bundle-version="1.0.0",
  org.eclipse.ocl.xtext.markup.ui,
  org.eclipse.uml2.codegen.ecore;bundle-version="1.8.0",
- org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.10.0,1.14.0)",
+ org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.10.0,1.16.0)",
  fr.inria.aoste.timesquare.ccslkernel.parser.xtext,
  org.eclipse.jdt.annotation,
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.ocl.xtext.base;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
- org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
- org.eclipse.ocl.pivot;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
- org.eclipse.ocl.xtext.completeocl;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.base;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
+ org.eclipse.ocl.pivot;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.completeocl;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
  org.eclipse.ocl.examples.codegen
 Import-Package: org.apache.log4j,
  org.apache.commons.logging

mapping/language/org.eclipse.gemoc.moccml.mapping.xtext/src-gen/org/eclipse/gemoc/moccml/mapping/xtext/AbstractEclRuntimeModule.java

@@ -5,7 +5,6 @@
 
 import java.util.Properties;
 
-import org.eclipse.gemoc.moccml.mapping.xtext.validation.EclPivotResourceValidator;
 import org.eclipse.xtext.Constants;
 
 import com.google.inject.Binder;
@@ -34,71 +33,6 @@ public void configureFileExtensions(Binder binder) {
 			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("ecl,moccmlmapping");
 	}
 
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.serializer.tokens.ICrossReferenceSerializer> bindICrossReferenceSerializer() {
-			return org.eclipse.ocl.xtext.base.serializer.BaseCrossReferenceSerializer.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.validation.IDiagnosticConverter> bindIDiagnosticConverter() {
-			return org.eclipse.ocl.xtext.base.utilities.PivotDiagnosticConverter.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.resource.IFragmentProvider> bindIFragmentProvider() {
-			return org.eclipse.ocl.xtext.base.cs2as.BaseFragmentProvider.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.serializer.sequencer.IHiddenTokenSequencer> bindIHiddenTokenSequencer() {
-			return org.eclipse.ocl.xtext.base.serializer.BaseHiddenTokenSequencer.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.linking.ILinker> bindILinker() {
-			return org.eclipse.ocl.xtext.base.utilities.CS2ASLinker.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.linking.ILinkingDiagnosticMessageProvider> bindILinkingDiagnosticMessageProvider() {
-			return org.eclipse.ocl.xtext.base.services.BaseLinkingDiagnosticMessageProvider.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.linking.ILinkingService> bindILinkingService() {
-			return org.eclipse.ocl.xtext.base.services.BaseLinkingService.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.naming.IQualifiedNameConverter> bindIQualifiedNameConverter() {
-			return org.eclipse.ocl.xtext.base.services.BaseQualifiedNameConverter.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
-			return org.eclipse.ocl.xtext.base.services.BaseQualifiedNameProvider.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.resource.IResourceServiceProvider> bindIResourceServiceProvider() {
-			return org.eclipse.ocl.xtext.base.services.PivotResourceServiceProvider.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.validation.IResourceValidator> bindIResourceValidator() {
-			return EclPivotResourceValidator.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.conversion.IValueConverterService> bindIValueConverterService() {
-			return org.eclipse.ocl.xtext.base.services.BaseValueConverterService.class;
-		}
-
-		// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
-		public Class<? extends org.eclipse.xtext.resource.XtextResource> bindXtextResource() {
-			return org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLCSResource.class;
-		}
-
 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
 	public java.lang.ClassLoader bindClassLoaderToInstance() {
 		return getClass().getClassLoader();
@@ -209,6 +143,69 @@ public void configureIResourceDescriptionsPersisted(com.google.inject.Binder bin
 		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
 	}
 
-
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.serializer.tokens.ICrossReferenceSerializer> bindICrossReferenceSerializer() {
+		return org.eclipse.ocl.xtext.base.serializer.BaseCrossReferenceSerializer.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.validation.IDiagnosticConverter> bindIDiagnosticConverter() {
+		return org.eclipse.ocl.xtext.base.utilities.PivotDiagnosticConverter.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.resource.IFragmentProvider> bindIFragmentProvider() {
+		return org.eclipse.ocl.xtext.base.cs2as.BaseFragmentProvider.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.serializer.sequencer.IHiddenTokenSequencer> bindIHiddenTokenSequencer() {
+		return org.eclipse.ocl.xtext.base.serializer.BaseHiddenTokenSequencer.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.linking.ILinker> bindILinker() {
+		return org.eclipse.ocl.xtext.base.utilities.CS2ASLinker.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.linking.ILinkingDiagnosticMessageProvider> bindILinkingDiagnosticMessageProvider() {
+		return org.eclipse.ocl.xtext.base.services.BaseLinkingDiagnosticMessageProvider.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.linking.ILinkingService> bindILinkingService() {
+		return org.eclipse.ocl.xtext.base.services.BaseLinkingService.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameConverter> bindIQualifiedNameConverter() {
+		return org.eclipse.ocl.xtext.base.services.BaseQualifiedNameConverter.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
+		return org.eclipse.ocl.xtext.base.services.BaseQualifiedNameProvider.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.resource.IResourceServiceProvider> bindIResourceServiceProvider() {
+		return org.eclipse.ocl.xtext.base.services.PivotResourceServiceProvider.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.validation.IResourceValidator> bindIResourceValidator() {
+		return org.eclipse.gemoc.moccml.mapping.xtext.validation.EclPivotResourceValidator.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.conversion.IValueConverterService> bindIValueConverterService() {
+		return org.eclipse.ocl.xtext.base.services.BaseValueConverterService.class;
+	}
+
+	// contributed by org.eclipse.ocl.examples.build.fragments.EssentialOCLFragment
+	public Class<? extends org.eclipse.xtext.resource.XtextResource> bindXtextResource() {
+		return org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLCSResource.class;
+	}
 
 }

mapping/language/org.eclipse.gemoc.moccml.mapping.xtext/src-gen/org/eclipse/gemoc/moccml/mapping/xtext/services/EclGrammarAccess.java

@@ -119,8 +119,8 @@ public class TypeExpCSElements extends AbstractParserRuleElementFinder {
 		//	ownedMultiplicity=MultiplicityCS?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//(TypeNameExpCS | TypeLiteralCS | CollectionPatternCS | EventType | BlockType | Timebase) ownedMultiplicity=MultiplicityCS
-		//?
+		//(TypeNameExpCS | TypeLiteralCS | CollectionPatternCS | EventType | BlockType | Timebase)
+		//ownedMultiplicity=MultiplicityCS?
 		public Group getGroup() { return cGroup; }
 
 		//(TypeNameExpCS | TypeLiteralCS | CollectionPatternCS | EventType | BlockType | Timebase)
@@ -1467,7 +1467,8 @@ public ParserRule getClassifierContextDeclCSRule() {
 	// * expression to be evaluated to provide an error message.
 	// */
 	//ConstraintCS base::ConstraintCS:
-	//	(name=UnrestrictedName ('(' ownedMessageSpecification=SpecificationCS ')')?)? ':' ownedSpecification=SpecificationCS;
+	//	(name=UnrestrictedName ('(' ownedMessageSpecification=SpecificationCS ')')?)? ':' ownedSpecification=SpecificationCS
+	//;
 	public CompleteOCLGrammarAccess.ConstraintCSElements getConstraintCSAccess() {
 		return gaCompleteOCL.getConstraintCSAccess();
 	}
@@ -1936,8 +1937,8 @@ public ParserRule getCollectionTypeIdentifierRule() {
 	}
 
 	//CollectionTypeCS:
-	//	name=CollectionTypeIdentifier ('(' ownedType=TypeExpWithoutMultiplicityCS ownedCollectionMultiplicity=MultiplicityCS?
-	//	')')?;
+	//	name=CollectionTypeIdentifier ('(' ownedType=TypeExpWithoutMultiplicityCS ownedCollectionMultiplicity=MultiplicityCS
+	//	? ')')?;
 	public EssentialOCLGrammarAccess.CollectionTypeCSElements getCollectionTypeCSAccess() {
 		return gaEssentialOCL.getCollectionTypeCSAccess();
 	}
@@ -2194,8 +2195,8 @@ public ParserRule getTypeLiteralExpCSRule() {
 	}
 
 	//TypeNameExpCS:
-	//	ownedPathName=PathNameCS (ownedCurlyBracketedClause=CurlyBracketedClauseCS ('{' ownedPatternGuard=super::ExpCS '}')?)?
-	//;
+	//	ownedPathName=PathNameCS (ownedCurlyBracketedClause=CurlyBracketedClauseCS ('{' ownedPatternGuard=super::ExpCS '}')?
+	//	)?;
 	public EssentialOCLGrammarAccess.TypeNameExpCSElements getTypeNameExpCSAccess() {
 		return gaEssentialOCL.getTypeNameExpCSAccess();
 	}

mapping/language/org.eclipse.gemoc.moccml.mapping.xtext/src/org/eclipse/ocl/examples/build/fragments/GenerateGrammar.java

@@ -38,6 +38,7 @@
 import org.eclipse.emf.mwe.utils.StandaloneSetup;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.examples.codegen.generator.AbstractGenModelHelper;
+import org.eclipse.ocl.examples.codegen.generator.EcoreGenModelHelper;
 import org.eclipse.ocl.pivot.internal.manager.PivotMetamodelManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.OCL;
@@ -88,7 +89,7 @@ public void checkConfiguration(Issues issues) {
 		if (genPackage == null) {
 			return "<<" + ePackage.getNsURI() + ">>";
 		}
-		return genPackage.getQualifiedPackageInterfaceName() + ".Literals" + "." + genModelHelper.getLiteralName(eClassifier);
+		return genPackage.getQualifiedPackageInterfaceName() + ".Literals" + "." + genModelHelper.getEcoreLiteralName(eClassifier);
 	}	
 
 	protected @NonNull String emitEPackageLiteral(@NonNull EPackage ePackage) {
@@ -106,7 +107,7 @@ public void checkConfiguration(Issues issues) {
 		if (genPackage == null) {
 			return "<<" + ePackage.getNsURI() + ">>";
 		}
-		return genPackage.getQualifiedPackageInterfaceName() + ".Literals" + "." + genModelHelper.getLiteralName(eClassifier)+".getEEnumLiteral(\""+ enumLiteral.getName() + "\")";
+		return genPackage.getQualifiedPackageInterfaceName() + ".Literals" + "." + genModelHelper.getEcoreLiteralName(eClassifier)+".getEEnumLiteral(\""+ enumLiteral.getName() + "\")";
 	}
 
 	protected @NonNull String emitParserRuleLiteral(@NonNull Grammar grammar, @NonNull ParserRule parserRule) {
@@ -253,7 +254,7 @@ public int compare(ReferencedMetamodel o1, ReferencedMetamodel o2) {
 	protected void invokeInternal(WorkflowContext ctx, ProgressMonitor monitor, Issues issues) {
 		OCL ocl = OCL.newInstance();
 		PivotMetamodelManager metamodelManager = (PivotMetamodelManager) ocl.getMetamodelManager();
-		genModelHelper = new AbstractGenModelHelper(metamodelManager);
+		genModelHelper = new EcoreGenModelHelper(metamodelManager);
 		String rootPath = StandaloneSetup.getPlatformRootPath();
 		File folder = new File(rootPath + javaFolder + "/" + javaPackageName.replace(".", "/"));
 		try {

mapping/language/org.eclipse.gemoc.moccml.mapping/META-INF/MANIFEST.MF

@@ -14,11 +14,11 @@ Export-Package: org.eclipse.gemoc.moccml.mapping.moccml_mapping,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.jdt.annotation;visibility:=reexport,
- org.eclipse.ocl.xtext.base;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
- org.eclipse.ocl.xtext.completeocl;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
- org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.10.0,1.14.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.base;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.completeocl;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.10.0,1.16.0)";visibility:=reexport,
  fr.inria.aoste.timesquare.ccslkernel.model;visibility:=reexport,
- org.eclipse.ocl.pivot;bundle-version="[1.10.0,1.14.0)";visibility:=reexport
+ org.eclipse.ocl.pivot;bundle-version="[1.10.0,1.16.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

pom.xml

@@ -6,26 +6,16 @@
 	<artifactId>org.eclipse.gemoc.concurrent.root</artifactId>
 	<version>3.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-
+    <parent>
+		<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
+		<artifactId>gemoc_studio-eclipse-bom</artifactId>
+		<version>3.3.0-SNAPSHOT</version>
+		<relativePath>../gemoc-studio/gemoc_studio/plugins/gemoc_studio-eclipse-bom</relativePath>
+	</parent>
     <properties>
-		<tycho-version>2.2.0</tycho-version>
-    	<xtend.version>2.24.0</xtend.version>
-		<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-moccml.git</tycho.scmUrl>
 
 		<maven.deploy.skip>true</maven.deploy.skip>
-
-    	<eclipse.release.p2.url>http://download.eclipse.org/releases/2020-12</eclipse.release.p2.url>
-		<k3.p2.url>http://www.kermeta.org/k3/update/</k3.p2.url>
-		<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2020-11-16</melange.p2.url>
-		<elk.p2.url>http://download.eclipse.org/elk/updates/releases/0.7.1</elk.p2.url>
-		<aspectJ.p2.url>http://download.eclipse.org/tools/ajdt/410/dev/update</aspectJ.p2.url>
-		<timesquare.p2.url>http://timesquare.inria.fr/update_site/2020</timesquare.p2.url>
-		<diverse-commons.p2.url>http://www.kermeta.org/diverse-commons/updates/latest</diverse-commons.p2.url>
-		<efxclipse.p2.url>https://download.eclipse.org/efxclipse/updates-released/3.7.0/site</efxclipse.p2.url>
-		<!-- for advanced sirius features such as Sirius ELK support , version needs to be aligned with the one  in ${eclipse.release.p2.url}-->
-		<sirius.p2.url>https://download.eclipse.org/sirius/updates/releases/6.4.1/2020-09/</sirius.p2.url>
-
 	</properties>
 	<modules>
 		<module>mapping/deployment/org.eclipse.gemoc.moccml.mapping.build</module>