Skip to content

Commit

Permalink
Resolving missing module (#167)
Browse files Browse the repository at this point in the history
* 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/

* 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
  • Loading branch information
vodorok authored and gamesh411 committed Sep 11, 2019
1 parent fcd1016 commit 0b5646d
Show file tree
Hide file tree
Showing 7 changed files with 205 additions and 44 deletions.
16 changes: 15 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
9 changes: 7 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion releng/org.codechecker.eclipse.configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packaging>pom</packaging>

<properties>
<tycho.version>1.3.0</tycho.version>
<tycho.version>1.4.0</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="org.codechecker.eclipse.target" sequenceNumber="32">
<?pde version="3.8"?><target name="org.codechecker.eclipse.target" sequenceNumber="33">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.7.0.201806111355"/>
Expand All @@ -19,17 +19,17 @@
<repository location="http://download.eclipse.org/tools/cdt/releases/9.3"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170612-0950"/>
<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.106.0.v20170503-0851"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.7/"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.14.0.v20180518-2029"/>
<unit id="org.eclipse.sdk.ide" version="4.8.0.I20180611-0500"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.8/"/>
</location>
<location path="${project_loc}/../../mavendeps/target/repository" type="Directory"/>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.annotation" version="1.2.0.v201602091430"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
</location>
<location path="${project_loc}/../../mavendeps/target/repository" type="Directory"/>
</locations>
</target>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
204 changes: 172 additions & 32 deletions tests/org.codechecker.eclipse.rcp.it.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,177 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.codechecker.eclipse.feature</product>
<application>org.eclipse.ui.ide.workbench</application>
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>active-on-jdk-8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.codechecker.eclipse.feature</product>
<application>org.eclipse.ui.ide.workbench</application>
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>active-on-jdk-9</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--requirement>
<type>eclipse-plugin</type>
<id>javax.annotation</id>
<versionRange>0.0.0</versionRange>
</requirement-->
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<argLine>--add-modules=java.se.ee</argLine>
<product>org.codechecker.eclipse.feature</product>
<application>org.eclipse.ui.ide.workbench</application>
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>active-on-jdk-10</id>
<activation>
<jdk>10</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--requirement>
<type>eclipse-plugin</type>
<id>javax.annotation</id>
<versionRange>1.2.0</versionRange>
</requirement-->
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<argLine>--add-modules=ALL-SYSTEM</argLine>
<product>org.codechecker.eclipse.feature</product>
<application>org.eclipse.ui.ide.workbench</application>
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>active-on-jdk-11</id>
<activation>
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>javax.annotation</id>
<versionRange>1.2.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<argLine>--add-modules=ALL-SYSTEM</argLine>
<product>org.codechecker.eclipse.feature</product>
<application>org.eclipse.ui.ide.workbench</application>
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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/

0 comments on commit 0b5646d

Please sign in to comment.