Skip to content

Commit

Permalink
HV-1608 When testing with JDK 11, download the JavaFX jars
Browse files Browse the repository at this point in the history
It is not pretty but it will do for now while we wait for them to be
available on Maven Central.
  • Loading branch information
gsmet committed Jun 14, 2018
1 parent c7525f4 commit 63623af
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 2 deletions.
17 changes: 16 additions & 1 deletion engine/pom.xml
Expand Up @@ -274,14 +274,29 @@
</build>
<profiles>
<profile>
<id>jdk9</id>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<surefire.jvm.args.illegal-access>--illegal-access=deny</surefire.jvm.args.illegal-access>
</properties>
</profile>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>net.java</groupId>
<artifactId>javafx-core</artifactId>
<version>11-ea+13</version>
<scope>system</scope>
<systemPath>${maven.multiModuleProjectDirectory}/target/javafx/javafx-sdk-11/lib/javafx.base.jar</systemPath>
</dependency>
</dependencies>
</profile>
<profile>
<id>sigtest</id>
<build>
Expand Down
37 changes: 36 additions & 1 deletion pom.xml
Expand Up @@ -156,7 +156,7 @@
<!-- JavaMoney dependencies -->
<version.javax.money>1.0.1</version.javax.money>
<version.org.javamoney.moneta>1.1</version.org.javamoney.moneta>
<!-- Used in the Karaf features file: it is a dependency of Moneta -->
<!-- Used in the Karaf features file: it is a dependency of Moneta, and for the documentation -->
<version.javax.annotation>1.2</version.javax.annotation>

<!-- Test dependencies -->
Expand Down Expand Up @@ -208,6 +208,7 @@
<version.dependency.plugin>3.0.2</version.dependency.plugin>
<version.depends.plugin>1.4.0</version.depends.plugin>
<version.deploy.plugin>2.8.2</version.deploy.plugin>
<version.download.plugin>1.4.0</version.download.plugin>
<version.enforcer.plugin>3.0.0-M1</version.enforcer.plugin>
<version.forbiddenapis.plugin>2.5</version.forbiddenapis.plugin>
<version.gmavenplus.plugin>1.6</version.gmavenplus.plugin>
Expand Down Expand Up @@ -960,6 +961,11 @@
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest.plugin}</version>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>${version.download.plugin}</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down Expand Up @@ -1217,6 +1223,35 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>install-javafx</id>
<phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://download.java.net/java/early_access/openjfx11/13/binaries/openjfx-11-ea+13_linux-x64_bin-sdk.zip</url>
<unpack>true</unpack>
<outputDirectory>${maven.multiModuleProjectDirectory}/target/javafx</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jqassistant</id>
<!--
Expand Down

0 comments on commit 63623af

Please sign in to comment.