Skip to content
This repository was archived by the owner on Mar 9, 2020. It is now read-only.

Commit cc1a961

Browse files
committed
polish
1 parent 3f00cfe commit cc1a961

File tree

6 files changed

+35
-15
lines changed

6 files changed

+35
-15
lines changed

apps/cli/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
CLI App
2+
=======
3+
4+
5+
### Build
6+
```bash
7+
gradle :apps:cli:run
8+
```
9+
10+
### Build
11+
```bash
12+
# make jar
13+
gradle :apps:cli:jar
14+
# docker build
15+
gradle :apps:cli:jibDockerBuild
16+
```
17+

apps/cli/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,10 @@ dependencies {
2020

2121
kotlin {
2222
experimental.coroutines = Coroutines.ENABLE
23-
}
23+
}
24+
25+
jib {
26+
to {
27+
image = "xmlking/micro-apps-cli:${project.version}"
28+
}
29+
}

apps/guestbook-service/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies {
4141

4242
configure<DependencyManagementExtension> {
4343
val springCloudVersion: String = "Finchley.RELEASE"
44-
val springCloudStreamVersion = "Elmhurst.RELEASE"
44+
val springCloudStreamVersion = "Fishtown.M2"
4545

4646
imports {
4747
mavenBom("org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion")

apps/guestbook-service2/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242

4343

4444
configure<DependencyManagementExtension> {
45-
val springCloudVersion: String = "Finchley.RELEASE"
4645
val micronautVersion = "1.0.0.M4"
4746

4847
imports {

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
val springDependencyManagement = "1.0.6.RELEASE"
77
val springBootVersion = "2.0.4.RELEASE"
88
val shadowPluginVersion = "2.0.4"
9+
val jibPluginVersion = "0.9.10"
910

1011
base
1112
java
@@ -16,7 +17,7 @@ plugins {
1617
id("org.springframework.boot") version springBootVersion apply false
1718
id("io.spring.dependency-management") version springDependencyManagement apply false
1819
id("com.github.johnrengelman.shadow") version shadowPluginVersion apply false
19-
id("com.google.cloud.tools.jib") version "0.9.10" apply false
20+
id("com.google.cloud.tools.jib") version jibPluginVersion apply false
2021
}
2122

2223
allprojects {

gradle.properties

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ junitVersion=5.1.0
1212
# spring
1313
springBootVersion=2.0.4.RELEASE
1414
springCloudVersion=Finchley.RELEASE
15-
springCloudStreamVersion=Elmhurst.M3
15+
springCloudStreamVersion=Fishtown.M2
16+
#springCloudStreamVersion=Fishtown.BUILD-SNAPSHOT
1617
springDependencyManagement=1.0.6.RELEASE
1718
testcontainersVersion=1.4.3
1819

@@ -23,22 +24,18 @@ highchartsVersion=5.0.8
2324
xtermVersion=2.9.2
2425

2526
# kafka
26-
kafkaVersion=0.11.0.0
27-
avroVersion=1.7.7
28-
reactorKafkaVersion=1.0.0.RELEASE
27+
kafkaVersion=2.0.0
28+
avroVersion=1.8.2
29+
reactorKafkaVersion=1.0.1.RELEASE
2930

3031
# Logback
3132
logbackKafkaAppenderVersion=0.1.0
3233
logstashLogbackEncoderVersion=4.11
33-
influxdbJavaVersion=2.8
3434

3535
# gradle
36-
gradleWrapperVersion=4.4
37-
junitGradleVersion=1.0.2
38-
39-
# docker
40-
dockerPluginVersion=0.17.2
36+
gradleWrapperVersion=4.10
37+
shadowPluginVersion="2.0.4"
38+
jibPluginVersion="0.9.10"
4139

4240
# micronaut
4341
micronautVersion=1.0.0.M4
44-
shadowPluginVersion=2.0.4

0 commit comments

Comments
 (0)