From 041a7a5c1e02e47810c66cb49802329a5928483f Mon Sep 17 00:00:00 2001
From: Aaron Coburn <acoburn@apache.org>
Date: Mon, 10 Aug 2020 09:16:52 -0400
Subject: [PATCH] Update OpenLiberty plugin to 3.0 (#1010)

---
 platform/openliberty/build.gradle | 16 +++++++++++++---
 settings.gradle                   |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/platform/openliberty/build.gradle b/platform/openliberty/build.gradle
index 6bd60e8e3..ccfb53728 100644
--- a/platform/openliberty/build.gradle
+++ b/platform/openliberty/build.gradle
@@ -1,8 +1,19 @@
+// OpenLiberty requires using the legacy plugin management mechanism
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'io.openliberty.tools:liberty-gradle-plugin:3.0'
+    }
+}
+
 plugins {
     id "war"
-    id "net.wasdev.wlp.gradle.plugins.Liberty"
 }
 
+apply plugin: 'liberty'
+
 ext {
     appName = "trellis"
     testServerHttpPort = 9080
@@ -66,7 +77,7 @@ dependencies {
 liberty {
     server {
         name = "${appName}"
-        configFile = file("src/main/liberty/config/server.xml")
+        serverXmlFile = file("src/main/liberty/config/server.xml")
         bootstrapProperties = ['default.http.port': testServerHttpPort,
                                'default.https.port': testServerHttpsPort,
                                'trellis.triplestore.rdf-location': 'data/resources',
@@ -74,7 +85,6 @@ liberty {
                                'trellis.file.binary-path': 'data/binary',
                                'app.context.root': warContext]
         packageLiberty {
-            archive = "$buildDir/${appName}.zip"
             include = "usr"
         }
     }
diff --git a/settings.gradle b/settings.gradle
index 783d6baca..acf430214 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,6 @@ pluginManagement {
         id 'biz.aQute.bnd.builder' version "4.1.0"
         id 'info.solidsoft.pitest' version "1.5.1"
         id 'io.quarkus' version "1.7.0.Final"
-        id "net.wasdev.wlp.gradle.plugins.Liberty" version "2.7"
     }
 }