Skip to content

Commit 9fc78fc

Browse files
vodorokvodorok
committed
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
1 parent c030675 commit 9fc78fc

File tree

6 files changed

+186
-43
lines changed

6 files changed

+186
-43
lines changed

‎readme.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ This is a C/C++ code analysis plugin for Eclipse that shows bugs detected by the
88

99
* Linux operating system
1010
* Recent [CodeChecker](https://github.com/Ericsson/codechecker) (6.8.0 and up)
11-
* Every eclipse version since [Oxygen 1](https://www.eclipse.org/downloads/packages/release/oxygen/1) (v4.7.0) is supported
11+
* Every eclipse version since [Phtoton](https://www.eclipse.org/downloads/packages/release/photon/r) (v4.8.0) is supported
12+
* Should work with v4.7.0 Oxygen, but this version is untested currently.
1213
* Eclipse CDT
13-
* Java SE 1.8
14+
* Java SE 1.8 (for building, an equivalent jdk).
1415

1516
## Build and install CodeChecker Eclipse Plugin
1617

‎releng/org.codechecker.eclipse.configuration/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packaging>pom</packaging>
77

88
<properties>
9-
<tycho.version>1.3.0</tycho.version>
9+
<tycho.version>1.4.0</tycho.version>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
</properties>
1212

‎releng/org.codechecker.eclipse.target/org.codechecker.eclipse.target.target‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<?pde version="3.8"?><target name="org.codechecker.eclipse.target" sequenceNumber="32">
2+
<?pde version="3.8"?><target name="org.codechecker.eclipse.target" sequenceNumber="33">
33
<locations>
44
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
55
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.7.0.201806111355"/>
@@ -19,17 +19,17 @@
1919
<repository location="http://download.eclipse.org/tools/cdt/releases/9.3"/>
2020
</location>
2121
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
22-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
23-
<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170612-0950"/>
24-
<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.106.0.v20170503-0851"/>
25-
<repository location="https://download.eclipse.org/eclipse/updates/4.7/"/>
22+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.14.0.v20180518-2029"/>
23+
<unit id="org.eclipse.sdk.ide" version="4.8.0.I20180611-0500"/>
24+
<repository location="https://download.eclipse.org/eclipse/updates/4.8/"/>
2625
</location>
26+
<location path="${project_loc}/../../mavendeps/target/repository" type="Directory"/>
2727
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
28+
<unit id="javax.annotation" version="1.2.0.v201602091430"/>
2829
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
2930
<unit id="org.junit" version="4.12.0.v201504281640"/>
3031
<unit id="org.mockito" version="1.9.5.v201605172210"/>
3132
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
3233
</location>
33-
<location path="${project_loc}/../../mavendeps/target/repository" type="Directory"/>
3434
</locations>
3535
</target>

‎tests/org.codechecker.eclipse.rcp.it.tests/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
1313
org.eclipse.swtbot.swt.finder;bundle-version="2.7.0",
1414
org.eclipse.swtbot.eclipse.finder;bundle-version="2.7.0",
1515
org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0",
16-
com.github.stefanbirkner.system-rules;bundle-version="1.19.0"
16+
com.github.stefanbirkner.system-rules;bundle-version="1.19.0",
17+
javax.annotation;bundle-version="1.2.0"

‎tests/org.codechecker.eclipse.rcp.it.tests/pom.xml‎

Lines changed: 172 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,177 @@
1313
<version>1.0.0-SNAPSHOT</version>
1414
<packaging>eclipse-test-plugin</packaging>
1515

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<groupId>org.eclipse.tycho</groupId>
20-
<artifactId>target-platform-configuration</artifactId>
21-
<version>${tycho.version}</version>
22-
<configuration>
23-
<dependency-resolution>
24-
<extraRequirements>
25-
<requirement>
26-
<type>eclipse-feature</type>
27-
<id>org.eclipse.cdt</id>
28-
<versionRange>0.0.0</versionRange>
29-
</requirement>
30-
</extraRequirements>
31-
</dependency-resolution>
32-
</configuration>
33-
</plugin>
34-
<plugin>
35-
<groupId>org.eclipse.tycho</groupId>
36-
<artifactId>tycho-surefire-plugin</artifactId>
37-
<version>${tycho.version}</version>
38-
<configuration>
39-
<useUIHarness>true</useUIHarness>
40-
<useUIThread>false</useUIThread>
41-
<product>org.codechecker.eclipse.feature</product>
42-
<application>org.eclipse.ui.ide.workbench</application>
43-
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
44-
</configuration>
45-
</plugin>
46-
</plugins>
47-
</build>
16+
<profiles>
17+
<profile>
18+
<id>active-on-jdk-8</id>
19+
<activation>
20+
<jdk>1.8</jdk>
21+
</activation>
22+
<build>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.eclipse.tycho</groupId>
26+
<artifactId>target-platform-configuration</artifactId>
27+
<version>${tycho.version}</version>
28+
<configuration>
29+
<dependency-resolution>
30+
<extraRequirements>
31+
<requirement>
32+
<type>eclipse-feature</type>
33+
<id>org.eclipse.cdt</id>
34+
<versionRange>0.0.0</versionRange>
35+
</requirement>
36+
</extraRequirements>
37+
</dependency-resolution>
38+
</configuration>
39+
</plugin>
40+
<plugin>
41+
<groupId>org.eclipse.tycho</groupId>
42+
<artifactId>tycho-surefire-plugin</artifactId>
43+
<version>${tycho.version}</version>
44+
<configuration>
45+
<useUIHarness>true</useUIHarness>
46+
<useUIThread>false</useUIThread>
47+
<product>org.codechecker.eclipse.feature</product>
48+
<application>org.eclipse.ui.ide.workbench</application>
49+
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
</profile>
55+
<profile>
56+
<id>active-on-jdk-9</id>
57+
<activation>
58+
<jdk>9</jdk>
59+
</activation>
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.eclipse.tycho</groupId>
64+
<artifactId>target-platform-configuration</artifactId>
65+
<version>${tycho.version}</version>
66+
<configuration>
67+
<dependency-resolution>
68+
<extraRequirements>
69+
<requirement>
70+
<type>eclipse-feature</type>
71+
<id>org.eclipse.cdt</id>
72+
<versionRange>0.0.0</versionRange>
73+
</requirement>
74+
<!--requirement>
75+
<type>eclipse-plugin</type>
76+
<id>javax.annotation</id>
77+
<versionRange>0.0.0</versionRange>
78+
</requirement-->
79+
</extraRequirements>
80+
</dependency-resolution>
81+
</configuration>
82+
</plugin>
83+
<plugin>
84+
<groupId>org.eclipse.tycho</groupId>
85+
<artifactId>tycho-surefire-plugin</artifactId>
86+
<version>${tycho.version}</version>
87+
<configuration>
88+
<useUIHarness>true</useUIHarness>
89+
<useUIThread>false</useUIThread>
90+
<argLine>--add-modules=java.se.ee</argLine>
91+
<product>org.codechecker.eclipse.feature</product>
92+
<application>org.eclipse.ui.ide.workbench</application>
93+
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
94+
</configuration>
95+
</plugin>
96+
</plugins>
97+
</build>
98+
</profile>
99+
<profile>
100+
<id>active-on-jdk-10</id>
101+
<activation>
102+
<jdk>10</jdk>
103+
</activation>
104+
<build>
105+
<plugins>
106+
<plugin>
107+
<groupId>org.eclipse.tycho</groupId>
108+
<artifactId>target-platform-configuration</artifactId>
109+
<version>${tycho.version}</version>
110+
<configuration>
111+
<dependency-resolution>
112+
<extraRequirements>
113+
<requirement>
114+
<type>eclipse-feature</type>
115+
<id>org.eclipse.cdt</id>
116+
<versionRange>0.0.0</versionRange>
117+
</requirement>
118+
<!--requirement>
119+
<type>eclipse-plugin</type>
120+
<id>javax.annotation</id>
121+
<versionRange>1.2.0</versionRange>
122+
</requirement-->
123+
</extraRequirements>
124+
</dependency-resolution>
125+
</configuration>
126+
</plugin>
127+
<plugin>
128+
<groupId>org.eclipse.tycho</groupId>
129+
<artifactId>tycho-surefire-plugin</artifactId>
130+
<version>${tycho.version}</version>
131+
<configuration>
132+
<useUIHarness>true</useUIHarness>
133+
<useUIThread>false</useUIThread>
134+
<argLine>--add-modules=ALL-SYSTEM</argLine>
135+
<product>org.codechecker.eclipse.feature</product>
136+
<application>org.eclipse.ui.ide.workbench</application>
137+
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
138+
</configuration>
139+
</plugin>
140+
</plugins>
141+
</build>
142+
</profile>
143+
<profile>
144+
<id>active-on-jdk-11</id>
145+
<activation>
146+
<jdk>11</jdk>
147+
</activation>
148+
<build>
149+
<plugins>
150+
<plugin>
151+
<groupId>org.eclipse.tycho</groupId>
152+
<artifactId>target-platform-configuration</artifactId>
153+
<version>${tycho.version}</version>
154+
<configuration>
155+
<dependency-resolution>
156+
<extraRequirements>
157+
<requirement>
158+
<type>eclipse-feature</type>
159+
<id>org.eclipse.cdt</id>
160+
<versionRange>0.0.0</versionRange>
161+
</requirement>
162+
<requirement>
163+
<type>eclipse-plugin</type>
164+
<id>javax.annotation</id>
165+
<versionRange>1.2.0</versionRange>
166+
</requirement>
167+
</extraRequirements>
168+
</dependency-resolution>
169+
</configuration>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.eclipse.tycho</groupId>
173+
<artifactId>tycho-surefire-plugin</artifactId>
174+
<version>${tycho.version}</version>
175+
<configuration>
176+
<useUIHarness>true</useUIHarness>
177+
<useUIThread>false</useUIThread>
178+
<argLine>--add-modules=ALL-SYSTEM</argLine>
179+
<product>org.codechecker.eclipse.feature</product>
180+
<application>org.eclipse.ui.ide.workbench</application>
181+
<testClass>org.codechecker.eclipse.plugin.AllTests</testClass>
182+
</configuration>
183+
</plugin>
184+
</plugins>
185+
</build>
186+
</profile>
187+
</profiles>
48188

49189
</project>

‎tests/org.codechecker.eclipse.rcp.unit.tests/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Require-Bundle: org.junit,
1313
org.objenesis;bundle-version="1.0.0",
1414
org.codechecker.eclipse.rcp.shared;bundle-version="1.0.0",
1515
com.google.guava,
16-
com.github.stefanbirkner.system-rules;bundle-version="1.19.0"
16+
com.github.stefanbirkner.system-rules;bundle-version="1.19.0",
17+
javax.annotation;bundle-version="1.2.0"
1718
Bundle-ClassPath: .,
1819
resources/

0 commit comments

Comments
 (0)