Merge pull request #2 from mrFlick72/spring_upgrade

Spring upgrade
mrFlick72 · Oct 3, 2020 · a18c29c · a18c29c
2 parents cb55a6d + cc5e644
commit a18c29c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git 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
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
+        <version>2.3.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>it.valeriovaudi</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>11</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -100,7 +100,7 @@
 
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-kubernetes-ribbon</artifactId>
+                    <artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
                 </dependency>
             </dependencies>
         </profile>