Merge a756876 into 1669b5a

LorenzoBettini · Apr 7, 2021 · 1d68967 · 1d68967
2 parents 1669b5a + a756876
commit 1d68967
Show file tree

Hide file tree

Showing 56 changed files with 459 additions and 371 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,10 +18,10 @@ jobs:
         # Shallow clones should be disabled for reproducible tycho-packaging-plugin:build-qualifier
         # and a better relevancy of SonarQube analysis
         fetch-depth: 0
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:

diff --git a/.github/workflows/windows-mac.yml b/.github/workflows/windows-mac.yml
@@ -28,10 +28,10 @@ jobs:
       with:
         # Shallow clones should be disabled for reproducible tycho-packaging-plugin:build-qualifier
         fetch-depth: 0
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:

diff --git a/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF b/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtext.example.domainmodel,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.ui.testing,
- org.objectweb.asm;bundle-version="[6.2.1,6.3.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="9.1.0";resolution:=optional
 Import-Package: org.apache.commons.logging,
  org.apache.log4j;version="1.2.15",
  org.junit;version="4.5.0",

diff --git a/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.equinox.common,
  jbase;visibility:=reexport,
  jbase.mwe2;resolution:=optional,
- org.objectweb.asm;bundle-version="[6.2.1,6.3.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="9.1.0";resolution:=optional
 Export-Package: org.eclipse.xtext.example.domainmodel,
  org.eclipse.xtext.example.domainmodel.domainmodel,
  org.eclipse.xtext.example.domainmodel.domainmodel.impl,

