From b8237c093443733cbcdcf36e30d451c5e06d5395 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 9 May 2024 23:48:37 -0400 Subject: [PATCH 01/15] fixed 89 & 284 --- backend/build.gradle | 2 +- backend/gradle.lockfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 51d3f803e3..c9893e62fe 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.5.2' // this provides additional types for JsonB and for ListArray types in Postgres implementation 'org.liquibase:liquibase-core' - implementation 'org.postgresql:postgresql' + implementation 'org.postgresql:postgresql:42.6.1' // data validation implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.28' diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index ee8845d7b1..37160c5419 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -176,7 +176,7 @@ org.json:json:20231013=compileClasspath,runtimeClasspath org.liquibase:liquibase-core:4.20.0=compileClasspath,runtimeClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath -org.postgresql:postgresql:42.6.0=compileClasspath,runtimeClasspath +org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath org.projectlombok:lombok:1.18.30=compileClasspath org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath org.slf4j:jcl-over-slf4j:2.0.9=compileClasspath,runtimeClasspath @@ -212,7 +212,7 @@ org.springframework.data:spring-data-commons:3.1.7=compileClasspath,runtimeClass org.springframework.data:spring-data-jpa:3.1.7=compileClasspath,runtimeClasspath org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspath org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-core:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-core:6.1.8=compileClasspath,runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath From a8c9143b46bfcfd25e80f9f5fd858ae39b8e01c3 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Mon, 13 May 2024 21:37:19 -0400 Subject: [PATCH 02/15] fixed 287 & 770 --- backend/build.gradle | 4 ++-- backend/gradle.lockfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index c9893e62fe..77431d394d 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -29,7 +29,7 @@ jar { dependencies { // core infrastructure - implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-web:3.2.0' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'org.springframework.boot:spring-boot-actuator' implementation 'org.springframework.boot:spring-boot-actuator-autoconfigure' @@ -63,7 +63,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.5.2' // this provides additional types for JsonB and for ListArray types in Postgres - implementation 'org.liquibase:liquibase-core' + implementation 'org.liquibase:liquibase-core:4.21.0' implementation 'org.postgresql:postgresql:42.6.1' // data validation diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 37160c5419..54eb3b4597 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,7 +46,7 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.37.2=compileClasspath,runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -92,7 +92,7 @@ io.micrometer:micrometer-observation:1.11.7=compileClasspath,runtimeClasspath io.netty:netty-buffer:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-dns:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-http2:4.1.104.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http:4.1.104.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http:4.1.108.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-socks:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-common:4.1.104.Final=compileClasspath,runtimeClasspath @@ -198,7 +198,7 @@ org.springframework.boot:spring-boot-starter-security:3.1.7=compileClasspath,run org.springframework.boot:spring-boot-starter-thymeleaf:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-validation:3.1.7=compileClasspath,runtimeClasspath -org.springframework.boot:spring-boot-starter-web:3.1.7=compileClasspath,runtimeClasspath +org.springframework.boot:spring-boot-starter-web:3.2.0=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot:3.1.7=compileClasspath,runtimeClasspath org.springframework.cloud:spring-cloud-commons:4.0.4=compileClasspath,runtimeClasspath @@ -214,12 +214,12 @@ org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspa org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-core:6.1.8=compileClasspath,runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-oauth2-client:6.1.7=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-web:6.1.7=compileClasspath,runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From 2aa5d3b7ae7894abba81e300e3beab326a4ed7de Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Fri, 17 May 2024 10:57:58 -0400 Subject: [PATCH 03/15] testing modified package back to original --- backend/gradle.lockfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 54eb3b4597..37160c5419 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,7 +46,7 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.37.2=compileClasspath,runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -92,7 +92,7 @@ io.micrometer:micrometer-observation:1.11.7=compileClasspath,runtimeClasspath io.netty:netty-buffer:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-dns:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-http2:4.1.104.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http:4.1.108.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec-socks:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-codec:4.1.104.Final=compileClasspath,runtimeClasspath io.netty:netty-common:4.1.104.Final=compileClasspath,runtimeClasspath @@ -198,7 +198,7 @@ org.springframework.boot:spring-boot-starter-security:3.1.7=compileClasspath,run org.springframework.boot:spring-boot-starter-thymeleaf:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-validation:3.1.7=compileClasspath,runtimeClasspath -org.springframework.boot:spring-boot-starter-web:3.2.0=compileClasspath,runtimeClasspath +org.springframework.boot:spring-boot-starter-web:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot:3.1.7=compileClasspath,runtimeClasspath org.springframework.cloud:spring-cloud-commons:4.0.4=compileClasspath,runtimeClasspath @@ -214,12 +214,12 @@ org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspa org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-core:6.1.8=compileClasspath,runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-oauth2-client:6.1.7=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.7=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From ee5774fc52882cda0f719e44b29a0ba833118c92 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Fri, 17 May 2024 12:45:22 -0400 Subject: [PATCH 04/15] fixed backages error --- backend/gradle.lockfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 37160c5419..ccae46d838 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -173,7 +173,8 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=compileClasspath,runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath org.json:json:20231013=compileClasspath,runtimeClasspath -org.liquibase:liquibase-core:4.20.0=compileClasspath,runtimeClasspath +org.liquibase:liquibase-core:4.20.0=runtimeClasspath +org.liquibase:liquibase-core:4.21.0=compileClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath @@ -198,7 +199,8 @@ org.springframework.boot:spring-boot-starter-security:3.1.7=compileClasspath,run org.springframework.boot:spring-boot-starter-thymeleaf:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-validation:3.1.7=compileClasspath,runtimeClasspath -org.springframework.boot:spring-boot-starter-web:3.1.7=compileClasspath,runtimeClasspath +org.springframework.boot:spring-boot-starter-web:3.1.10=runtimeClasspath +org.springframework.boot:spring-boot-starter-web:3.2.0=compileClasspath org.springframework.boot:spring-boot-starter:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot:3.1.7=compileClasspath,runtimeClasspath org.springframework.cloud:spring-cloud-commons:4.0.4=compileClasspath,runtimeClasspath From a9c8934eab305d20b87276a49d7162d14cce8c30 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Fri, 17 May 2024 13:15:55 -0400 Subject: [PATCH 05/15] updated all high and critical --- backend/gradle.lockfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index ccae46d838..b01d5beb06 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,7 +46,8 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath +com.nimbusds:nimbus-jose-jwt:9.37.2=runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -151,7 +152,8 @@ org.aspectj:aspectjweaver:1.9.21=compileClasspath,runtimeClasspath org.attoparser:attoparser:2.0.7.RELEASE=compileClasspath,runtimeClasspath org.bouncycastle:bcpkix-jdk18on:1.73=compileClasspath org.bouncycastle:bcpkix-jdk18on:1.75=runtimeClasspath -org.bouncycastle:bcprov-jdk18on:1.76=compileClasspath,runtimeClasspath +org.bouncycastle:bcprov-jdk18on:1.76=compileClasspath +org.bouncycastle:bcprov-jdk18on:1.78=runtimeClasspath org.bouncycastle:bcutil-jdk18on:1.73=compileClasspath org.bouncycastle:bcutil-jdk18on:1.75=runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath @@ -173,8 +175,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=compileClasspath,runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath org.json:json:20231013=compileClasspath,runtimeClasspath -org.liquibase:liquibase-core:4.20.0=runtimeClasspath -org.liquibase:liquibase-core:4.21.0=compileClasspath +org.liquibase:liquibase-core:4.21.0=compileClasspath,runtimeClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath @@ -199,8 +200,7 @@ org.springframework.boot:spring-boot-starter-security:3.1.7=compileClasspath,run org.springframework.boot:spring-boot-starter-thymeleaf:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter-validation:3.1.7=compileClasspath,runtimeClasspath -org.springframework.boot:spring-boot-starter-web:3.1.10=runtimeClasspath -org.springframework.boot:spring-boot-starter-web:3.2.0=compileClasspath +org.springframework.boot:spring-boot-starter-web:3.2.0=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot-starter:3.1.7=compileClasspath,runtimeClasspath org.springframework.boot:spring-boot:3.1.7=compileClasspath,runtimeClasspath org.springframework.cloud:spring-cloud-commons:4.0.4=compileClasspath,runtimeClasspath @@ -214,14 +214,17 @@ org.springframework.data:spring-data-commons:3.1.7=compileClasspath,runtimeClass org.springframework.data:spring-data-jpa:3.1.7=compileClasspath,runtimeClasspath org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspath org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-core:6.1.8=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-core:6.1.6=compileClasspath +org.springframework.security:spring-security-core:6.1.8=runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath +org.springframework.security:spring-security-oauth2-client:6.1.7=runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-web:6.1.6=compileClasspath +org.springframework.security:spring-security-web:6.1.7=runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From c7f7d08e622babe864e317006ecdd021c9a62fc5 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Fri, 17 May 2024 13:30:17 -0400 Subject: [PATCH 06/15] modified runtime class --- backend/gradle.lockfile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index b01d5beb06..41f197ff02 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,8 +46,7 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath -com.nimbusds:nimbus-jose-jwt:9.37.2=runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -152,8 +151,7 @@ org.aspectj:aspectjweaver:1.9.21=compileClasspath,runtimeClasspath org.attoparser:attoparser:2.0.7.RELEASE=compileClasspath,runtimeClasspath org.bouncycastle:bcpkix-jdk18on:1.73=compileClasspath org.bouncycastle:bcpkix-jdk18on:1.75=runtimeClasspath -org.bouncycastle:bcprov-jdk18on:1.76=compileClasspath -org.bouncycastle:bcprov-jdk18on:1.78=runtimeClasspath +org.bouncycastle:bcprov-jdk18on:1.76=compileClasspath,runtimeClasspath org.bouncycastle:bcutil-jdk18on:1.73=compileClasspath org.bouncycastle:bcutil-jdk18on:1.75=runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath @@ -214,17 +212,14 @@ org.springframework.data:spring-data-commons:3.1.7=compileClasspath,runtimeClass org.springframework.data:spring-data-jpa:3.1.7=compileClasspath,runtimeClasspath org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspath org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-core:6.1.6=compileClasspath -org.springframework.security:spring-security-core:6.1.8=runtimeClasspath +org.springframework.security:spring-security-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath -org.springframework.security:spring-security-oauth2-client:6.1.7=runtimeClasspath +org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.6=compileClasspath -org.springframework.security:spring-security-web:6.1.7=runtimeClasspath +org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From 30788f54cc35513be918da58c1b42b8f50aa8d42 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Fri, 17 May 2024 14:48:36 -0400 Subject: [PATCH 07/15] modified liquibase version to 4.20.0 to fix error --- backend/build.gradle | 2 +- backend/gradle.lockfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 77431d394d..9e282ce716 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.5.2' // this provides additional types for JsonB and for ListArray types in Postgres - implementation 'org.liquibase:liquibase-core:4.21.0' + implementation 'org.liquibase:liquibase-core:4.20.0' implementation 'org.postgresql:postgresql:42.6.1' // data validation diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 41f197ff02..54997fd9ea 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -173,7 +173,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=compileClasspath,runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath org.json:json:20231013=compileClasspath,runtimeClasspath -org.liquibase:liquibase-core:4.21.0=compileClasspath,runtimeClasspath +org.liquibase:liquibase-core:4.20.0=compileClasspath,runtimeClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath From 1715813fa4af640acd9dbd726c82ddc5777e1d87 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Tue, 21 May 2024 12:45:38 -0400 Subject: [PATCH 08/15] updated liquibase version --- backend/gradle.lockfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 54997fd9ea..dcf84e29fb 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -173,7 +173,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=compileClasspath,runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath org.json:json:20231013=compileClasspath,runtimeClasspath -org.liquibase:liquibase-core:4.20.0=compileClasspath,runtimeClasspath +org.liquibase:liquibase-core:4.27.0=compileClasspath,runtimeClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath From df98acd64386ea9486711e2c1f51e5af0752689b Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Wed, 22 May 2024 15:58:13 -0400 Subject: [PATCH 09/15] updated liquibase to 4.27.0 --- backend/build.gradle | 2 +- backend/gradle.lockfile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 9e282ce716..d36507cf21 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.5.2' // this provides additional types for JsonB and for ListArray types in Postgres - implementation 'org.liquibase:liquibase-core:4.20.0' + implementation 'org.liquibase:liquibase-core:4.27.0' implementation 'org.postgresql:postgresql:42.6.1' // data validation diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index dcf84e29fb..513eda7c75 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -56,7 +56,8 @@ com.okta.sdk:okta-sdk-impl:13.0.2=runtimeClasspath com.okta.spring:okta-spring-boot-starter:3.0.5=compileClasspath,runtimeClasspath com.okta.spring:okta-spring-sdk:3.0.5=compileClasspath,runtimeClasspath com.okta.spring:okta-spring-security-oauth2:3.0.5=compileClasspath,runtimeClasspath -com.opencsv:opencsv:5.7.1=compileClasspath,runtimeClasspath +com.opencsv:opencsv:5.7.1=runtimeClasspath +com.opencsv:opencsv:5.9=compileClasspath com.sendgrid:java-http-client:4.5.0=compileClasspath,runtimeClasspath com.sendgrid:sendgrid-java:4.10.1=compileClasspath,runtimeClasspath com.smartystreets.api:smartystreets-java-sdk:3.14.1=compileClasspath,runtimeClasspath @@ -136,7 +137,8 @@ net.minidev:json-smart:2.4.11=compileClasspath,runtimeClasspath org.antlr:antlr4-runtime:4.10.1=compileClasspath,runtimeClasspath org.apache.commons:commons-collections4:4.4=compileClasspath,runtimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,runtimeClasspath -org.apache.commons:commons-text:1.10.0=compileClasspath,runtimeClasspath +org.apache.commons:commons-text:1.10.0=runtimeClasspath +org.apache.commons:commons-text:1.11.0=compileClasspath org.apache.httpcomponents.client5:httpclient5:5.2.3=compileClasspath,runtimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2.4=compileClasspath,runtimeClasspath org.apache.httpcomponents.core5:httpcore5:5.2.4=compileClasspath,runtimeClasspath From 40b6c8e4d258c3baa32d472d9ba3b6309b38fc24 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 23 May 2024 12:46:58 -0400 Subject: [PATCH 10/15] upgrade libraries --- backend/gradle.lockfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 513eda7c75..2105028256 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,7 +46,7 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.37.2=compileClasspath,runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -214,14 +214,14 @@ org.springframework.data:spring-data-commons:3.1.7=compileClasspath,runtimeClass org.springframework.data:spring-data-jpa:3.1.7=compileClasspath,runtimeClasspath org.springframework.graphql:spring-graphql:1.2.4=compileClasspath,runtimeClasspath org.springframework.security:spring-security-config:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-core:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-core:6.1.8=compileClasspath,runtimeClasspath org.springframework.security:spring-security-crypto:6.1.6=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-oauth2-client:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-oauth2-client:6.1.7=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-web:6.1.7=compileClasspath,runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From 9caa4f22a74fe20dbc510f51ccd2e9f5fb54e8db Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 23 May 2024 13:24:10 -0400 Subject: [PATCH 11/15] added to build.gradle --- backend/build.gradle | 3 +++ backend/gradle.lockfile | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index d36507cf21..434d894c1d 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -58,6 +58,8 @@ dependencies { */ implementation 'com.squareup.okio:okio:3.4.0' implementation 'org.springframework:spring-core:6.0.16' + implementation 'org.springframework.security:spring-security-core:6.1.8' + implementation 'org.springframework.security:spring-security-oauth2-client:6.1.7' // data layer dependencies implementation 'org.springframework.boot:spring-boot-starter-data-jpa' @@ -76,6 +78,7 @@ dependencies { implementation 'com.fasterxml.jackson.datatype:jackson-datatype-hibernate6' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + // Okta dependencies implementation 'com.okta.spring:okta-spring-boot-starter:3.0.5' implementation "com.okta.sdk:okta-sdk-api:${oktaVersion}" diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index 2105028256..813021ea93 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -46,7 +46,7 @@ com.ibm.icu:icu4j:72.1=compileClasspath,runtimeClasspath com.microsoft.azure:applicationinsights-core:3.4.19=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.2=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.7=compileClasspath,runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.37.2=compileClasspath,runtimeClasspath +com.nimbusds:nimbus-jose-jwt:9.24.4=compileClasspath,runtimeClasspath com.nimbusds:oauth2-oidc-sdk:9.43.3=compileClasspath,runtimeClasspath com.okta.commons:okta-commons-lang:1.3.3=compileClasspath,runtimeClasspath com.okta.commons:okta-config-check:1.3.3=compileClasspath,runtimeClasspath @@ -56,8 +56,7 @@ com.okta.sdk:okta-sdk-impl:13.0.2=runtimeClasspath com.okta.spring:okta-spring-boot-starter:3.0.5=compileClasspath,runtimeClasspath com.okta.spring:okta-spring-sdk:3.0.5=compileClasspath,runtimeClasspath com.okta.spring:okta-spring-security-oauth2:3.0.5=compileClasspath,runtimeClasspath -com.opencsv:opencsv:5.7.1=runtimeClasspath -com.opencsv:opencsv:5.9=compileClasspath +com.opencsv:opencsv:5.9=compileClasspath,runtimeClasspath com.sendgrid:java-http-client:4.5.0=compileClasspath,runtimeClasspath com.sendgrid:sendgrid-java:4.10.1=compileClasspath,runtimeClasspath com.smartystreets.api:smartystreets-java-sdk:3.14.1=compileClasspath,runtimeClasspath @@ -137,8 +136,7 @@ net.minidev:json-smart:2.4.11=compileClasspath,runtimeClasspath org.antlr:antlr4-runtime:4.10.1=compileClasspath,runtimeClasspath org.apache.commons:commons-collections4:4.4=compileClasspath,runtimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,runtimeClasspath -org.apache.commons:commons-text:1.10.0=runtimeClasspath -org.apache.commons:commons-text:1.11.0=compileClasspath +org.apache.commons:commons-text:1.11.0=compileClasspath,runtimeClasspath org.apache.httpcomponents.client5:httpclient5:5.2.3=compileClasspath,runtimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2.4=compileClasspath,runtimeClasspath org.apache.httpcomponents.core5:httpcore5:5.2.4=compileClasspath,runtimeClasspath @@ -221,7 +219,7 @@ org.springframework.security:spring-security-oauth2-core:6.1.6=compileClasspath, org.springframework.security:spring-security-oauth2-jose:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-oauth2-resource-server:6.1.6=compileClasspath,runtimeClasspath org.springframework.security:spring-security-rsa:1.0.12.RELEASE=compileClasspath,runtimeClasspath -org.springframework.security:spring-security-web:6.1.7=compileClasspath,runtimeClasspath +org.springframework.security:spring-security-web:6.1.6=compileClasspath,runtimeClasspath org.springframework.session:spring-session-core:3.1.4=runtimeClasspath org.springframework.session:spring-session-jdbc:3.1.4=runtimeClasspath org.springframework:spring-aop:6.0.15=compileClasspath,runtimeClasspath From 2e9e6b9e90c75422b2382ae96b107fbc6e6f80cf Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 23 May 2024 15:41:09 -0400 Subject: [PATCH 12/15] modified source Compatibility to fix Deprecated Gradle features error --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 434d894c1d..9853755d9a 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -12,7 +12,7 @@ plugins { group = 'gov.cdc.usds' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '17' +sourceCompatibility = '18' ext { set('springCloudVersion', "2022.0.4") From d0dfc375323bfcc8ba6121916e47a70f38e88944 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 23 May 2024 15:49:39 -0400 Subject: [PATCH 13/15] modified to use the java { } --- backend/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 9853755d9a..74573bf6ea 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -12,7 +12,9 @@ plugins { group = 'gov.cdc.usds' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '18' +java { + sourceCompatibility = JavaVersion.VERSION_18 +} ext { set('springCloudVersion', "2022.0.4") From 0900975f44956c36c88e87b3d30b6536dedb5c10 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 23 May 2024 15:57:45 -0400 Subject: [PATCH 14/15] change source version back to original --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 74573bf6ea..ca9135ea08 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -13,7 +13,7 @@ plugins { group = 'gov.cdc.usds' version = '0.0.1-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_18 + sourceCompatibility = JavaVersion.VERSION_17 } ext { From a0ad0c9334cee9db1cd5a4e00b0243f6dde900d8 Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Tue, 4 Jun 2024 11:34:58 -0400 Subject: [PATCH 15/15] changed org.postgresql:postgresql back to version 42.6.1 to fix vulnerability --- backend/gradle.lockfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gradle.lockfile b/backend/gradle.lockfile index f0046e0025..dc73a458a2 100644 --- a/backend/gradle.lockfile +++ b/backend/gradle.lockfile @@ -175,7 +175,7 @@ org.liquibase:liquibase-core:4.27.0=compileClasspath,runtimeClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath,runtimeClasspath org.ow2.asm:asm:9.3=compileClasspath,runtimeClasspath org.owasp.encoder:encoder:1.2=compileClasspath,runtimeClasspath -org.postgresql:postgresql:42.6.0=compileClasspath,runtimeClasspath +org.postgresql:postgresql:42.6.1=compileClasspath,runtimeClasspath org.projectlombok:lombok:1.18.30=compileClasspath org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath org.slf4j:jcl-over-slf4j:2.0.9=compileClasspath,runtimeClasspath