Revert "Overload javafx:run goal to work with JavaFX 17 (#136)" (#140)

This reverts commit 88781ed.
openjfx · Oct 5, 2021 · 72c1ac0 · 72c1ac0
1 parent 95620eb
commit 72c1ac0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 326 deletions.
diff --git a/pom.xml b/pom.xml
@@ -63,11 +63,6 @@
       <artifactId>commons-exec</artifactId>
       <version>1.3</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-invoker</artifactId>
-      <version>2.2</version>
-    </dependency>
 
     <!--test-->
     <dependency>

diff --git a/src/main/java/org/openjfx/JavaFXRunFixMojo.java b/src/main/java/org/openjfx/JavaFXRunFixMojo.java
diff --git a/src/main/java/org/openjfx/JavaFXRunMojo.java b/src/main/java/org/openjfx/JavaFXRunMojo.java
@@ -44,13 +44,7 @@
 import static org.openjfx.model.RuntimePathOption.CLASSPATH;
 import static org.openjfx.model.RuntimePathOption.MODULEPATH;
 
-/**
- * Mojo to run a JavaFX application.
- * 
- * Mojo name change from 'run' to 'dorun' is temporary. It will be reverted
- * once JavaFX 17.x empty jars are available with Automatic-Module-Name.
- */
-@Mojo(name = "dorun", requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "run", requiresDependencyResolution = ResolutionScope.RUNTIME)
 @Execute(phase = LifecyclePhase.PROCESS_CLASSES)
 public class JavaFXRunMojo extends JavaFXBaseMojo {
 

diff --git a/src/main/java/org/openjfx/model/JavaFXDependency.java b/src/main/java/org/openjfx/model/JavaFXDependency.java
diff --git a/src/main/java/org/openjfx/model/JavaFXModule.java b/src/main/java/org/openjfx/model/JavaFXModule.java
diff --git a/src/test/java/org/openjfx/JavaFXRunMojoTestCase.java b/src/test/java/org/openjfx/JavaFXRunMojoTestCase.java
@@ -140,7 +140,7 @@ public void testClasspathNoLauncherRun() throws Exception {
     }
 
     protected JavaFXRunMojo getJavaFXRunMojo(File testPom) throws Exception {
-        JavaFXRunMojo mojo = (JavaFXRunMojo) lookupMojo("dorun", testPom);
+        JavaFXRunMojo mojo = (JavaFXRunMojo) lookupMojo("run", testPom);
         assertNotNull(mojo);
 
         setUpProject(testPom, mojo);