Merge 8457a33 into 8bbd863

LorenzoBettini · May 5, 2021 · 0a9281a · 0a9281a
2 parents 8bbd863 + 8457a33
commit 0a9281a
Show file tree

Hide file tree

Showing 19 changed files with 185 additions and 186 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -36,3 +36,9 @@ jobs:
         coveralls:report
       env: 
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+    - name: Archive Test Results
+      uses: actions/upload-artifact@v2
+      if: ${{ failure() }}
+      with:
+        name: test-results-${{ runner.os }}
+        path: '**/*.tests/target'
diff --git a/.github/workflows/windows-mac.yml b/.github/workflows/windows-mac.yml
@@ -40,3 +40,9 @@ jobs:
         mvn -f javamm.parent/pom.xml
         '-Dtycho.disableP2Mirrors=true'
         verify -Pide-tests
+    - name: Archive Test Results
+      uses: actions/upload-artifact@v2
+      if: ${{ failure() }}
+      with:
+        name: test-results-${{ runner.os }}
+        path: '**/*.tests/target'
diff --git a/javamm.examples/pom.xml b/javamm.examples/pom.xml
@@ -68,22 +68,6 @@
 						<artifactId>jbase</artifactId>
 						<version>${jbase-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/javamm.parent/pom.xml b/javamm.parent/pom.xml
@@ -8,23 +8,19 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho-version>1.2.0</tycho-version>
+    <tycho-version>1.4.0</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
     <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
-    <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-    <junit-version>4.12</junit-version>
+    <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <os-jvm-flags />
-    <memoryArgs>-Xms256M -Xmx1024M -XX:PermSize=256M
-      -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
-    <xtext.version>2.15.0</xtext.version>
+    <memoryArgs></memoryArgs>
+    <xtext.version>2.25.0</xtext.version>
     <xtext-version>${xtext.version}</xtext-version>
     <xtextVersion>${xtext.version}</xtextVersion>
-    <eclipse-version>2018-09</eclipse-version>
-    <mwe2Version>2.9.1.201705291010</mwe2Version>
-    <jbase-version>0.9.0</jbase-version>
-    <platform-version>[3.9,4.0)</platform-version>
-    <fornax-oaw-m2-plugin-version>3.5.1</fornax-oaw-m2-plugin-version>
+    <eclipse-version>2020-06</eclipse-version>
+    <mwe2Version>2.12.1</mwe2Version>
+    <jbase-version>0.10.0</jbase-version>
 
     <target-file-name>javamm.target</target-file-name>
 
@@ -291,6 +287,11 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>${maven-antrun-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.tycho.extras</groupId>
           <artifactId>tycho-eclipserun-plugin</artifactId>
@@ -481,6 +482,20 @@
             </environment>
           </environments>
           <includePackedArtifacts>true</includePackedArtifacts>
+          <dependency-resolution>
+            <extraRequirements>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.eclipse.xtext.ui.codemining</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.eclipse.xtext.logging</id>
+                <versionRange>1.2.15</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
         </configuration>
       </plugin>
 

diff --git a/javamm.site/javamm.eclipse.ide.product b/javamm.site/javamm.eclipse.ide.product
@@ -30,7 +30,6 @@
    <launcher name="eclipse">
       <linux icon="../javamm.eclipse.sdk/images/javamm-64.xpm"/>
       <macosx icon="../javamm.eclipse.sdk/images/javamm.icns"/>
-      <solaris/>
       <win useIco="true">
          <ico path="../javamm.eclipse.sdk/images/javamm.ico"/>
          <bmp/>
@@ -51,15 +50,15 @@
    </features>
 
    <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="org.eclipse.core.resources/encoding" value="UTF-8" />
-      <property name="org.eclipse.ui/org.eclipse.ui.edit.text.encoding" value="UTF-8" />
       <property name="osgi.instance.area.default" value="@user.home/workspace-javamm" />
+      <property name="org.eclipse.ui/org.eclipse.ui.edit.text.encoding" value="UTF-8" />
+      <property name="org.eclipse.core.resources/encoding" value="UTF-8" />
    </configurations>
 
 </product>
diff --git a/javamm.site/pom.xml b/javamm.site/pom.xml
@@ -319,8 +319,8 @@
             <artifactId>tycho-p2-director-plugin</artifactId>
           </plugin>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>${maven-antrun-plugin.version}</version>
             <!-- copying zipped products -->
             <executions>
               <execution>

diff --git a/javamm.targetplatform/javamm.target.target b/javamm.targetplatform/javamm.target.target
@@ -14,30 +14,26 @@
 <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"/>
-<repository location="https://download.eclipse.org/releases/2018-09/"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/releases/2020-06/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
+<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.15.0/"/>
+<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="jbase.sdk.feature.group" version="0.0.0"/>
 <unit id="jbase.sdk.source.feature.group" version="0.0.0"/>
-<repository location="https://lorenzobettini.github.io/jbase-releases/updates/0.x/0.9.x/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
-<unit id="org.hamcrest.library" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/technology/swtbot/releases/latest"/>
+<repository location="https://lorenzobettini.github.io/jbase-releases/updates/0.x/0.10.x/"/>
 </location>
 </locations>
 </target>
diff --git a/javamm.tests/META-INF/MANIFEST.MF b/javamm.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: javamm,
  javamm.runtime,
  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/javamm.ui.examples/META-INF/MANIFEST.MF b/javamm.ui.examples/META-INF/MANIFEST.MF
@@ -8,6 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.emf.common.ui;bundle-version="2.7.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.junit4,
  javamm.ui
 Automatic-Module-Name: javamm.ui.examples
diff --git a/javamm.ui.examples/pom.xml b/javamm.ui.examples/pom.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-	<relativePath>../javamm.parent/pom.xml</relativePath>
-	<groupId>javamm</groupId>
-	<artifactId>javamm.parent</artifactId>
-	<version>1.10.0-SNAPSHOT</version>
+    <relativePath>../javamm.parent/pom.xml</relativePath>
+    <groupId>javamm</groupId>
+    <artifactId>javamm.parent</artifactId>
+    <version>1.10.0-SNAPSHOT</version>
   </parent>
 
-	<artifactId>javamm.ui.examples</artifactId>
-	<packaging>eclipse-plugin</packaging>
+  <artifactId>javamm.ui.examples</artifactId>
+  <packaging>eclipse-plugin</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target>
-							  <ant antfile="${basedir}/build.xml">
-							    <target name="zip_all_examples"/>
-							  </ant>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <configuration>
+              <target>
+                <ant antfile="${basedir}/build.xml">
+                  <target name="zip_all_examples" />
+                </ant>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/javamm.ui.tests/META-INF/MANIFEST.MF b/javamm.ui.tests/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@ Bundle-SymbolicName: javamm.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: javamm.ui,
  org.junit;bundle-version="4.7.0",
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.core.runtime,
  org.eclipse.jdt.ui,
@@ -19,7 +17,8 @@ Require-Bundle: javamm.ui,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.ui.testing,
- org.eclipse.xtext.xbase.ui.testing
+ org.eclipse.xtext.xbase.ui.testing,
+ org.eclipse.xtext.xbase.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: javamm.ui.tests;x-internal=true
 Import-Package: org.junit.runners;version="4.5.0",

diff --git a/javamm.ui.tests/pom.xml b/javamm.ui.tests/pom.xml
@@ -48,7 +48,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
           <dependency-resolution>
-            <extraRequirements>
+            <extraRequirements combine.children="append">
               <!-- to get the org.eclipse.osgi.compatibility.state plugin 
                 iff the targeted Eclipse version (e.g., Luna) has it (backwards compatible 
                 with kepler and previous versions) -->

diff --git a/javamm.ui/META-INF/MANIFEST.MF b/javamm.ui/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: javamm;visibility:=reexport,
  org.eclipse.jdt.ui,
  org.eclipse.jdt.launching,
  javamm.selfassessment.builder,
- org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
  javamm.ide,
  jbase.ui
 Import-Package: org.apache.log4j