规范工程名称
diff --git a/build.gradle b/build.gradle
index 4152d81..d572218 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,41 @@
plugins {
- id 'war'
+ id 'java'
id 'org.springframework.boot'
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.plugin.jpa'
id 'org.jetbrains.kotlin.plugin.spring'
+ id "com.palantir.git-version" version "0.12.0-rc2"
+ id 'com.palantir.docker' version '0.22.1'
}
-
apply plugin: 'io.spring.dependency-management'
group = 'com.supwisdom'
-version = payapiVersion
+version = restaurantVersion
sourceCompatibility = jdkVersion
+restaurantVersion = gitVersion()
-war {
+def startClass = 'com.supwisdom.dlpay.RestaurantApplicationKt'
+
+bootJar {
+ mainClassName = startClass
manifest {
- attributes('Payapi-Version': rootProject.version)
- writeTo(project.buildDir.toString() + "/classes/MATE-INF.MF")
+ attributes('Restaurant-Version': restaurantVersion)
}
}
+jar {
+ baseName = 'restaurant'
+}
+
+docker {
+ name 'harbor.supwisdom.com/dali/restaurant:' + version
+ println(jar.archivePath)
+ files jar.archivePath
+}
+
repositories {
mavenCentral()
maven {
@@ -39,9 +53,9 @@
compile group: 'org.apache.poi', name: 'poi', version: '3.10.1'
compile group: 'org.apache.poi', name: 'poi-examples', version: '3.10.1'
compile group: 'org.apache.poi', name: 'poi-excelant', version: '3.10.1'
- compile group: 'org.apache.poi',name: 'poi-ooxml', version:'3.10.1'
- compile group: 'org.apache.poi',name: 'poi-ooxml-schemas', version:'3.10.1'
- compile group: 'org.apache.poi',name: 'poi-scratchpad', version:'3.10.1'
+ compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.10.1'
+ compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: '3.10.1'
+ compile group: 'org.apache.poi', name: 'poi-scratchpad', version: '3.10.1'
compile 'com.supwisdom:payapi-sdk:e4bf762'
implementation 'org.springframework.boot:spring-boot-devtools'
@@ -69,15 +83,12 @@
implementation group: 'taglibs', name: 'standard', version: '1.1.2'
implementation group: 'commons-codec', name: 'commons-codec', version: '1.6'
implementation 'org.apache.commons:commons-lang3:3.9'
-// implementation 'org.flywaydb:flyway-core'
-// implementation group: 'javax.servlet.jsp', name: 'jsp-api', version: '2.1'
implementation group: 'log4j', name: 'log4j', version: '1.2.16'
implementation files('libs/ojdbc6.jar')
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
- providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.rest-assured:rest-assured:3.3.0'
testImplementation 'io.rest-assured:spring-mock-mvc:3.3.0'
@@ -90,10 +101,10 @@
jvmTarget = jdkVersion
}
}
-/*
+
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = jdkVersion
}
-}*/
+}