Switch back to Yarn

1 files changed, 14 insertions, 14 deletions

diff --git a/build.gradle b/build.gradle
index 5cfa3d9f..a3d1359b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,25 +46,25 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.github.swagger2markup'
 apply plugin: 'org.asciidoctor.convert'
 
-task npm(type: Exec) {
-    inputs.file('package-lock.json')
-    outputs.file('package-lock.json')
+task yarn(type: Exec) {
+    inputs.file('yarn.lock')
+    outputs.file('yarn.lock')
     if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
-        commandLine 'cmd', '/c', 'npm', 'ci'
+        commandLine 'cmd', '/c', 'yarn'
     } else {
-        commandLine 'npm', 'ci'
+        commandLine 'yarn'
     }
 }
 
-task npmCompile(type: Exec) {
+task yarnCompile(type: Exec) {
     inputs.files(fileTree('node_modules'))
     inputs.files(fileTree('src'))
     inputs.file('webpack.config.js')
     outputs.dir('src/main/resources/static')
     if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
-        commandLine 'cmd', '/c', 'npm', 'run', 'compile'
+        commandLine 'cmd', '/c', 'yarn', 'compile'
     } else {
-        commandLine 'npm', 'run', 'compile'
+        commandLine 'yarn', 'compile'
     }
 }
 
@@ -124,7 +124,7 @@ dependencies {
     compile ("org.springframework.boot:spring-boot-starter-actuator")
     compile ('org.springframework.boot:spring-boot-devtools')
 
-    compile 'org.flywaydb:flyway-core:6.4.0'
+    compile 'org.flywaydb:flyway-core:6.4.1'
     compile 'com.github.ben-manes.caffeine:caffeine:2.8.2'
 
     compile "javax.inject:javax.inject:1"
@@ -139,7 +139,7 @@ dependencies {
     compile "commons-codec:commons-codec:1.14"
     compile "commons-io:commons-io:2.6"
     
-    compile 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
+    compile 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
     compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.5'
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
@@ -166,7 +166,7 @@ dependencies {
     runtime 'com.h2database:h2:1.4.200'
 
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
-    compile 'io.pebbletemplates:pebble-spring5:3.1.2'
+    compile 'io.pebbletemplates:pebble-spring5:3.1.3'
     compile 'com.atlassian.commonmark:commonmark:0.14.0'
     compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.14.0'
     compile 'org.tomitribe:tomitribe-http-signatures:1.3'
@@ -179,7 +179,7 @@ dependencies {
     compile 'com.nimbusds:nimbus-jose-jwt:8.16'
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
-    testCompile('net.sourceforge.htmlunit:htmlunit:2.39.1')
+    testCompile('net.sourceforge.htmlunit:htmlunit:2.40.0')
     testCompile('org.springframework.security:spring-security-test')
     testCompile("ch.vorburger.mariaDB4j:mariaDB4j:2.4.0")
 
@@ -195,8 +195,8 @@ bootRun {
     sourceResources sourceSets.main
 }
 
-npmCompile.dependsOn 'npm'
-processResources.dependsOn 'npmCompile'
+yarnCompile.dependsOn 'yarn'
+processResources.dependsOn 'yarnCompile'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11