From 1340622364a3489a12a93c25267509fd3ea1f322 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Wed, 2 Jun 2021 14:47:58 +0530 Subject: [PATCH 1/4] Rename Client to GluonFX --- README.md | 12 ++++++------ pom.xml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4e923b6..47580ef 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Gluon Client plugin for Maven +# GluonFX plugin for Maven -The Gluon Client plugin for maven projects leverages GraalVM, OpenJDK and JavaFX 11+, +GluonFX plugin for maven leverages GraalVM, OpenJDK and JavaFX 11+, by compiling into native code the Java Client application and all its required dependencies, so it can directly be executed as a native application on the target platform. [![Maven Central](https://img.shields.io/maven-central/v/com.gluonhq/client-maven-plugin)](https://search.maven.org/search?q=g:com.gluonhq%20AND%20a:client-maven-plugin) -[![Travis CI](https://api.travis-ci.org/gluonhq/client-maven-plugin.svg?branch=master)](https://travis-ci.org/gluonhq/client-maven-plugin) +[![Github Actions](https://github.com/gluonhq/client-maven-plugin/actions/workflows/build.yml/badge.svg)](https://github.com/gluonhq/client-maven-plugin/actions/workflows/build.yml) [![BSD-3 license](https://img.shields.io/badge/license-BSD--3-%230778B9.svg)](https://opensource.org/licenses/BSD-3-Clause) ## Requirements @@ -22,7 +22,7 @@ Check the [documentation](https://docs.gluonhq.com/) for more details about the ## Issues and Contributions ## -Issues can be reported to the [Issue tracker](https://github.com/gluonhq/client-maven-plugin/issues) +Issues can be reported to the [Issue tracker](https://github.com/gluonhq/gluonfx-maven-plugin/issues) -Contributions can be submitted via [Pull requests](https://github.com/gluonhq/client-maven-plugin/pulls), -providing you have signed the [Gluon Individual Contributor License Agreement (CLA)](https://docs.google.com/forms/d/16aoFTmzs8lZTfiyrEm8YgMqMYaGQl0J8wA0VJE2LCCY). +Contributions can be submitted via [Pull requests](https://github.com/gluonhq/gluonfx-maven-plugin/pulls), +providing you have signed the [Gluon Individual Contributor License Agreement (CLA)](https://cla.gluonhq.com). diff --git a/pom.xml b/pom.xml index a852fe9..3f273f3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,13 +32,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.gluonhq - client-maven-plugin + gluonfx-maven-plugin maven-plugin - 0.1.42-SNAPSHOT - client-maven-plugin Maven Mojo - The Gluon Client Plugin is used to run JavaFX 11+ projects with Graal + 1.0.0-SNAPSHOT + gluonfx-maven-plugin Maven Mojo + GluonFX plugin creates native images for JavaFX application 2019 - https://github.com/gluonhq/client-maven-plugin + https://github.com/gluonhq/gluonfx-maven-plugin UTF-8 @@ -241,7 +241,7 @@ GitHub - https://github.com/gluonhq/client-maven-plugin/issues + https://github.com/gluonhq/gluonfx-maven-plugin/issues @@ -268,9 +268,9 @@ - https://github.com/gluonhq/client-maven-plugin - scm:git:git://github.com/gluonhq/client-maven-plugin.git - scm:git:ssh://git@github.com:gluonhq/client-maven-plugin.git + https://github.com/gluonhq/gluonfx-maven-plugin + scm:git:git://github.com/gluonhq/gluonfx-maven-plugin.git + scm:git:ssh://git@github.com:gluonhq/gluonfx-maven-plugin.git From 59437781ddffada0c4b1927cdec26892bd86ac86 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Wed, 2 Jun 2021 20:01:59 +0530 Subject: [PATCH 2/4] Update version and description --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3f273f3..9ab3225 100644 --- a/pom.xml +++ b/pom.xml @@ -34,9 +34,9 @@ com.gluonhq gluonfx-maven-plugin maven-plugin - 1.0.0-SNAPSHOT + 0.9.0-SNAPSHOT gluonfx-maven-plugin Maven Mojo - GluonFX plugin creates native images for JavaFX application + GluonFX plugin allows to run JavaFX application on the JVM or to create their native images. 2019 https://github.com/gluonhq/gluonfx-maven-plugin From a7196fc95a2a3c324730a350eef4143517a4c646 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Thu, 3 Jun 2021 09:39:14 +0530 Subject: [PATCH 3/4] Replace 'client' with 'gluonfx' --- src/main/java/com/gluonhq/NativeBaseMojo.java | 2 +- src/main/java/com/gluonhq/NativeBuildMojo.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gluonhq/NativeBaseMojo.java b/src/main/java/com/gluonhq/NativeBaseMojo.java index 3d6e9db..8dea887 100644 --- a/src/main/java/com/gluonhq/NativeBaseMojo.java +++ b/src/main/java/com/gluonhq/NativeBaseMojo.java @@ -133,7 +133,7 @@ public SubstrateDispatcher createSubstrateDispatcher() throws IOException, MojoE if (getGraalvmHome().isEmpty()) { throw new MojoExecutionException("GraalVM installation directory not found." + " Either set GRAALVM_HOME as an environment variable or" + - " set graalvmHome in client-plugin configuration"); + " set graalvmHome in gluonfx-plugin configuration"); } ProjectConfiguration substrateConfiguration = createSubstrateConfiguration(); return new SubstrateDispatcher(outputDir.toPath(), substrateConfiguration); diff --git a/src/main/java/com/gluonhq/NativeBuildMojo.java b/src/main/java/com/gluonhq/NativeBuildMojo.java index 708ebfb..6c38593 100644 --- a/src/main/java/com/gluonhq/NativeBuildMojo.java +++ b/src/main/java/com/gluonhq/NativeBuildMojo.java @@ -72,14 +72,14 @@ public void execute() throws MojoExecutionException { invocationRequest.setPomFile(new File(pom)); - invocationRequest.setGoals(Arrays.asList("client:compile", "client:link")); + invocationRequest.setGoals(Arrays.asList("gluonfx:compile", "gluonfx:link")); final Invoker invoker = new DefaultInvoker(); // execute: try { final InvocationResult invocationResult = invoker.execute(invocationRequest); if (invocationResult.getExitCode() != 0) { - throw new MojoExecutionException("Error, client:build failed", invocationResult.getExecutionException()); + throw new MojoExecutionException("Error, gluonfx:build failed", invocationResult.getExecutionException()); } } catch (MavenInvocationException e) { e.printStackTrace(); From 566db0c4318572e7b12907834d046dad751be964 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Thu, 3 Jun 2021 14:02:50 +0530 Subject: [PATCH 4/4] Use 'gluonfx' in directory and parameters --- src/main/java/com/gluonhq/NativeBaseMojo.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gluonhq/NativeBaseMojo.java b/src/main/java/com/gluonhq/NativeBaseMojo.java index 8dea887..912afaa 100644 --- a/src/main/java/com/gluonhq/NativeBaseMojo.java +++ b/src/main/java/com/gluonhq/NativeBaseMojo.java @@ -79,52 +79,52 @@ public abstract class NativeBaseMojo extends AbstractMojo { @Parameter(readonly = true, required = true, defaultValue = "${basedir}") File basedir; - @Parameter(property = "client.graalvmHome") + @Parameter(property = "gluonfx.graalvmHome") String graalvmHome; - @Parameter(property = "client.javaStaticSdkVersion") + @Parameter(property = "gluonfx.javaStaticSdkVersion") String javaStaticSdkVersion; - @Parameter(property = "client.javafxStaticSdkVersion") + @Parameter(property = "gluonfx.javafxStaticSdkVersion") String javafxStaticSdkVersion; - @Parameter(property = "client.target", defaultValue = "host") + @Parameter(property = "gluonfx.target", defaultValue = "host") String target; - @Parameter(property = "client.bundlesList") + @Parameter(property = "gluonfx.bundlesList") List bundlesList; - @Parameter(property = "client.resourcesList") + @Parameter(property = "gluonfx.resourcesList") List resourcesList; - @Parameter(property = "client.reflectionList") + @Parameter(property = "gluonfx.reflectionList") List reflectionList; - @Parameter(property = "client.jniList") + @Parameter(property = "gluonfx.jniList") List jniList; - @Parameter(property = "client.nativeImageArgs") + @Parameter(property = "gluonfx.nativeImageArgs") List nativeImageArgs; - @Parameter(readonly = true, required = true, defaultValue = "${project.build.directory}/client") + @Parameter(readonly = true, required = true, defaultValue = "${project.build.directory}/gluonfx") File outputDir; - @Parameter(property = "client.mainClass", required = true) + @Parameter(property = "gluonfx.mainClass", required = true) String mainClass; - @Parameter(property = "client.executable", defaultValue = "java") + @Parameter(property = "gluonfx.executable", defaultValue = "java") String executable; - @Parameter(property = "client.verbose", defaultValue = "false") + @Parameter(property = "gluonfx.verbose", defaultValue = "false") String verbose; - @Parameter(property = "client.attachList") + @Parameter(property = "gluonfx.attachList") List attachList; - @Parameter(property = "client.enableSWRendering", defaultValue = "false") + @Parameter(property = "gluonfx.enableSWRendering", defaultValue = "false") String enableSWRendering; - @Parameter(property = "client.releaseConfiguration") + @Parameter(property = "gluonfx.releaseConfiguration") ReleaseConfiguration releaseConfiguration; private ProcessDestroyer processDestroyer;