diff --git a/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -49,7 +49,7 @@
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>xtext-antlr-generator</artifactId>
-						<version>[2.1.1, 3.0)</version>
+						<version>2.1.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/jbase.example.client.maven/.settings/org.eclipse.jdt.core.prefs b/jbase.example.client.maven/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/jbase.example.client.maven/pom.xml b/jbase.example.client.maven/pom.xml
@@ -8,16 +8,27 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <xtext-version>2.15.0</xtext-version>
+    <xtext-version>2.25.0</xtext-version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.eclipse.xtext</groupId>
+        <artifactId>xtext-dev-bom</artifactId>
+        <version>${xtext-version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -131,22 +142,6 @@
             <artifactId>jbase</artifactId>
             <version>${project.version}</version>
           </dependency>
-          <!-- See https://github.com/eclipse/xtext-xtend/issues/493 -->
-          <dependency>
-            <groupId>org.eclipse.jdt</groupId>
-            <artifactId>org.eclipse.jdt.core</artifactId>
-            <version>3.15.0</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.jdt</groupId>
-            <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-            <version>1.3.300</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.jdt</groupId>
-            <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
-            <version>1.2.300</version>
-          </dependency>
         </dependencies>
       </plugin>
     </plugins>

diff --git a/jbase.example.jbasescript.tests/META-INF/MANIFEST.MF b/jbase.example.jbasescript.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: jbase.example.jbasescript,
  org.eclipse.jdt.core,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.objectweb.asm;bundle-version="[6.2.1,6.3.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="9.1.0";resolution:=optional
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",

diff --git a/jbase.example.jbasescript.ui.tests/.settings/org.eclipse.pde.prefs b/jbase.example.jbasescript.ui.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,35 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=2
+compilers.p.discouraged-class=2
+compilers.p.exec-env-too-low=2
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
+compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/jbase.example.jbasescript.ui.tests/META-INF/MANIFEST.MF b/jbase.example.jbasescript.ui.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: jbase.example.jbasescript.ui,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.core.runtime,
  org.eclipse.xtext.testing,
- org.eclipse.xtext.xbase.testing
+ org.eclipse.xtext.xbase.testing,
+ org.eclipse.xtext.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: jbase.example.jbasescript.ui.tests;x-internal=true
 Import-Package: org.junit.runners;version="4.5.0",

diff --git a/jbase.example.jbasescript.ui/.settings/org.eclipse.pde.prefs b/jbase.example.jbasescript.ui/.settings/org.eclipse.pde.prefs
@@ -12,13 +12,16 @@ compilers.p.build.source.library=1
 compilers.p.build.src.includes=1
 compilers.p.deprecated=2
 compilers.p.discouraged-class=2
+compilers.p.exec-env-too-low=2
 compilers.p.internal=1
 compilers.p.missing-packages=2
 compilers.p.missing-version-export-package=2
 compilers.p.missing-version-import-package=2
 compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
 compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1

diff --git a/jbase.example.jbasescript.ui/META-INF/MANIFEST.MF b/jbase.example.jbasescript.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: jbase.example.jbasescript;visibility:=reexport,
  jbase.ui,
  org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare,
- org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
  jbase.example.jbasescript.ide
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/jbase.example.jbasescript.ui/plugin.xml b/jbase.example.jbasescript.ui/plugin.xml
@@ -27,11 +27,11 @@
 		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
 			commandId="jbase.example.jbasescript.Jbasescript.validate">
-		<activeWhen>
-			<reference
+			<activeWhen>
+				<reference
 					definitionId="jbase.example.jbasescript.Jbasescript.Editor.opened">
-			</reference>
-		</activeWhen>
+				</reference>
+			</activeWhen>
 		</handler>
 		<!-- copy qualified name -->
 		<handler
@@ -120,38 +120,38 @@
 	</extension>
 	<extension
 		point="org.eclipse.ui.commands">
-	<command
+		<command
 			description="Trigger expensive validation"
 			id="jbase.example.jbasescript.Jbasescript.validate"
 			name="Validate">
-	</command>
-	<!-- copy qualified name -->
-	<command
+		</command>
+		<!-- copy qualified name -->
+		<command
 			id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
 			categoryId="org.eclipse.ui.category.edit"
 			description="Copy the qualified name for the selected element"
 			name="Copy Qualified Name">
-	</command>
-	<command
+		</command>
+		<command
 			id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
 			categoryId="org.eclipse.ui.category.edit"
 			description="Copy the qualified name for the selected element"
 			name="Copy Qualified Name">
-	</command>
+		</command>
 	</extension>
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
 			locationURI="popup:#TextEditorContext?after=group.edit">
-			 <command
-				 commandId="jbase.example.jbasescript.Jbasescript.validate"
-				 style="push"
-				 tooltip="Trigger expensive validation">
-			<visibleWhen checkEnabled="false">
-				<reference
-					definitionId="jbase.example.jbasescript.Jbasescript.Editor.opened">
-				</reference>
-			</visibleWhen>
-		</command>
+			<command
+				commandId="jbase.example.jbasescript.Jbasescript.validate"
+				style="push"
+				tooltip="Trigger expensive validation">
+				<visibleWhen checkEnabled="false">
+					<reference
+						definitionId="jbase.example.jbasescript.Jbasescript.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
 		</menuContribution>
 		<!-- copy qualified name -->
 		<menuContribution locationURI="popup:#TextEditorContext?after=copy">
@@ -301,7 +301,7 @@
 	<!-- Quick Outline -->
 	<extension
 		point="org.eclipse.ui.handlers">
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
 			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
 			<activeWhen>
@@ -361,7 +361,7 @@
 	</extension>
 	<!-- Rename Refactoring -->
 	<extension point="org.eclipse.ui.handlers">
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
 			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
 			<activeWhen>
@@ -395,7 +395,7 @@
 	</extension>
 	<!-- Type Hierarchy  -->
 	<extension point="org.eclipse.ui.handlers">
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.hierarchy.OpenTypeHierarchyHandler"
 			commandId="org.eclipse.xtext.xbase.ui.hierarchy.OpenTypeHierarchy">
 			<activeWhen>
@@ -404,7 +404,7 @@
 				</reference>
 			</activeWhen>
 		</handler>
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.hierarchy.QuickTypeHierarchyHandler"
 			commandId="org.eclipse.jdt.ui.edit.text.java.open.hierarchy">
 			<activeWhen>
@@ -426,10 +426,10 @@
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
 			locationURI="popup:#TextEditorContext?after=group.edit">
-			 <command
-				 commandId="org.eclipse.xtext.xbase.ui.organizeImports"
-				 style="push"
-				 tooltip="Organize Imports">
+			<command
+				commandId="org.eclipse.xtext.xbase.ui.organizeImports"
+				style="push"
+				tooltip="Organize Imports">
 				<visibleWhen checkEnabled="false">
 					<reference
 						definitionId="jbase.example.jbasescript.Jbasescript.Editor.opened">
@@ -460,7 +460,7 @@
 	</extension>
 	<!-- Call Hierachy -->
 	<extension point="org.eclipse.ui.handlers">
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.hierarchy.OpenCallHierachyHandler"
 			commandId="org.eclipse.xtext.xbase.ui.hierarchy.OpenCallHierarchy">
 			<activeWhen>
@@ -486,14 +486,14 @@
 		<factory class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.builder.smap.StratumBreakpointAdapterFactory"
 			adaptableType="jbase.example.jbasescript.ui.editor.JbasescriptEditor">
 			<adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
-		</factory> 
+		</factory>
 	</extension>
 	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution targetID="jbase.example.jbasescript.Jbasescript" 
+		<editorContribution targetID="jbase.example.jbasescript.Jbasescript"
 			id="jbase.example.jbasescript.Jbasescript.rulerActions">
 			<action
 				label="Not Used"
-	 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
+				class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
 				style="push"
 				actionID="RulerDoubleClick"
 				id="jbase.example.jbasescript.Jbasescript.doubleClickBreakpointAction"/>
@@ -526,7 +526,7 @@
 	</extension>
 	<!-- Introduce Local Variable Refactoring -->
 	<extension point="org.eclipse.ui.handlers">
-		<handler 
+		<handler
 			class="jbase.example.jbasescript.ui.JbasescriptExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.refactoring.ExtractVariableHandler"
 			commandId="org.eclipse.xtext.xbase.ui.refactoring.ExtractLocalVariable">
 			<activeWhen>