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
Ericsson · Sep 4, 2019 · 43e3e89 · 43e3e89
1 parent c030675
commit 43e3e89
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 43 deletions.
diff --git a/readme.md b/readme.md
@@ -8,9 +8,10 @@ This is a C/C++ code analysis plugin for Eclipse that shows bugs detected by the
 
 * 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
@@ -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>
 

diff --git 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 @@
 <?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"/>
@@ -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>
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
@@ -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
@@ -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>
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
@@ -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/