ECOSYS-142 Upgrade to Gradle version 6.x

payara · Apr 16, 2020 · 88cdc3c · 88cdc3c
1 parent 24b2629
commit 88cdc3c
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 114 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/payara-micro-gradle-plugin/build.gradle b/payara-micro-gradle-plugin/build.gradle
@@ -1,11 +1,10 @@
 plugins {
     id 'com.gradle.plugin-publish' version '0.11.0'
     id 'maven-publish'
+    id 'java'
+    id 'java-gradle-plugin'
 }
 
-apply plugin: 'java'
-apply plugin: "com.gradle.plugin-publish"
-
 group = 'fish.payara.gradle.plugins'
 version = '1.0.4-SNAPSHOT'
 
@@ -18,10 +17,11 @@ repositories {
 }
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
-    compile 'commons-io:commons-io:2.6'
-    compile 'org.apache.commons:commons-lang3:3.10'
+    api gradleApi()
+    api localGroovy()
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'org.apache.commons:commons-lang3:3.10'
+    testImplementation gradleTestKit()
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
     testImplementation 'org.awaitility:awaitility:4.0.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'

diff --git a/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/AbstractTask.java b/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/AbstractTask.java
@@ -48,13 +48,17 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.internal.ConventionTask;
 import org.gradle.api.plugins.WarPlugin;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.bundling.War;
 import org.slf4j.Logger;
 
@@ -78,10 +82,12 @@ public void setProject(Project project) {
         this.project = project;
     }
 
+    @Input
     protected String getProjectGAV() {
         return (String) project.getGroup() + ":" + project.getName() + ":" + (String) project.getVersion();
     }
 
+    @Input
     public boolean isSkip() {
         return skip;
     }
@@ -99,27 +105,47 @@ protected Optional<String> getPayaraMicroPath(String version) {
                 .map(File::getAbsolutePath);
     }
 
-    protected War getWar() {
+    @Internal
+    protected War getWarTask() {
         return (War) project.getTasks().getByName(WarPlugin.WAR_TASK_NAME);
     }
+
+    @Internal
+    protected Optional<File> getWarArchive() {
+        if (getWarTask().getArchiveFile().isPresent()) {
+            return Optional.of(getWarTask().getArchiveFile().get().getAsFile());
+        } else {
+            return Optional.empty();
+        }
+    }
 
+    @Internal
     protected String getWarPath() {
-        return getWar().getArchivePath().getAbsolutePath();
+        return getWarArchive()
+                .map(File::getAbsolutePath)
+                .orElseThrow(() -> new IllegalStateException("WarArchive not found"));
     }
 
+    @Internal
     protected String getExplodedWarPath() {
-        return getWar().getArchivePath().getParent() 
+        return getWarArchive()
+                .map(File::getParent)
+                .orElseThrow(() -> new IllegalStateException("WarArchive not found"))
                 + File.separator 
-                + FilenameUtils.getBaseName(getWar().getArchiveName());
+                + FilenameUtils.getBaseName(getWarArchive().map(File::getName).get());
     }
 
+    @OutputFile
     protected File getUberJar() {
         return new File(getUberJarPath());
     }
 
+    @Internal
     protected String getUberJarPath() {
-        return getWar()
-                .getArchivePath()
+        return getWarTask()
+                .getArchiveFile()
+                .get()
+                .getAsFile()
                 .getAbsolutePath()
                 .replace("." + WAR_EXTENSION, "-" + MICROBUNDLE_EXTENSION + "." + JAR_EXTENSION);
     }
@@ -148,6 +174,7 @@ protected void closeMicroProcess() {
         }
     }
 
+    @Internal
     public abstract Logger getLog();
-
+    
 }
diff --git a/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/BundleTask.java b/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/BundleTask.java
@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -113,12 +114,4 @@ public Logger getLog() {
         return LOG;
     }
 
-    public String getPayaraVersion() {
-        return payaraVersion;
-    }
-
-    public String getJavaPath() {
-        return javaPath;
-    }
-
 }
