johndevsGH-532 Upgrade to payara-micro 5.183

ilx · Nov 7, 2018 · 43a963a · 43a963a
1 parent 071e07c
commit 43a963a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,18 +75,20 @@ dependencies {
     compile "org.eclipse.jetty:jetty-deploy:${project.property('jetty.version')}"
 
     //Payara application server
-    compile "fish.payara.extras:payara-embedded-web:${project.property('payara.version')}"
+    compile "fish.payara.extras:payara-micro:${project.property('payara.version')}"
 
     // For GET requests
     compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
 
     // Sass compilation with libSass
     compile "io.bit3:jsass:${project.property('jsass.version')}"
 
+    compile "javax.validation:validation-api:2.0.0.Final"
+
     deploy 'org.apache.maven.wagon:wagon-ssh:2.2'
 
     testCompile gradleTestKit()
-    testCompile 'junit:junit:4.13-SNAPSHOT'
+    testCompile 'junit:junit:4.12'
 
     // ProxyTest needs its own special configuration to avoid conflicts
     proxyTest ('org.mock-server:mockserver-netty:3.10.4') {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 jetty.version=9.4.5.v20170502
-payara.version=4.1.153
+payara.version=5.183
 jruby.version=9.1.10.0
 jsass.version=5.5.1
 servlet.version=3.1.0

diff --git a/src/main/groovy/com/devsoap/plugin/servers/PayaraApplicationServer.groovy b/src/main/groovy/com/devsoap/plugin/servers/PayaraApplicationServer.groovy
@@ -121,7 +121,7 @@ class PayaraApplicationServer extends ApplicationServer {
     @Override
     void defineDependecies(DependencyHandler projectDependencies, DependencySet dependencies) {
         Dependency payaraWebProfile = projectDependencies.create(
-                "fish.payara.extras:payara-embedded-web:${Util.pluginProperties.getProperty('payara.version')}")
+                "fish.payara.extras:payara-micro:${Util.pluginProperties.getProperty('payara.version')}")
         dependencies.add(payaraWebProfile)
     }
 

diff --git a/src/main/java/com/devsoap/plugin/PayaraServerRunner.java b/src/main/java/com/devsoap/plugin/PayaraServerRunner.java
@@ -15,16 +15,13 @@
  */
 package com.devsoap.plugin;
 
-import org.glassfish.embeddable.BootstrapProperties;
-import org.glassfish.embeddable.Deployer;
-import org.glassfish.embeddable.GlassFish;
-import org.glassfish.embeddable.GlassFishProperties;
-import org.glassfish.embeddable.GlassFishRuntime;
-
 import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import fish.payara.micro.PayaraMicro;
+import fish.payara.micro.PayaraMicroRuntime;
+
 /**
  * Runner for payara
  *
@@ -49,25 +46,16 @@ public static void main(String[] args) throws Exception {
         LOGGER.log(Level.INFO, "Starting Payara web server...");
 
         try {
-
-            BootstrapProperties bootstrap = new BootstrapProperties();
-
-            GlassFishRuntime runtime = GlassFishRuntime.bootstrap(bootstrap,
-                    PayaraServerRunner.class.getClass().getClassLoader());
-
-            GlassFishProperties glassfishProperties = new GlassFishProperties();
-            glassfishProperties.setPort("http-listener", port);
+            PayaraMicro micro = PayaraMicro.getInstance();
+            micro.setHttpPort(port);
             LOGGER.log(Level.INFO, "Running on port "+port);
 
-            GlassFish glassfish = runtime.newGlassFish(glassfishProperties);
-            glassfish.start();
-
-            Deployer deployer = glassfish.getDeployer();
-
             File work = new File(workdir);
             File explodedWar = new File(work, "war");
+//            PayaraMicro.setUpackedJarDir(explodedWar);
 
-            deployer.deploy(explodedWar, "--contextroot=");
+            PayaraMicroRuntime runtime = micro.bootstrap();
+            runtime.deploy(explodedWar);
 
         } catch (Exception ex){
             LOGGER.log(Level.SEVERE, "Failed to start Payara server", ex);