Skip to content

Commit

Permalink
[Rahul] | BAH-3927 | Fix. Bump Java 11 -> 17
Browse files Browse the repository at this point in the history
Dependecy Versions have been updated to resolve security vulnerabilities
  • Loading branch information
rahu1ramesh committed Jul 1, 2024
1 parent a7f1d14 commit 158d2a1
Show file tree
Hide file tree
Showing 13 changed files with 236 additions and 163 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup java
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'corretto'
- name: Build with gradle
run: ./gradlew clean build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup java
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'corretto'
- name: Build and unit tests
run: ./gradlew clean test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ build/
*.aar
*.war
!gradle-wrapper.jar
.idea/gradle.xml
.idea/misc.xml
.idea/vcs.xml
.idea/.gitignore
17 changes: 13 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id 'org.springframework.boot' version '2.7.5'
id 'org.springframework.boot' version '3.2.0'
id 'io.spring.dependency-management' version '1.1.0'
id 'java'
}

group = 'org.bahmni.sms'
version = '0.0.1'
sourceCompatibility = '11.0.18'
sourceCompatibility = '17'

configurations {
compileOnly {
Expand Down Expand Up @@ -34,10 +34,19 @@ dependencies {
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.2'
implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'com.google.guava:guava:29.0-jre'
implementation 'com.google.guava:guava:32.0.0-android'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.apache.httpcomponents:httpclient:4.5.12'
implementation 'org.json:json:20211205'
implementation 'org.json:json:20231013'
implementation 'org.springframework.security:spring-security-core:6.2.3'
implementation 'org.springframework:spring-web:6.1.6'
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.19'
implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19'
implementation 'org.apache.httpcomponents:httpclient:4.5.13'
implementation 'io.netty:netty-codec-http:4.1.108.Final'
implementation 'ch.qos.logback:logback-classic:1.4.12'
implementation 'ch.qos.logback:logback-core:1.4.12'
implementation 'io.github.classgraph:classgraph:4.8.112'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testImplementation('org.springframework.boot:spring-boot-starter-test') {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 158d2a1

Please sign in to comment.