Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade of Gradle, Spring Boot, Tomcat, Gradle-cargo, and update Gateway yaml #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade of Gradle, Spring Boot, Tomcat, Gradle-cargo, and update Gateway yaml #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gateway/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '2.1.1.RELEASE'
springBootVersion = '2.2.5.RELEASE'
}
repositories {
mavenCentral()
Expand Down Expand Up @@ -29,7 +29,7 @@ repositories {

dependencyManagement {
imports {
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Greenwich.SR1'
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3'
}
}

Expand Down
7 changes: 3 additions & 4 deletions gateway/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ spring:
oauth2:
client:
registration:
login-client:
provider: uaa
uaa:
client-id: login-client
client-secret: secret
authorization-grant-type: authorization_code
redirect-uri-template: "{baseUrl}/login/oauth2/code/{registrationId}"
redirect-uri: "{baseUrl}/login/oauth2/code/login-client"
scope: openid,profile,email,resource.read
provider:
uaa:
authorization-uri: http://localhost:8090/uaa/oauth/authorize
token-uri: http://localhost:8090/uaa/oauth/token
user-info-uri: http://localhost:8090/uaa/userinfo
user-name-attribute: sub
userNameAttribute: sub
jwk-set-uri: http://localhost:8090/uaa/token_keys
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
2 changes: 1 addition & 1 deletion resource-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '2.1.1.RELEASE'
springBootVersion = '2.2.5.RELEASE'
}
repositories {
mavenCentral()
Expand Down
10 changes: 6 additions & 4 deletions uaa-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
buildscript {
repositories {
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.bmuschko:gradle-cargo-plugin:2.3'
classpath 'com.bmuschko:gradle-cargo-plugin:2.7.1'
}
}

Expand Down Expand Up @@ -39,7 +42,7 @@ cargoRunLocal.dependsOn downloadUAA
task uaa(dependsOn: cargoRunLocal) {}

cargo {
containerId = 'tomcat8x'
containerId = 'tomcat9x'
port = 8090

deployable {
Expand All @@ -50,8 +53,7 @@ cargo {
local {
outputFile = file("$buildDir/uaa-server.log")
installer {
installUrl = 'https://www-us.apache.org/dist/tomcat/tomcat-8/v8.5.43/bin/apache-tomcat-8.5.43.zip'

installUrl = 'https://www-us.apache.org/dist/tomcat/tomcat-9/v9.0.33/bin/apache-tomcat-9.0.33.zip'
downloadDir = file("$buildDir/download")
extractDir = file("$buildDir/extract")
}
Expand Down