Merge pull request #260 from aguibert/update-200010

Update dependencies for 2020

auth-service/build.gradle

@@ -7,9 +7,8 @@ ext {
 liberty {
 	server {
 		name = 'auth-service'
-		dropins = [war]
+		deploy.dropins = [war]
 		bootstrapProperties = ['httpPort': httpPort, 'httpsPort': httpsPort]
-		configDirectory = file('src/main/liberty/config')
 	}
 }
 

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'net.wasdev.wlp.gradle.plugins:liberty-gradle-plugin:2.6.5'
+        classpath 'io.openliberty.tools:liberty-gradle-plugin:3.0'
     }
 }
 
@@ -57,7 +57,7 @@ subprojects {
             mavenCentral()
         }
         dependencies {
-            classpath 'net.wasdev.wlp.gradle.plugins:liberty-gradle-plugin:2.6.5'
+            classpath 'io.openliberty.tools:liberty-gradle-plugin:3.0'
         }
     }
 
@@ -68,9 +68,9 @@ subprojects {
     dependencies {
         providedCompile group: 'org.eclipse.microprofile', name: 'microprofile', version: '3.0'
         providedCompile group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0'
-        testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile group: 'org.eclipse', name: 'yasson', version: '1.0.5'
-        libertyRuntime group: 'io.openliberty', name: 'openliberty-runtime', version: '19.0.0.9'
+        testCompile group: 'junit', name: 'junit', version: '4.13.1'
+        testCompile group: 'org.eclipse', name: 'yasson', version: '1.0.8'
+        libertyRuntime group: 'io.openliberty', name: 'openliberty-runtime', version: '20.0.0.10'
     }
     
     eclipse {

frontend/build.gradle

@@ -15,7 +15,7 @@ war {
 }
 
 node {
-	version = '10.16.3'
+	version = '10.19.0'
 	npmVersion = '6.9.0'
 	download = true
 	workDir = file("${rootDir}/frontend/prebuild/node")
@@ -86,8 +86,7 @@ libertyStart.doLast {
 liberty {
 	server {
 		name = 'frontendServer'
-		apps = [war]
+		deploy.apps = [war]
 		bootstrapProperties = ['httpPort': httpPort, 'httpsPort': httpsPort, 'application.name': applicationName]
-		configDirectory = file('src/main/liberty/config')
 	}
 }

game-service/build.gradle

@@ -11,9 +11,8 @@ ext {
 liberty {
 	server {
 		name = 'game-service'
-		dropins = [war]
+		deploy.dropins = [war]
 		bootstrapProperties = ['httpPort': httpPort, 'httpsPort': httpsPort]
-		configDirectory = file('src/main/liberty/config')
 		jvmOptions = ['-DsingleParty=' + System.getProperty('singleParty', 'true')]
 	}
 }

player-service/build.gradle

@@ -7,8 +7,7 @@ ext {
 liberty {
 	server {
 		name = 'player-service'
-		dropins = [war]
-		configDirectory = file('src/main/liberty/config')
+		deploy.dropins = [war]
 		bootstrapProperties = ['httpPort': httpPort, 'httpsPort': httpsPort]
 	}
 }
@@ -34,7 +33,7 @@ task addPostgresqlToBuild(type: Copy) {
 }
 
 assemble.dependsOn 'addPostgresqlToBuild'
-installApps.dependsOn 'addPostgresqlToServer'
+deploy.dependsOn 'addPostgresqlToServer'
 
 // The installLiberty task doesn't work when run in parallel with other installLiberty tasks
 installLiberty.mustRunAfter ':frontend:installLiberty'

player-service/src/main/liberty/config/server.xml

@@ -22,13 +22,11 @@
 	  <requestUrl urlPattern="/ibm/api" matchType="notContain"/>
     </authFilter>
 	
-	<!-- uncomment these once liberty-gradle-plugin v2.7 is released
 	<variable name="DB_HOST" defaultValue="localhost"/>
 	<variable name="DB_PORT" defaultValue="5432"/>
 	<variable name="DB_NAME" defaultValue="playerdb"/>
 	<variable name="DB_USER" defaultValue="lb_user"/>
 	<variable name="DB_PASS" defaultValue="lb_password"/>
-	 -->
 	
 	<library id="postgresql">
         <fileset dir="postgresql"/>
@@ -36,8 +34,9 @@
 
     <dataSource id="DefaultDataSource">
         <jdbcDriver libraryRef="postgresql"/>
-        <properties.postgresql serverName="localhost" portNumber="5432" databaseName="playerdb"
-                               user="lb_user" password="lb_password"/>
+        <properties.postgresql serverName="${DB_HOST}" portNumber="${DB_PORT}" 
+                               databaseName="${DB_NAME}"
+                               user="${DB_USER}" password="${DB_PASS}"/>
     </dataSource>
 
     <applicationManager autoExpand="true"/>
@@ -61,6 +60,4 @@
     
     <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="${httpPort}" httpsPort="${httpsPort}" />
                   
-    <applicationManager autoExpand="true"/>
-
 </server>