gradle: fixed automatic npm build

This commit is contained in:
Timo Volkmann 2019-03-20 00:27:23 +01:00
parent 7d8b75a2b3
commit 4ed56cff9f
2 changed files with 10 additions and 13 deletions

View File

@ -26,8 +26,8 @@
<orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.springframework.boot:spring-boot-devtools:2.1.3.RELEASE" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.springframework.boot:spring-boot-devtools:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: mysql:mysql-connector-java:8.0.15" level="project" />
<orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: mysql:mysql-connector-java:8.0.15" level="project" />
<orderEntry type="library" name="Gradle: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" /> <orderEntry type="library" name="Gradle: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
<orderEntry type="library" name="Gradle: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: org.springframework:spring-web:5.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework:spring-web:5.1.5.RELEASE" level="project" />

View File

@ -1,12 +1,12 @@
plugins { plugins {
id 'org.springframework.boot' version '2.1.3.RELEASE' id 'org.springframework.boot' version '2.1.3.RELEASE'
id 'java' id 'java'
id "com.liferay.node" version "4.6.7" id "com.moowork.node" version "1.3.1"
} }
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'com.liferay.node' apply plugin: 'com.moowork.node'
group = 'de.hhn.labsw' group = 'de.hhn.labsw'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
@ -24,19 +24,16 @@ dependencies {
} }
node { node {
nodeVersion = '11.12.0' version = '11.12.0'
npmVersion = '6.9.0' npmVersion = '6.9.0'
download = true download = true
} }
import com.liferay.gradle.plugins.node.tasks.NpmInstallTask tasks.withType(NpmTask) {
import com.liferay.gradle.plugins.node.tasks.NpmRunTask execOverrides {
it.workingDir = 'frontend'
task nodeInstall(type: NpmInstallTask) { }
workingDir 'frontend'
} }
task frontend(type: NpmRunTask) { assemble.dependsOn npm_install
scriptName 'build' assemble.dependsOn npm_run_build
workingDir 'frontend'
}