diff --git a/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/Configuration.java b/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/Configuration.java
@@ -44,7 +44,7 @@ public interface Configuration {
     String MICRO_THREAD_NAME = "PayaraMicroThread";
     String MICRO_READY_MESSAGE = "ready in";
 
-    String DEFAULT_MICRO_VERSION = "5.193";
+    String DEFAULT_MICRO_VERSION = "5.201";
 
     String JAR_EXTENSION = "jar";
     String WAR_EXTENSION = "war";

diff --git a/...micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/PayaraMicroPlugin.java b/...micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/PayaraMicroPlugin.java
@@ -51,7 +51,6 @@
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.MavenPlugin;
 import org.gradle.api.plugins.WarPlugin;
 import org.gradle.api.tasks.bundling.War;
 
@@ -65,19 +64,19 @@ public class PayaraMicroPlugin implements Plugin<Project> {
     public void apply(Project project) {
         this.project = project;
         project.getPluginManager().apply(JavaPlugin.class);
-        project.getPluginManager().apply(MavenPlugin.class);
         project.getPluginManager().apply(WarPlugin.class);
         StartTask startTask = createMicroStartTask();
         StopTask stopTask = createMicroStopTask();
         BundleTask bundleTask = createMicroBundleTask();
         ReloadTask reloadTask = createMicroReloadTask();
+        ExplodeWarTask explodeWarTask = createMicroExplodeWarTask();
         PayaraMicroExtension extension = createExtension();
         project.afterEvaluate(prj -> {
             startTask.configure(extension);
             stopTask.configure(extension);
             bundleTask.configure(extension);
             reloadTask.configure(extension);
-            createExplodeWarTask();
+            configureExplodeWarTask();
         });
     }
 
@@ -107,17 +106,22 @@ private StopTask createMicroStopTask() {
     private ReloadTask createMicroReloadTask() {
         return createTask(ReloadTask.RELOAD_TASK_NAME, ReloadTask.RELOAD_TASK_DESCRIPTION, ReloadTask.class);
     }
+
+
+    private ExplodeWarTask createMicroExplodeWarTask() {
+        return createTask(ExplodeWarTask.EXPLODE_TASK_NAME, ExplodeWarTask.EXPLODE_TASK_DESCRIPTION, ExplodeWarTask.class);
+    }
 
-    private ExplodeWarTask createExplodeWarTask() {
+    ExplodeWarTask configureExplodeWarTask() {
         ExplodeWarTask task = null;
         War war = (War) project.getTasks().getByName(WarPlugin.WAR_TASK_NAME);
-        if (war != null) {
-            task = createTask(EXPLODE_TASK_NAME, EXPLODE_TASK_DESCRIPTION, ExplodeWarTask.class);
+        if (war != null && war.getArchiveFile().isPresent()) {
+            task = (ExplodeWarTask) project.getTasks().getByName(ExplodeWarTask.EXPLODE_TASK_NAME);
             task.dependsOn(war);
-            task.setWarFile(war.getArchivePath().toPath());
+            task.setWarFile(war.getArchiveFile().get().getAsFile().toPath());
             task.setExplodedWarDirectory(
-                    war.getArchivePath().getParentFile().toPath().resolve(
-                            FilenameUtils.getBaseName(war.getArchiveName())
+                    war.getArchiveFile().get().getAsFile().getParentFile().toPath().resolve(
+                            FilenameUtils.getBaseName(war.getArchiveFileName().get())
                     )
             );
         }

diff --git a/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/StartTask.java b/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/StartTask.java
@@ -172,7 +172,7 @@ public void onStart() {
                     }
                 }
             }
-            System.out.println("args " + actualArgs);
+            getLog().info("Execution arguments " + actualArgs);
             try {
                 final Runtime re = Runtime.getRuntime();
                 microProcess = re.exec(actualArgs.toArray(new String[actualArgs.size()]));
@@ -296,40 +296,4 @@ String decideOnWhichMicroToUse() {
         throw exception;
     }
 
-    public boolean isImmediateExit() {
-        return immediateExit;
-    }
-
-    public boolean isDaemon() {
-        return daemon;
-    }
-
-    public String getJavaPath() {
-        return javaPath;
-    }
-
-    public boolean isUseUberJar() {
-        return useUberJar;
-    }
-
-    public boolean isDeployWar() {
-        return deployWar;
-    }
-
-    public String getPayaraMicroAbsolutePath() {
-        return payaraMicroAbsolutePath;
-    }
-
-    public String getPayaraVersion() {
-        return payaraVersion;
-    }
-
-    public Map<String, Object> getJavaCommandLineOptions() {
-        return javaCommandLineOptions;
-    }
-
-    public Map<String, Object> getCommandLineOptions() {
-        return commandLineOptions;
-    }
-
 }
diff --git a/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/StopTask.java b/payara-micro-gradle-plugin/src/main/java/fish/payara/gradle/plugins/micro/StopTask.java
@@ -44,6 +44,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import org.apache.commons.lang3.StringUtils;
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,7 +62,7 @@ public class StopTask extends AbstractTask {
     private String processId;
 
     private boolean useUberJar;
-
+    
     @Override
     public void configure(PayaraMicroExtension extension) {
         this.skip = extension.isSkip();
@@ -159,12 +160,9 @@ public Logger getLog() {
         return LOG;
     }
 
-    public String getProcessId() {
+    @Internal
+    String getProcessId() {
         return processId;
     }
 
-    public boolean isUseUberJar() {
-        return useUberJar;
-    }
-
 }