JMC-6370: JMC build fails with OpenJDK 8 due to missing javafx packag…

…es in org.openjdk.jmc.javafx.osgi Summary: Updates dependency on OpenJFX to build on OpenJDK 8 Contributed-by: Jie Kang <[email protected]> Reviewed-by: ghb, Christoph Langer <[email protected]>
klaraward · Jan 29, 2019 · 771abcd · 771abcd
1 parent 4b0aa86
commit 771abcd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
@@ -93,13 +93,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.openjdk.jmc.javafx.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.openjdk.jmc.flightrecorder.rules.extensionprovider"
          download-size="0"

diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.rjmx,
  org.openjdk.jmc.flightrecorder;visibility:=reexport,
  org.openjdk.jmc.ui;visibility:=reexport,
- org.openjdk.jmc.javafx.osgi,
  org.openjdk.jmc.flightrecorder.rules,
  org.openjdk.jmc.flightrecorder.rules.jdk,
  org.openjdk.jmc.flightrecorder.configuration,

diff --git a/application/org.openjdk.jmc.javafx.osgi/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.javafx.osgi/META-INF/MANIFEST.MF
@@ -7,6 +7,12 @@ Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Eclipse-BuddyPolicy: app
+Import-Package: javafx.application,
+ javafx.embed.swt,
+ javafx.fxml,
+ javafx.scene,
+ javafx.scene.control,
+ javafx.scene.image
 Export-Package: org.openjdk.jmc.javafx.osgi
 Require-Bundle: org.eclipse.swt;resolution:=optional,
  org.eclipse.jface

diff --git a/application/org.openjdk.jmc.javafx.osgi/pom.xml b/application/org.openjdk.jmc.javafx.osgi/pom.xml
@@ -40,27 +40,4 @@
 	</parent>
 	<artifactId>org.openjdk.jmc.javafx.osgi</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<excludes>
-						<exclude>**/Empty.java</exclude>
-					</excludes>
-					<extraClasspathElements>
-						<dependency>
-							<groupId>sun.jdk</groupId>
-							<artifactId>jfxswt</artifactId>
-							<version>1.8.0</version>
-							<scope>system</scope>
-							<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
-						</dependency>
-					</extraClasspathElements>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>