Skip to content

Commit

Permalink
Resolving missing module
Browse files Browse the repository at this point in the history 
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 and 9 & 11.
Added a fix to manually symlink cacerts on jdk9+.

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
vodorok committed Jul 4, 2019
1 parent b3c050b commit 1bf4757
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 40 deletions.
2 changes: 1 addition & 1 deletion releng/org.codechecker.eclipse.configuration/pom.xml
View file
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
11 changes: 6 additions & 5 deletions releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target
View file
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,16 +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"/>
<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>
3 changes: 2 additions & 1 deletion tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.swtbot.junit4_x;bundle-version="2.7.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"
org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0",
javax.annotation;bundle-version="1.2.0"
204 changes: 172 additions & 32 deletions tests/org.codechecker.eclipse.rcp.it.tests/pom.xml
View file
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>
3 changes: 2 additions & 1 deletion tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Require-Bundle: org.junit,
org.hamcrest;bundle-version="1.1.0",
org.mockito;bundle-version="1.9.5",
org.objenesis;bundle-version="1.0.0",
org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0"
org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0",
javax.annotation;bundle-version="1.2.0"
Bundle-ClassPath: .,
resources/

0 comments on commit 1bf4757

Please sign in to comment.