From f6876188978a1e7f6d53e0e5b5c44a9eaeb0f21f Mon Sep 17 00:00:00 2001 From: mrflick72 Date: Sat, 3 Oct 2020 11:49:55 +0200 Subject: [PATCH 1/2] spring boot upgrade --- hello-service/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-service/profile.gradle | 2 +- message-service/build.gradle | 14 +++++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- message-service/profile.gradle | 2 +- ui/pom.xml | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hello-service/build.gradle b/hello-service/build.gradle index 2d0a233..67b45eb 100644 --- a/hello-service/build.gradle +++ b/hello-service/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.1.4.RELEASE' + id 'org.springframework.boot' version '2.3.4.RELEASE' id 'java' id "com.palantir.docker" version "0.21.0" @@ -20,7 +20,7 @@ repositories { } ext { - set('springCloudVersion', 'Greenwich.SR1') + set('springCloudVersion', 'Hoxton.SR8') } dependencies { diff --git a/hello-service/gradle/wrapper/gradle-wrapper.properties b/hello-service/gradle/wrapper/gradle-wrapper.properties index 44e7c4d..12d38de 100644 --- a/hello-service/gradle/wrapper/gradle-wrapper.properties +++ b/hello-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-service/profile.gradle b/hello-service/profile.gradle index f99f718..dcad037 100644 --- a/hello-service/profile.gradle +++ b/hello-service/profile.gradle @@ -2,7 +2,7 @@ if (project.hasProperty('kubernetes')) { println("kubernetes") dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes' - implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-ribbon' + implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-loadbalancer' implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config' } } else if (project.hasProperty('netflix')) { diff --git a/message-service/build.gradle b/message-service/build.gradle index c384053..611decd 100644 --- a/message-service/build.gradle +++ b/message-service/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'org.springframework.boot' version '2.1.4.RELEASE' - id 'org.jetbrains.kotlin.jvm' version '1.3.21' - id 'org.jetbrains.kotlin.plugin.spring' version '1.3.21' + id 'org.springframework.boot' version '2.3.4.RELEASE' + id 'org.jetbrains.kotlin.jvm' version '1.3.72' + id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72' id "com.palantir.docker" version "0.21.0" } @@ -10,14 +10,14 @@ apply plugin: 'io.spring.dependency-management' group = 'it.valeriovaudi' //version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +java.sourceCompatibility = JavaVersion.VERSION_11 repositories { mavenCentral() } ext { - set('springCloudVersion', 'Greenwich.SR1') + set('springCloudVersion', 'Hoxton.SR8') } dependencies { @@ -45,14 +45,14 @@ dependencyManagement { compileKotlin { kotlinOptions { freeCompilerArgs = ['-Xjsr305=strict'] - jvmTarget = '1.8' + jvmTarget = '11' } } compileTestKotlin { kotlinOptions { freeCompilerArgs = ['-Xjsr305=strict'] - jvmTarget = '1.8' + jvmTarget = '11' } } diff --git a/message-service/gradle/wrapper/gradle-wrapper.properties b/message-service/gradle/wrapper/gradle-wrapper.properties index 44e7c4d..12d38de 100644 --- a/message-service/gradle/wrapper/gradle-wrapper.properties +++ b/message-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/message-service/profile.gradle b/message-service/profile.gradle index f99f718..dcad037 100644 --- a/message-service/profile.gradle +++ b/message-service/profile.gradle @@ -2,7 +2,7 @@ if (project.hasProperty('kubernetes')) { println("kubernetes") dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes' - implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-ribbon' + implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-loadbalancer' implementation 'org.springframework.cloud:spring-cloud-starter-kubernetes-config' } } else if (project.hasProperty('netflix')) { diff --git a/ui/pom.xml b/ui/pom.xml index b5902a0..02982a7 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.4.RELEASE + 2.3.4.RELEASE it.valeriovaudi @@ -16,7 +16,7 @@ 11 - Greenwich.SR1 + Hoxton.SR8 @@ -100,7 +100,7 @@ org.springframework.cloud - spring-cloud-starter-kubernetes-ribbon + spring-cloud-starter-kubernetes-loadbalancer From cc5e644e376c29fcc12dd2a61d53e5427292f882 Mon Sep 17 00:00:00 2001 From: mrflick72 Date: Sat, 3 Oct 2020 12:48:21 +0200 Subject: [PATCH 2/2] spring boot upgrade --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 603c03e..8f76146 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ only availing on profiled Maven/Gradle build and Spring profile. The sample application is a very simple hello world web application. This application is thought for explore service composition, client load balancing and configuration management. The web main application is composed by two pages under security: * a web page for standard users in order to get a special hello with a randomic special message for you - * a web page for admin usera in order to managing the special message list. - * there ecist a prebuild user for both web application + * a web page for admin user in order to manage the special message list. + * there exist a prebuild user for both web application * user name user and password secret for /index.html web application * user name admin and password secret for /messages.html web application