From 3f0b3cb99efc8132753dc57bb5d5b6b454b5b067 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Wed, 22 Jan 2025 18:32:00 +0100
Subject: [PATCH] updates CoreDSL frontend to version 2.0.14

---
 com.minres.coredsl.json.repository/.classpath        | 12 ++++++------
 com.minres.coredsl.json.repository/.project          |  6 ------
 com.minres.coredsl.json.repository/pom.xml           |  2 +-
 com.minres.coredsl.json.target/.project              |  6 ------
 .../com.minres.coredsl.json.target.target            |  3 ++-
 com.minres.coredsl.json.tests/.classpath             |  2 +-
 com.minres.coredsl.json.tests/.project               |  6 ------
 com.minres.coredsl.json/.classpath                   |  6 +-----
 com.minres.coredsl.json/.project                     |  6 ------
 .../minres/coredsl/json/CoreDslJsonGenerator.xtend   |  1 +
 10 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/com.minres.coredsl.json.repository/.classpath b/com.minres.coredsl.json.repository/.classpath
index 0f1cd88..8a1e84b 100644
--- a/com.minres.coredsl.json.repository/.classpath
+++ b/com.minres.coredsl.json.repository/.classpath
@@ -12,12 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,5 +19,11 @@
 	</classpathentry>
 	<classpathentry kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.dynalink,jdk.httpserver,jdk.incubator.foreign,jdk.incubator.vector,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jshell,jdk.jsobject,jdk.management.jfr,jdk.net,jdk.nio.mapmode,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,jdk.charsets,jdk.hotspot.agent,jdk.jstatd,jdk.jcmd,jdk.crypto.cryptoki,jdk.random,jdk.naming.rmi,jdk.zipfs,jdk.editpad,java.smartcardio,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,jdk.jpackage,jdk.naming.dns,jdk.localedata"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.minres.coredsl.json.repository/.project b/com.minres.coredsl.json.repository/.project
index 9c143a3..79ee4d7 100644
--- a/com.minres.coredsl.json.repository/.project
+++ b/com.minres.coredsl.json.repository/.project
@@ -10,15 +10,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/com.minres.coredsl.json.repository/pom.xml b/com.minres.coredsl.json.repository/pom.xml
index 512704e..2a5be7c 100644
--- a/com.minres.coredsl.json.repository/pom.xml
+++ b/com.minres.coredsl.json.repository/pom.xml
@@ -64,7 +64,7 @@
 					<dependency>
 						<groupId>org.codehaus.groovy</groupId>
 						<artifactId>groovy-bsf</artifactId>
-						<version>2.4.3</version>
+						<version>3.0.20</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/com.minres.coredsl.json.target/.project b/com.minres.coredsl.json.target/.project
index a70230c..4eb5a96 100644
--- a/com.minres.coredsl.json.target/.project
+++ b/com.minres.coredsl.json.target/.project
@@ -5,13 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
index 4109b55..79fb4c3 100644
--- a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
+++ b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
@@ -39,9 +39,10 @@
             <unit id="org.json" version="1.0.0.v201011060100"/>
         </location>
     	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.9"/>
+        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.14"/>
 	    	<unit id="com.minres.coredsl.feature.source.feature.group" version="0.0.0"/>
         	<unit id="com.minres.coredsl.feature.feature.group" version="0.0.0"/>
     	</location>
 	</locations>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file
diff --git a/com.minres.coredsl.json.tests/.classpath b/com.minres.coredsl.json.tests/.classpath
index e1749f5..fa358f4 100644
--- a/com.minres.coredsl.json.tests/.classpath
+++ b/com.minres.coredsl.json.tests/.classpath
@@ -15,7 +15,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.minres.coredsl.json.tests/.project b/com.minres.coredsl.json.tests/.project
index 7a97ce4..4ba84ff 100644
--- a/com.minres.coredsl.json.tests/.project
+++ b/com.minres.coredsl.json.tests/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
@@ -32,7 +27,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/com.minres.coredsl.json/.classpath b/com.minres.coredsl.json/.classpath
index 77adcf1..70971f5 100644
--- a/com.minres.coredsl.json/.classpath
+++ b/com.minres.coredsl.json/.classpath
@@ -2,11 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.minres.coredsl.json/.project b/com.minres.coredsl.json/.project
index 360353b..335c6fb 100644
--- a/com.minres.coredsl.json/.project
+++ b/com.minres.coredsl.json/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
@@ -32,7 +27,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
index 039c9a0..a475b58 100644
--- a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
+++ b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
@@ -90,6 +90,7 @@ class CoreDslJsonGenerator extends AbstractGenerator {
 
     def List<InstructionSet> allInstructionSets(InstructionSet core) {
         val s = if(core.superType !== null) core.superType.allInstructionSets else newLinkedList
+        s.addAll(core.providedInstructionSets)
         s.add(core)
         return s
     }