From 16f796631ed4e2fb7ba7ebea216e838e92e68bb8 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 14 Mar 2019 15:52:47 +0100 Subject: [PATCH 1/5] POM initial configuration for jdk > 9 --- edelta.parent/edelta.swtbot.tests/pom.xml | 24 +-- edelta.parent/edelta.tests.parent/pom.xml | 4 + edelta.parent/edelta.ui.tests/pom.xml | 239 ++++++++++------------ edelta.parent/pom.xml | 50 +++++ 4 files changed, 175 insertions(+), 142 deletions(-) diff --git a/edelta.parent/edelta.swtbot.tests/pom.xml b/edelta.parent/edelta.swtbot.tests/pom.xml index 1f4e2cb19..929712326 100644 --- a/edelta.parent/edelta.swtbot.tests/pom.xml +++ b/edelta.parent/edelta.swtbot.tests/pom.xml @@ -15,7 +15,7 @@ ${project.build.directory}/work/edelta - + -Dorg.eclipse.swtbot.search.timeout=10000 src @@ -33,7 +33,6 @@ ${project.build.directory}/work/edelta.app/Contents/Eclipse/ - -XstartOnFirstThread @@ -41,17 +40,6 @@ - - org.eclipse.tycho - tycho-surefire-plugin - - true - false - ${os-jvm-flags} -Dorg.eclipse.swtbot.search.timeout=10000 - p2Installed - ${test-work-directory} - - @@ -110,6 +98,16 @@ + + org.eclipse.tycho + tycho-surefire-plugin + + true + false + p2Installed + ${test-work-directory} + + diff --git a/edelta.parent/edelta.tests.parent/pom.xml b/edelta.parent/edelta.tests.parent/pom.xml index 24952dc73..465da254a 100644 --- a/edelta.parent/edelta.tests.parent/pom.xml +++ b/edelta.parent/edelta.tests.parent/pom.xml @@ -24,6 +24,10 @@ false + + + ${tycho.testArgLine} + diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index c5bae8c92..a383f29b7 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -1,133 +1,114 @@ - - 4.0.0 - - edelta - edelta.tests.parent - 0.3.3-SNAPSHOT - ../edelta.tests.parent/pom.xml - - edelta.ui.tests - eclipse-test-plugin + + 4.0.0 + + edelta + edelta.tests.parent + 0.3.3-SNAPSHOT + ../edelta.tests.parent/pom.xml + + edelta.ui.tests + eclipse-test-plugin - - ${os-jvm-flags} -DbuildingWithTycho=true - ${ui-tests-properties} - + + + testing-on-mac + + + mac + + + + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + org.eclipse.rcp + 0.0.0 + + + + eclipse-feature + edelta.feature + 0.0.0 + + + + eclipse-feature + org.eclipse.jdt + 0.0.0 + + + + + + + + + + testing-NOT-on-mac + + + !mac + + + + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + org.eclipse.rcp + 0.0.0 + + + + eclipse-feature + edelta.feature + 0.0.0 + + + + + + + + + - - - testing-on-mac - - - mac - - - - -XstartOnFirstThread - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-feature - org.eclipse.rcp - 0.0.0 - - - - eclipse-feature - edelta.feature - 0.0.0 - - - - eclipse-feature - org.eclipse.jdt - 0.0.0 - - - - - - - - - - testing-NOT-on-mac - - - !mac - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-feature - org.eclipse.rcp - 0.0.0 - - - - eclipse-feature - edelta.feature - 0.0.0 - - - - - - - - - - jacoco - - false - - - - ${tycho.testArgLine} ${ui-tests-properties} - - - - - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - false - true - ${argLine} - - - - + + + + org.eclipse.xtend + xtend-maven-plugin + + + org.eclipse.tycho + tycho-surefire-plugin + + true + + + + diff --git a/edelta.parent/pom.xml b/edelta.parent/pom.xml index eec129a89..44771a28d 100644 --- a/edelta.parent/pom.xml +++ b/edelta.parent/pom.xml @@ -16,6 +16,12 @@ 1.8 1.8 + + + + + + + + macos + + + mac + + + + + -XstartOnFirstThread + + + + jdk9-or-newer + + [9,) + + + --add-modules=ALL-SYSTEM + + release-composite @@ -461,6 +500,17 @@ -err:-forbidden + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + ${additionalTestArgLine} ${platformSystemProperties} ${systemProperties} ${moduleProperties} + false + false + + org.eluder.coveralls coveralls-maven-plugin From 7ee008d02e7f6197790f3fa91d952f6fec0ab763 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 14 Mar 2019 16:02:54 +0100 Subject: [PATCH 2/5] re-enabled -DbuildingWithTycho=true in ui tests --- edelta.parent/edelta.ui.tests/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index a383f29b7..9ef54f9d5 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -11,6 +11,10 @@ edelta.ui.tests eclipse-test-plugin + + -DbuildingWithTycho=true + + testing-on-mac From 82dbe236eaf8d6bd86e1c3dfc6b43a5a4628c4a6 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 14 Mar 2019 16:04:03 +0100 Subject: [PATCH 3/5] Mac xcode10.1 with JDK 11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 043a67d4f..bf0c9e1bb 100644 --- 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) From 025bd7aa0372d6a4ee4289dd8d218cbc2a42b25a Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 14 Mar 2019 18:26:43 +0100 Subject: [PATCH 4/5] show logs after failure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf0c9e1bb..c312985fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 {} \; From 6c96b0494fb4606f0335198fcd9a7409dc379f34 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 14 Mar 2019 18:39:07 +0100 Subject: [PATCH 5/5] fix for Java 11 in headless tests --- edelta.parent/edelta.lib.tests/pom.xml | 25 ++++++++++ edelta.parent/edelta.tests/pom.xml | 66 +++++++++++++++----------- 2 files changed, 64 insertions(+), 27 deletions(-) diff --git a/edelta.parent/edelta.lib.tests/pom.xml b/edelta.parent/edelta.lib.tests/pom.xml index 0d66d3da7..23d1ded38 100644 --- a/edelta.parent/edelta.lib.tests/pom.xml +++ b/edelta.parent/edelta.lib.tests/pom.xml @@ -16,4 +16,29 @@ src + + + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + org.eclipse.rcp + 0.0.0 + + + + + + + diff --git a/edelta.parent/edelta.tests/pom.xml b/edelta.parent/edelta.tests/pom.xml index 3ca5b8a19..4cd12a3fa 100644 --- a/edelta.parent/edelta.tests/pom.xml +++ b/edelta.parent/edelta.tests/pom.xml @@ -1,30 +1,42 @@ - - 4.0.0 - - edelta - edelta.tests.parent - 0.3.3-SNAPSHOT - ../edelta.tests.parent/pom.xml - - edelta.tests - eclipse-test-plugin + + 4.0.0 + + edelta + edelta.tests.parent + 0.3.3-SNAPSHOT + ../edelta.tests.parent/pom.xml + + edelta.tests + eclipse-test-plugin - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - false - - - - + + + + org.eclipse.xtend + xtend-maven-plugin + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + org.eclipse.rcp + 0.0.0 + + + + + + +