changeset 121:1a1a3bc8115b

JMC-6370: JMC build fails with OpenJDK 8 due to missing javafx packages in org.openjdk.jmc.javafx.osgi Summary: Updates dependency on OpenJFX to build on OpenJDK 8 Contributed-by: Jie Kang <jkang@redhat.com> Reviewed-by: ghb, Christoph Langer <christoph.langer@sap.com>
author jmatsuoka <jmatsuok@redhat.com>
date Tue, 29 Jan 2019 12:04:06 -0500
parents 2b0376cc5830
children 9f636610b5ae
files application/org.openjdk.jmc.feature.flightrecorder/feature.xml application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF application/org.openjdk.jmc.javafx.osgi/META-INF/MANIFEST.MF application/org.openjdk.jmc.javafx.osgi/pom.xml
diffstat 4 files changed, 6 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml	Mon Jan 28 16:45:17 2019 -0500
+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml	Tue Jan 29 12:04:06 2019 -0500
@@ -94,13 +94,6 @@
          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"
          install-size="0"
--- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF	Mon Jan 28 16:45:17 2019 -0500
+++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF	Tue Jan 29 12:04:06 2019 -0500
@@ -9,7 +9,6 @@
 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,
--- a/application/org.openjdk.jmc.javafx.osgi/META-INF/MANIFEST.MF	Mon Jan 28 16:45:17 2019 -0500
+++ b/application/org.openjdk.jmc.javafx.osgi/META-INF/MANIFEST.MF	Tue Jan 29 12:04:06 2019 -0500
@@ -7,6 +7,12 @@
 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
--- a/application/org.openjdk.jmc.javafx.osgi/pom.xml	Mon Jan 28 16:45:17 2019 -0500
+++ b/application/org.openjdk.jmc.javafx.osgi/pom.xml	Tue Jan 29 12:04:06 2019 -0500
@@ -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>