From c030675ce97067beda83193d192449067709eadf Mon Sep 17 00:00:00 2001 From: Vodorok Date: Tue, 2 Jul 2019 16:45:47 +0200 Subject: [PATCH 1/2] Test with multiple jdk verisons in travis Need to symlink the system CA certificates if necessary. on openjdk9+. openjdk9 is allowed to fail because of its fragility. See more: athttps://www.deps.co/guides/travis-ci-latest-java/ --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 850e463b..65e64447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,23 @@ install: true language: java jdk: - oraclejdk8 + - oraclejdk9 + - oraclejdk11 + - openjdk8 env: DISPLAY=:99.0 +matrix: + include: + - jdk: openjdk10 + before_install: + - rm "${JAVA_HOME}/lib/security/cacerts" + - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" + - jdk: openjdk11 + before_install: + - rm "${JAVA_HOME}/lib/security/cacerts" + - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" + before_install: - sudo apt-get install at-spi2-core @@ -18,4 +32,4 @@ script: mvn -f mavendeps/pom.xml p2:site && mvn clean verify after_failure: - cat $TRAVIS_BUILD_DIR/tests/org.codechecker.eclipse.rcp.it.tests/target/work/data/.metadata/.log - cat $TRAVIS_BUILD_DIR/tests/org.codechecker.eclipse.rcp.it.tests/target/surefire-reports/* - + - cat $TRAVIS_BUILD_DIR/tests/org.codechecker.eclipse.rcp.unit.tests/target/work/configuration/*.log From f2a78bbb36d766469d71912f201096e8b895b7f1 Mon Sep 17 00:00:00 2001 From: Vodorok Date: Tue, 2 Jul 2019 16:57:21 +0200 Subject: [PATCH 2/2] Resolving missing module This from this eclipse version a newer java support is enabled. See more at: https://projects.eclipse.org/projects/eclipse/releases/4.8.0 Bumped Tycho to 1.4.0. Added Javax.annotation bundle to target platform. Added vmargs to the integration test pom.xml. Added profiles to jdk 8, 9, 10 & 11. Fix for the missing dependency with java 11 in the integration test phase. Referenced in: * https://wiki.eclipse.org/Tycho/Release_Notes/1.4 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=541403 --- readme.md | 9 +- .../pom.xml | 2 +- .../org.codechecker.eclipse.target.target | 12 +- .../META-INF/MANIFEST.MF | 3 +- .../pom.xml | 204 +++++++++++++++--- .../META-INF/MANIFEST.MF | 3 +- 6 files changed, 190 insertions(+), 43 deletions(-) diff --git a/readme.md b/readme.md index 3c4c46fd..fa3cdc3e 100644 --- a/readme.md +++ b/readme.md @@ -7,10 +7,15 @@ This is a C/C++ code analysis plugin for Eclipse that shows bugs detected by the ## Requirements * Linux operating system + * Recent [CodeChecker](https://github.com/Ericsson/codechecker) (6.8.0 and up) -* Every eclipse version since [Oxygen 1](https://www.eclipse.org/downloads/packages/release/oxygen/1) (v4.7.0) is supported + +* Every eclipse version since [Phtoton](https://www.eclipse.org/downloads/packages/release/photon/r) (v4.8.0) is supported + * Should work with v4.7.0 Oxygen, but this version is untested currently. + * Eclipse CDT -* Java SE 1.8 + +* Java SE 1.8 (for building, an equivalent jdk). ## Build and install CodeChecker Eclipse Plugin diff --git a/releng/org.codechecker.eclipse.configuration/pom.xml b/releng/org.codechecker.eclipse.configuration/pom.xml index 7a20cbdb..f4b9c404 100644 --- a/releng/org.codechecker.eclipse.configuration/pom.xml +++ b/releng/org.codechecker.eclipse.configuration/pom.xml @@ -6,7 +6,7 @@ pom - 1.3.0 + 1.4.0 UTF-8 diff --git a/releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target b/releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target index 5edeb7f7..bf5d02de 100644 --- a/releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target +++ b/releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target @@ -1,5 +1,5 @@ - + @@ -19,17 +19,17 @@ - - - - + + + + + - diff --git a/tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF b/tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF index 53029831..6ccf0412 100644 --- a/tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF +++ b/tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF @@ -13,4 +13,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.swtbot.swt.finder;bundle-version="2.7.0", org.eclipse.swtbot.eclipse.finder;bundle-version="2.7.0", org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0", - com.github.stefanbirkner.system-rules;bundle-version="1.19.0" + com.github.stefanbirkner.system-rules;bundle-version="1.19.0", + javax.annotation;bundle-version="1.2.0" diff --git a/tests/org.codechecker.eclipse.rcp.it.tests/pom.xml b/tests/org.codechecker.eclipse.rcp.it.tests/pom.xml index 49d06036..79f066e0 100644 --- a/tests/org.codechecker.eclipse.rcp.it.tests/pom.xml +++ b/tests/org.codechecker.eclipse.rcp.it.tests/pom.xml @@ -13,37 +13,177 @@ 1.0.0-SNAPSHOT eclipse-test-plugin - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - - - - eclipse-feature - org.eclipse.cdt - 0.0.0 - - - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - true - false - org.codechecker.eclipse.feature - org.eclipse.ui.ide.workbench - org.codechecker.eclipse.plugin.AllTests - - - - + + + active-on-jdk-8 + + 1.8 + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + + eclipse-feature + org.eclipse.cdt + 0.0.0 + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + false + org.codechecker.eclipse.feature + org.eclipse.ui.ide.workbench + org.codechecker.eclipse.plugin.AllTests + + + + + + + active-on-jdk-9 + + 9 + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + + eclipse-feature + org.eclipse.cdt + 0.0.0 + + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + false + --add-modules=java.se.ee + org.codechecker.eclipse.feature + org.eclipse.ui.ide.workbench + org.codechecker.eclipse.plugin.AllTests + + + + + + + active-on-jdk-10 + + 10 + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + + eclipse-feature + org.eclipse.cdt + 0.0.0 + + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + false + --add-modules=ALL-SYSTEM + org.codechecker.eclipse.feature + org.eclipse.ui.ide.workbench + org.codechecker.eclipse.plugin.AllTests + + + + + + + active-on-jdk-11 + + 11 + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + + eclipse-feature + org.eclipse.cdt + 0.0.0 + + + eclipse-plugin + javax.annotation + 1.2.0 + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + false + --add-modules=ALL-SYSTEM + org.codechecker.eclipse.feature + org.eclipse.ui.ide.workbench + org.codechecker.eclipse.plugin.AllTests + + + + + + diff --git a/tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF b/tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF index 2a4e45d1..880d5d91 100644 --- a/tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF +++ b/tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Require-Bundle: org.junit, org.objenesis;bundle-version="1.0.0", org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0", com.google.guava, - com.github.stefanbirkner.system-rules;bundle-version="1.19.0" + com.github.stefanbirkner.system-rules;bundle-version="1.19.0", + javax.annotation;bundle-version="1.2.0" Bundle-ClassPath: ., resources/