改进编译环境
diff --git a/Makefile b/Makefile
index 4ad93d7..9eb3fcb 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
test:
$(GRADLE) test
-docker:
- $(GRADLE) payapi:docker
+docker: build
+ $(GRADLE) docker
push: docker
docker push harbor.supwisdom.com/dali/payapi
diff --git a/build.gradle b/build.gradle
index 0cc27cd..188a626 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,18 @@
+plugins {
+ id 'java'
+ id 'org.springframework.boot' version '2.1.6.RELEASE'
+ id 'org.jetbrains.kotlin.jvm' version '1.3.31'
+ id 'org.jetbrains.kotlin.plugin.spring' version '1.3.31'
+ id "com.palantir.git-version" version "0.12.0-rc2"
+ id 'com.palantir.docker' version '0.22.1'
+}
+
allprojects {
repositories {
jcenter()
mavenCentral()
}
+
}
subprojects {
diff --git a/payapi/build.gradle b/payapi/build.gradle
index eb51a3c..123ad8b 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -1,11 +1,11 @@
plugins {
id 'java'
- id 'org.springframework.boot' version '2.1.6.RELEASE'
- id 'org.jetbrains.kotlin.jvm' version '1.3.31'
+ id 'org.springframework.boot'
+ id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.31'
- id 'org.jetbrains.kotlin.plugin.spring' version '1.3.31'
- id "com.palantir.git-version" version "0.12.0-rc2"
- id 'com.palantir.docker' version '0.22.1'
+ id 'org.jetbrains.kotlin.plugin.spring'
+ id "com.palantir.git-version"
+ id 'com.palantir.docker'
}
apply plugin: 'java'
diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle
index 4431bd6..d2ef07c 100644
--- a/ynrcc-agent/build.gradle
+++ b/ynrcc-agent/build.gradle
@@ -1,28 +1,28 @@
plugins {
id 'java'
- id 'org.springframework.boot' version '2.1.6.RELEASE'
- id 'org.jetbrains.kotlin.jvm' version '1.3.31'
- id 'org.jetbrains.kotlin.plugin.spring' version '1.3.31'
- id "com.palantir.git-version" version "0.12.0-rc2"
- id 'com.palantir.docker' version '0.22.1'
+ id 'org.springframework.boot'
+ id 'org.jetbrains.kotlin.jvm'
+ id 'org.jetbrains.kotlin.plugin.spring'
+ id "com.palantir.git-version"
+ id 'com.palantir.docker'
}
apply plugin: 'java'
apply plugin: 'io.spring.dependency-management'
-payapiVersion = gitVersion()
+def ynrccVersion = gitVersion()
group = rootProject.group
version = '1'
sourceCompatibility = jdkVersion
def startClass = 'com.supwisdom.agent.YnrccAgentApplication'
-println("Build version: $payapiVersion")
+println("Build version: $ynrccVersion")
bootJar {
mainClassName = startClass
manifest {
- attributes('YnrccAgent-Version': payapiVersion)
+ attributes('YnrccAgent-Version': ynrccVersion)
}
}