Merge pull request #39 from LorenzoBettini/java-11

Java 11
LorenzoBettini · Mar 14, 2019 · 911ce27 · 911ce27
2 parents adec915 + 6c96b04
commit 911ce27
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 170 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       env: DISPLAY=:99.0 ADDITIONAL="-Pjacoco,build-ide,test-ide coveralls:report sonar:sonar"
     # only on PR
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode10.1 # JDK 11
       env: ADDITIONAL="-Pbuild-ide,test-ide"
       if: type IN (pull_request)
 
@@ -47,4 +47,4 @@ after_success:
  - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log"
 
 after_failure:
- - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log" -exec cat {} \;
+ - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \;
diff --git a/edelta.parent/edelta.lib.tests/pom.xml b/edelta.parent/edelta.lib.tests/pom.xml
@@ -16,4 +16,29 @@
     <sonar.sources></sonar.sources>
     <sonar.tests>src</sonar.tests>
   </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- 
+                Required in Java 11
+                See
+                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
+                https://github.com/eclipse/xtext-core/pull/934 -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/edelta.parent/edelta.swtbot.tests/pom.xml b/edelta.parent/edelta.swtbot.tests/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <test-work-directory>${project.build.directory}/work/edelta</test-work-directory>
-    <os-jvm-flags />
+    <additionalTestArgLine>-Dorg.eclipse.swtbot.search.timeout=10000</additionalTestArgLine>
     <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 -->
     <sonar.sources></sonar.sources>
     <sonar.tests>src</sonar.tests>
@@ -33,25 +33,13 @@
         <!-- Tycho surefire should install additional bundles in the actual 
           installation directory of the unpacked Eclipse; for Mac it is different: -->
         <test-work-directory>${project.build.directory}/work/edelta.app/Contents/Eclipse/</test-work-directory>
-        <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
       </properties>
     </profile>
   </profiles>
 
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <configuration>
-            <useUIHarness>true</useUIHarness>
-            <useUIThread>false</useUIThread>
-            <argLine>${os-jvm-flags} -Dorg.eclipse.swtbot.search.timeout=10000</argLine>
-            <testRuntime>p2Installed</testRuntime>
-            <work>${test-work-directory}</work>
-          </configuration>
-        </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings 
           only. It has no influence on the Maven build itself. -->
         <plugin>
@@ -110,6 +98,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>false</useUIThread>
+          <testRuntime>p2Installed</testRuntime>
+          <work>${test-work-directory}</work>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/edelta.parent/edelta.tests.parent/pom.xml b/edelta.parent/edelta.tests.parent/pom.xml
@@ -24,6 +24,10 @@
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
+      <properties>
+        <!-- tycho.testArgLine is where jacoco stores the agent path -->
+        <additionalTestArgLine>${tycho.testArgLine}</additionalTestArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>

diff --git a/edelta.parent/edelta.tests/pom.xml b/edelta.parent/edelta.tests/pom.xml
@@ -1,30 +1,42 @@
-<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>
-		<groupId>edelta</groupId>
-		<artifactId>edelta.tests.parent</artifactId>
-		<version>0.3.3-SNAPSHOT</version>
-		<relativePath>../edelta.tests.parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>edelta.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
+<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>
+    <groupId>edelta</groupId>
+    <artifactId>edelta.tests.parent</artifactId>
+    <version>0.3.3-SNAPSHOT</version>
+    <relativePath>../edelta.tests.parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>edelta.tests</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<failIfNoTests>false</failIfNoTests>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.xtend</groupId>
+        <artifactId>xtend-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- Required in Java 11
+                See
+                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
+                https://github.com/eclipse/xtext-core/pull/934 -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>