Skip to content

Commit

Permalink
Merge branch 'hotfix/0.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
David committed Nov 18, 2021
2 parents 4953df7 + 3765b42 commit 532c271
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions TourGuide/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.1.6.RELEASE")
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.5.2")
}
}

Expand All @@ -16,7 +16,7 @@ apply plugin: "jacoco"

bootJar {
baseName = 'tourGuide'
version = '1.0.0'
version = '0.0.5'
}

repositories {
Expand All @@ -33,23 +33,23 @@ dependencies {
compile("org.springframework.boot:spring-boot-starter-web")
compile("org.springframework.boot:spring-boot-starter-log4j2")
compile("org.springframework.boot:spring-boot-starter-actuator")
compile group: 'org.javamoney', name: 'moneta', version: '1.3'
compile group: 'org.javamoney', name: 'moneta', version: '1.4.2'
compile group: 'com.jsoniter', name: 'jsoniter', version: '0.9.23'

compile(name:'gpsUtil', ext:'jar')
compile(name:'RewardCentral', ext:'jar')
compile(name:'TripPricer', ext:'jar')

testCompile("junit:junit")
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.5.2.RELEASE'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.5.2'
}

configurations.implementation {
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
}

jacoco {
toolVersion = "0.8.4"
toolVersion = "0.8.7"
}

jacocoTestReport {
Expand Down
2 changes: 1 addition & 1 deletion TourGuide/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 532c271

Please sign in to comment.