From d9935e0128cefbc2a46635b97ce629aec9797e0a Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 27 Dec 2023 13:00:48 -0800 Subject: [PATCH 01/52] add maven-compiler-plugin versions --- src/libs/dfcms-ords-client/pom.xml | 9 ++++++--- src/libs/dps-cache-starter/pom.xml | 12 ++++++++++-- src/libs/dps-commons/pom.xml | 14 +++++++++++--- src/libs/dps-email-client/pom.xml | 10 +++++++--- src/libs/dps-files/pom.xml | 13 ++++++++++--- src/libs/dps-messaging-starter/pom.xml | 13 ++++++++++--- src/libs/dps-monitoring/pom.xml | 13 ++++++++++--- src/libs/dps-notification/pom.xml | 13 ++++++++++--- src/libs/dps-sftp-starter/pom.xml | 13 ++++++++++--- src/libs/figaro-ords-client/pom.xml | 10 +++++++--- src/vips-notification-worker/pom.xml | 6 +++++- 11 files changed, 96 insertions(+), 30 deletions(-) diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 56160fff..f222335b 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -15,6 +15,9 @@ 0.4.1-SNAPSHOT + 1.8 + 1.8 + 3.10.1 ca.bc.gov.open.ords.dfcms.client @@ -187,10 +190,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 50caeb12..b03e1cc2 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -9,6 +9,13 @@ dps-cache-starter 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + org.springframework.boot @@ -98,9 +105,10 @@ org.apache.maven.plugins maven-compiler-plugin + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index 2a20cbd7..874ffa66 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -8,15 +8,23 @@ ca.bc.gov.open.pssg.rsbc dps-commons 0.4.1-SNAPSHOT + + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index a3c27cb5..eb198045 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -15,6 +15,10 @@ 0.4.1-SNAPSHOT + 2.17.1 + 1.8 + 1.8 + 3.10.1 ca.bc.gov.open.dps.email.client 1.0.0 @@ -189,10 +193,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index b0d64260..c45d2c0a 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -9,6 +9,13 @@ dps-files 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + ca.bc.gov.open.pssg.rsbc @@ -55,10 +62,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index a916c218..79b802b8 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -8,6 +8,13 @@ dps-messaging-starter 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + @@ -58,10 +65,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 737799e9..397775d8 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -9,6 +9,13 @@ dps-monitoring 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + @@ -30,10 +37,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index 0235f15e..5022976e 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -9,6 +9,13 @@ dps-notification 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + @@ -26,10 +33,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index ad684dec..1aa77453 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -9,6 +9,13 @@ dps-sftp-starter 0.4.1-SNAPSHOT + + 2.17.1 + 1.8 + 1.8 + 3.10.1 + + @@ -67,10 +74,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 25d0afc7..a8f98df1 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -15,6 +15,10 @@ 0.4.1-SNAPSHOT + 2.17.1 + 1.8 + 1.8 + 3.10.1 ca.bc.gov.open.ords.figcr.client @@ -188,10 +192,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index cec4f08b..b7912dbf 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -12,6 +12,10 @@ 0.4.1-SNAPSHOT vips-notification-worker + + 2.17.1 + + central @@ -95,7 +99,7 @@ ca.bc.gov.open jag-vips-client - 0.1.0 + 0.1.1 From c1e1182346369fdf9232d6e738b7ddffdf8cdfcf Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 09:41:13 -0800 Subject: [PATCH 02/52] Java-> 17, Spring -> 3, dps-bom file changed --- src/libs/dfcms-ords-client/pom.xml | 5 +-- src/libs/dps-bom/pom.xml | 47 +++++++++++++------------- src/libs/dps-cache-starter/pom.xml | 4 +-- src/libs/dps-commons/pom.xml | 4 +-- src/libs/dps-email-client/pom.xml | 4 +-- src/libs/dps-files/pom.xml | 4 +-- src/libs/dps-messaging-starter/pom.xml | 4 +-- src/libs/dps-monitoring/pom.xml | 5 ++- src/libs/dps-notification/pom.xml | 4 +-- src/libs/dps-sftp-starter/pom.xml | 4 +-- src/libs/figaro-ords-client/pom.xml | 4 +-- src/pom.xml | 2 +- tests/springboot-ewsconntest/pom.xml | 6 ++-- 13 files changed, 48 insertions(+), 49 deletions(-) diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index f222335b..53e11a26 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -15,8 +15,8 @@ 0.4.1-SNAPSHOT - 1.8 - 1.8 + 17 + 17 3.10.1 ca.bc.gov.open.ords.dfcms.client @@ -27,6 +27,7 @@ io.swagger swagger-annotations + org.glassfish.jersey.core diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index f51a8182..b0118587 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -10,42 +10,41 @@ 0.5.0 - 1.8 + 17 UTF-8 - 1.8 - 1.8 - 2.7.12 + 17 + 17 + 3.1.3 3.0.0 - 1.6.10 - 2.39 - 2.15.1 - 3.5.5 + 1.6.12 + 3.1.3 + 2.15.2 + 4.0.1 2.17.1 - 3.9 + 3.12.0 1.3.2 - 2.12.0 - 1.15 - 2.11.1 + 2.13.0 + 1.16.0 + 2.12.0 0.1.55 - 1.5.22 0.2.6 - 2.7 + 2.12.5 2.2 - 5.5.1 - 5.5.1 - 2.27.0 + 5.10.0 + 5.10.0 + 5.4.0 2.7.1 3.0.2 - 2.15.2 - 1.3.7 - 1.3.7 - 3.8.0 + 2.16.0 + 1.4.8 + 1.4.14 + 4.4.6 2.0 - 2.0.7 - 2.5.14 + 2.0.9 + 3.1.3 1.6.3 2.0 - 1.16.1 + 1.17.1 0.1.9 diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index b03e1cc2..8ddebf27 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index 874ffa66..93633be1 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index eb198045..89c5e0a9 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -16,8 +16,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 ca.bc.gov.open.dps.email.client diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index c45d2c0a..5aff408d 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 79b802b8..1bd7f222 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -10,8 +10,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 397775d8..23fa9aa2 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 @@ -21,7 +21,6 @@ org.slf4j slf4j-api - 2.0.0-alpha0 compile diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index 5022976e..d559cd51 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index 1aa77453..646a6fc4 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -11,8 +11,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index a8f98df1..270ad63a 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -16,8 +16,8 @@ 2.17.1 - 1.8 - 1.8 + 17 + 17 3.10.1 ca.bc.gov.open.ords.figcr.client diff --git a/src/pom.xml b/src/pom.xml index e3e63c46..e54cfc67 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.12 + 3.1.3 ca.bc.gov.open diff --git a/tests/springboot-ewsconntest/pom.xml b/tests/springboot-ewsconntest/pom.xml index 6d9ab579..cebf5b66 100644 --- a/tests/springboot-ewsconntest/pom.xml +++ b/tests/springboot-ewsconntest/pom.xml @@ -5,17 +5,17 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.RELEASE + 3.1.3 my.pkg.name sprngboot-ewsconntest - 0.0.1-SNAPSHOT + 0.0.2 springboot-ewsconntest EWS connection test from OS - 1.8 + 17 From 6615dfebf3c89f07dfcead0aaad1f7da5f6aa665 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 10:06:25 -0800 Subject: [PATCH 03/52] import Spring's autoconfiguration --- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 3 --- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- 6 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 src/libs/dps-cache-starter/src/main/resources/META-INF/spring.factories create mode 100644 src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 src/libs/dps-messaging-starter/src/main/resources/META-INF/spring.factories create mode 100644 src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 src/libs/dps-sftp-starter/src/main/resources/META-INF/spring.factories diff --git a/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..5f757343 --- /dev/null +++ b/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ca.bc.gov.open.pssg.rsbc.dps.cache.AutoConfiguration \ No newline at end of file diff --git a/src/libs/dps-cache-starter/src/main/resources/META-INF/spring.factories b/src/libs/dps-cache-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c3fef787..00000000 --- a/src/libs/dps-cache-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - ca.bc.gov.open.pssg.rsbc.dps.cache.AutoConfiguration - \ No newline at end of file diff --git a/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..1c5ebb26 --- /dev/null +++ b/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ca.bc.gov.open.pssg.rsbc.dps.messaging.starter.AutoConfiguration \ No newline at end of file diff --git a/src/libs/dps-messaging-starter/src/main/resources/META-INF/spring.factories b/src/libs/dps-messaging-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 85847ec6..00000000 --- a/src/libs/dps-messaging-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - ca.bc.gov.open.pssg.rsbc.dps.messaging.starter.AutoConfiguration \ No newline at end of file diff --git a/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..136f9d61 --- /dev/null +++ b/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.AutoConfiguration \ No newline at end of file diff --git a/src/libs/dps-sftp-starter/src/main/resources/META-INF/spring.factories b/src/libs/dps-sftp-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 98206e24..00000000 --- a/src/libs/dps-sftp-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.AutoConfiguration \ No newline at end of file From e4e224d542bef66706c02cd326d66720fce0516f Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 11:26:52 -0800 Subject: [PATCH 04/52] Java-> 17, Spring -> 3, update maven test plugin version --- src/libs/dfcms-ords-client/pom.xml | 5 +++-- src/libs/dps-cache-starter/pom.xml | 5 +++-- src/libs/dps-email-client/pom.xml | 5 +++-- src/libs/dps-files/pom.xml | 5 +++-- src/libs/dps-messaging-starter/pom.xml | 5 +++-- src/libs/dps-notification/pom.xml | 5 +++-- src/libs/dps-sftp-starter/pom.xml | 5 +++-- src/libs/figaro-ords-client/pom.xml | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 53e11a26..70439636 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -18,6 +18,7 @@ 17 17 3.10.1 + 3.1.2 ca.bc.gov.open.ords.dfcms.client @@ -153,12 +154,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 8ddebf27..688c2728 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -14,6 +14,7 @@ 17 17 3.10.1 + 3.1.2 @@ -74,12 +75,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 89c5e0a9..22464522 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -19,6 +19,7 @@ 17 17 3.10.1 + 3.1.2 ca.bc.gov.open.dps.email.client 1.0.0 @@ -155,12 +156,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 5aff408d..54859e8d 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -14,6 +14,7 @@ 17 17 3.10.1 + 3.1.2 @@ -71,12 +72,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 1bd7f222..a779021c 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -13,6 +13,7 @@ 17 17 3.10.1 + 3.1.2 @@ -74,12 +75,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index d559cd51..3226cff7 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -14,6 +14,7 @@ 17 17 3.10.1 + 3.1.2 @@ -42,12 +43,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index 646a6fc4..c7f76a92 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -14,6 +14,7 @@ 17 17 3.10.1 + 3.1.2 @@ -83,12 +84,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 270ad63a..6316dc49 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -19,6 +19,7 @@ 17 17 3.10.1 + 3.1.2 ca.bc.gov.open.ords.figcr.client @@ -154,12 +155,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${maven.test.plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + ${maven.test.plugin.version} From 076d8da6a4a70a0deeb2aa74a4e9692286b8a068 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 11:34:20 -0800 Subject: [PATCH 05/52] Java-> 17, Spring -> 3, update maven.compiler.plugin version name --- src/libs/dfcms-ords-client/pom.xml | 4 ++-- src/libs/dps-cache-starter/pom.xml | 4 ++-- src/libs/dps-commons/pom.xml | 4 ++-- src/libs/dps-email-client/pom.xml | 4 ++-- src/libs/dps-files/pom.xml | 4 ++-- src/libs/dps-messaging-starter/pom.xml | 4 ++-- src/libs/dps-monitoring/pom.xml | 4 ++-- src/libs/dps-notification/pom.xml | 4 ++-- src/libs/dps-sftp-starter/pom.xml | 4 ++-- src/libs/figaro-ords-client/pom.xml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 70439636..53825529 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.10.1 + 3.10.1 3.1.2 ca.bc.gov.open.ords.dfcms.client @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 688c2728..1a7ad7b1 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index 93633be1..b460e194 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 22464522..39bd87e3 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -18,7 +18,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 ca.bc.gov.open.dps.email.client @@ -194,7 +194,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 54859e8d..46976c0e 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index a779021c..64acf620 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -12,7 +12,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 23fa9aa2..42bd11f2 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index 3226cff7..09add24f 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 @@ -34,7 +34,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index c7f76a92..2e786441 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -13,7 +13,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 6316dc49..9dc239dc 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -18,7 +18,7 @@ 2.17.1 17 17 - 3.10.1 + 3.10.1 3.1.2 ca.bc.gov.open.ords.figcr.client @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.source} ${maven.compiler.target} From 5c54f4812060308fe1ebd5d7f4702401ceb9928b Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 17:00:33 -0800 Subject: [PATCH 06/52] update dfcms-ords-client, figaro-ords-client, dps-email-client openapi-generator-maven-plugin; update jacoco-maven-plugin; update figaro-ords-client module --- src/dps-email-poller/pom.xml | 2 +- src/dps-email-worker/pom.xml | 2 +- src/dps-notification-service/pom.xml | 2 +- src/dps-payment-service/pom.xml | 2 +- src/dps-validation-service/pom.xml | 2 +- src/figaro-validation-service/pom.xml | 2 +- src/libs/dfcms-ords-client/pom.xml | 9 +++++---- src/libs/dps-bom/pom.xml | 3 +++ src/libs/dps-cache-starter/pom.xml | 2 +- src/libs/dps-email-client/pom.xml | 8 +++++--- src/libs/dps-files/pom.xml | 2 +- src/libs/dps-messaging-starter/pom.xml | 2 +- src/libs/dps-notification/pom.xml | 2 +- src/libs/dps-sftp-starter/pom.xml | 2 +- src/libs/figaro-ords-client/pom.xml | 12 ++++++++---- .../types/ValidateApplicantForSharingResponse.java | 2 +- .../types/ValidateApplicantPartyIdResponse.java | 2 +- .../client/organization/OrganizationServiceImpl.java | 6 +++--- src/report/pom.xml | 2 +- src/spd-notification-worker/pom.xml | 2 +- src/vips-notification-worker/pom.xml | 2 +- 21 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index ef5a0e98..ac7622c5 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -213,7 +213,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/dps-email-worker/pom.xml b/src/dps-email-worker/pom.xml index fcdad7a2..ec432920 100644 --- a/src/dps-email-worker/pom.xml +++ b/src/dps-email-worker/pom.xml @@ -258,7 +258,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/dps-notification-service/pom.xml b/src/dps-notification-service/pom.xml index 43e55ae2..5af7b463 100644 --- a/src/dps-notification-service/pom.xml +++ b/src/dps-notification-service/pom.xml @@ -184,7 +184,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/dps-payment-service/pom.xml b/src/dps-payment-service/pom.xml index 71e9197a..93764ca0 100644 --- a/src/dps-payment-service/pom.xml +++ b/src/dps-payment-service/pom.xml @@ -135,7 +135,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/dps-validation-service/pom.xml b/src/dps-validation-service/pom.xml index 57c30fab..98ec8672 100644 --- a/src/dps-validation-service/pom.xml +++ b/src/dps-validation-service/pom.xml @@ -239,7 +239,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/figaro-validation-service/pom.xml b/src/figaro-validation-service/pom.xml index 95d5e57b..486c0d42 100644 --- a/src/figaro-validation-service/pom.xml +++ b/src/figaro-validation-service/pom.xml @@ -227,7 +227,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 53825529..b90f84a2 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -28,7 +28,6 @@ io.swagger swagger-annotations - org.glassfish.jersey.core @@ -165,7 +164,7 @@ org.openapitools openapi-generator-maven-plugin - 5.1.0 + 7.0.0 spring-boot-api @@ -177,7 +176,9 @@ java joda - true + + true + true jersey2 ${default-package}.api @@ -215,7 +216,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index b0118587..c5eec5ee 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -235,16 +235,19 @@ org.junit.jupiter junit-jupiter-api ${junit.jupiter.api.version} + test org.junit.jupiter junit-jupiter-engine ${junit.jupiter.engine.version} + test org.mockito mockito-core ${mockito.core.version} + test org.apache.cxf diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 1a7ad7b1..36b19adb 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -86,7 +86,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 39bd87e3..e6dbe74c 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -167,7 +167,7 @@ org.openapitools openapi-generator-maven-plugin - 5.1.0 + 7.0.0 spring-boot-api @@ -179,7 +179,9 @@ java joda - true + + true + true jersey2 ${default-package}.api @@ -217,7 +219,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 46976c0e..e6902fc5 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -83,7 +83,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 64acf620..38b006e2 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -86,7 +86,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index 09add24f..cf15c9e3 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -54,7 +54,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index 2e786441..f431569d 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -95,7 +95,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 9dc239dc..0bcf0376 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -142,7 +142,7 @@ ca.bc.gov.open.pssg.rsbc dps-bom - 0.4.1-SNAPSHOT + 0.5.0 pom import @@ -166,7 +166,7 @@ org.openapitools openapi-generator-maven-plugin - 5.1.0 + 7.0.0 spring-boot-api @@ -178,7 +178,11 @@ java joda - true + false + + + true + true jersey2 ${default-package}.api @@ -216,7 +220,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantForSharingResponse.java b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantForSharingResponse.java index 29b61f6f..37c7f920 100644 --- a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantForSharingResponse.java +++ b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantForSharingResponse.java @@ -3,7 +3,7 @@ import ca.bc.gov.open.pssg.rsbc.figaro.ords.client.FigaroOrdsClientConstants; import com.fasterxml.jackson.annotation.JsonInclude; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * model class for response messages for /validateApplicantForSharing requests diff --git a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantPartyIdResponse.java b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantPartyIdResponse.java index edf818c0..e8f7ac9c 100644 --- a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantPartyIdResponse.java +++ b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/applicant/types/ValidateApplicantPartyIdResponse.java @@ -3,7 +3,7 @@ import ca.bc.gov.open.pssg.rsbc.figaro.ords.client.FigaroOrdsClientConstants; import com.fasterxml.jackson.annotation.JsonInclude; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/organization/OrganizationServiceImpl.java b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/organization/OrganizationServiceImpl.java index 2db5e811..30e670cc 100644 --- a/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/organization/OrganizationServiceImpl.java +++ b/src/libs/figaro-ords-client/src/main/java/ca/bc/gov/open/pssg/rsbc/figaro/ords/client/organization/OrganizationServiceImpl.java @@ -4,7 +4,7 @@ import ca.bc.gov.open.ords.figcr.client.api.handler.ApiException; import ca.bc.gov.open.ords.figcr.client.api.model.ValidateOrgDrawDownBalanceOrdsResponse; import ca.bc.gov.open.ords.figcr.client.api.model.ValidateOrgPartyOrdsResponse; -import ca.bc.gov.open.ords.figcr.client.api.model.ValidateOrgPartyOrdsResponseContactPersons; +import ca.bc.gov.open.ords.figcr.client.api.model.ValidateOrgPartyOrdsResponseContactPersonsInner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,13 +48,13 @@ public ValidateOrgPartyResponse validateOrgParty(ValidateOrgPartyRequest request ValidateOrgPartyOrdsResponse response = this.orgApi.validateOrgParty(request.getOrgCity(), request.getOrgPartyId(), request.getOrgSubname1(), request.getOrgSubname2(), request.getOrgSubname3(), request.getOrgSubname4(), request.getOrgSubname5()); - List contactOrdsList = response.getContactPersons(); + List contactOrdsList = response.getContactPersons(); List contactList = new ArrayList<>(); if (contactOrdsList != null) { - for (ValidateOrgPartyOrdsResponseContactPersons contact : contactOrdsList) { + for (ValidateOrgPartyOrdsResponseContactPersonsInner contact : contactOrdsList) { contactList.add(ValidateOrgPartyContactPersonResponse.successResponse(contact.getContactPersonName(), contact.getContactPersonRole(), contact.getContactPersonPartyId())); } } diff --git a/src/report/pom.xml b/src/report/pom.xml index 3aabf2dd..78d758a8 100644 --- a/src/report/pom.xml +++ b/src/report/pom.xml @@ -130,7 +130,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/spd-notification-worker/pom.xml b/src/spd-notification-worker/pom.xml index e527b5de..2b0cf5f4 100644 --- a/src/spd-notification-worker/pom.xml +++ b/src/spd-notification-worker/pom.xml @@ -242,7 +242,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index b7912dbf..3f869268 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -194,7 +194,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.10 From f13f69a7d72ccc6673fa0d5a833daa7bbca7fbe5 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 28 Dec 2023 17:24:51 -0800 Subject: [PATCH 07/52] Java-> 17, Spring -> 3, update vips-notification-worker module: update jaxb2-maven-plugin to support Jakarta; change jag-vips-client version to the Java 17 version 0.1.2 --- src/vips-notification-worker/pom.xml | 5 ++--- .../notification/worker/OutputNotificationConsumer.java | 6 +++--- .../vips/notification/worker/configuration/JaxbConfig.java | 4 ++-- .../notification/worker/OutputNotificationConsumerTest.java | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index 3f869268..9b173c4f 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -75,7 +75,6 @@ commons-codec commons-codec - 1.9 @@ -99,7 +98,7 @@ ca.bc.gov.open jag-vips-client - 0.1.1 + 0.1.2 @@ -173,7 +172,7 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.5.0 + 3.1.0 xjc diff --git a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java index 78ddb987..81275c36 100644 --- a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java +++ b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumer.java @@ -19,9 +19,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/configuration/JaxbConfig.java b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/configuration/JaxbConfig.java index afca368d..4f24d434 100644 --- a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/configuration/JaxbConfig.java +++ b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/configuration/JaxbConfig.java @@ -6,8 +6,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; @Configuration public class JaxbConfig { diff --git a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java index 5f618242..0f873e94 100644 --- a/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java +++ b/src/vips-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/OutputNotificationConsumerTest.java @@ -15,9 +15,9 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.ByteArrayInputStream; import java.io.File; import java.io.Reader; From cf824d4d6cbdcfd3fcac676281761daa9e03a2de Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 2 Jan 2024 12:50:11 -0800 Subject: [PATCH 08/52] update cxf-codegen-plugin to 4.01 and jaxb2-maven-plugin to 3.1.0 to replace javax to Jakarta; update jupiter to 5.9.3 because 5.10.0 caused issues; --- .../rsbc/dps/dpsemailworker/kofax/KofaxConfig.java | 4 ++-- .../rsbc/dps/dpsemailworker/kofax/models/Batch.java | 2 +- .../dps/dpsemailworker/kofax/models/BatchField.java | 2 +- .../dps/dpsemailworker/kofax/models/BatchFields.java | 8 ++++---- .../dps/dpsemailworker/kofax/models/Batches.java | 8 ++++---- .../dpsemailworker/kofax/models/ImportSession.java | 2 +- .../rsbc/dps/dpsemailworker/kofax/models/Page.java | 2 +- .../rsbc/dps/dpsemailworker/kofax/models/Pages.java | 8 ++++---- .../kofax/services/ImportSessionServiceImpl.java | 8 ++++---- .../kofax/ImportSessionServiceImplTest.java | 4 ++-- src/dps-notification-service/pom.xml | 2 +- .../dps/dpsnotificationservice/WebServiceConfig.java | 2 +- .../PaymentserviceApplicationTests.java | 12 +----------- .../FigValidationServiceAppTests.java | 2 +- src/libs/dfcms-ords-client/pom.xml | 2 +- src/libs/dps-bom/pom.xml | 4 ++-- src/spd-notification-worker/pom.xml | 2 +- .../worker/OutputNotificationConsumer.java | 6 +++--- .../worker/configuration/JaxbConfig.java | 4 ++-- .../worker/OutputNotificationConsumerTest.java | 6 +++--- src/vips-notification-worker/pom.xml | 1 - tests/springboot-ewsconntest/pom.xml | 2 +- 22 files changed, 41 insertions(+), 52 deletions(-) diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/KofaxConfig.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/KofaxConfig.java index b839b8a7..8815bc9f 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/KofaxConfig.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/KofaxConfig.java @@ -11,8 +11,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; @Configuration @EnableConfigurationProperties({KofaxProperties.class}) diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batch.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batch.java index 5c91d2a8..508fb146 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batch.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batch.java @@ -1,6 +1,6 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.text.DateFormat; import java.text.MessageFormat; import java.text.SimpleDateFormat; diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchField.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchField.java index 8c21e156..65af2cc7 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchField.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchField.java @@ -1,6 +1,6 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; public class BatchField { diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchFields.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchFields.java index 53061f56..7e0f79bd 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchFields.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/BatchFields.java @@ -1,9 +1,9 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batches.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batches.java index 55f02800..70afd90c 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batches.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Batches.java @@ -1,9 +1,9 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/ImportSession.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/ImportSession.java index aebd4470..433e0147 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/ImportSession.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/ImportSession.java @@ -1,6 +1,6 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.Optional; @XmlRootElement(name="ImportSession") diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Page.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Page.java index 71d801e1..58ff080c 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Page.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Page.java @@ -1,6 +1,6 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; public class Page { diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Pages.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Pages.java index db54e281..b68c822d 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Pages.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/models/Pages.java @@ -1,9 +1,9 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker.kofax.models; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/services/ImportSessionServiceImpl.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/services/ImportSessionServiceImpl.java index c31dcbf3..5c607b32 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/services/ImportSessionServiceImpl.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/services/ImportSessionServiceImpl.java @@ -8,10 +8,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.text.DateFormat; diff --git a/src/dps-email-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/ImportSessionServiceImplTest.java b/src/dps-email-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/ImportSessionServiceImplTest.java index c3b49f11..078dacc2 100644 --- a/src/dps-email-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/ImportSessionServiceImplTest.java +++ b/src/dps-email-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/kofax/ImportSessionServiceImplTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; diff --git a/src/dps-notification-service/pom.xml b/src/dps-notification-service/pom.xml index 5af7b463..145c92e4 100644 --- a/src/dps-notification-service/pom.xml +++ b/src/dps-notification-service/pom.xml @@ -160,7 +160,7 @@ org.apache.cxf cxf-codegen-plugin - 3.5.5 + 4.0.1 generate-sources diff --git a/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/WebServiceConfig.java b/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/WebServiceConfig.java index cf190d63..0c75546c 100644 --- a/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/WebServiceConfig.java +++ b/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/WebServiceConfig.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import javax.xml.ws.Endpoint; +import jakarta.xml.ws.Endpoint; import java.text.MessageFormat; import java.util.Collections; diff --git a/src/dps-payment-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/PaymentserviceApplicationTests.java b/src/dps-payment-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/PaymentserviceApplicationTests.java index 3dc024e6..6e33a614 100644 --- a/src/dps-payment-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/PaymentserviceApplicationTests.java +++ b/src/dps-payment-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/PaymentserviceApplicationTests.java @@ -2,23 +2,13 @@ import ca.bc.gov.open.pssg.rsbc.dps.paymentservice.controller.CalculateSinglePaymentController; import ca.bc.gov.open.pssg.rsbc.dps.paymentservice.controller.CrcController; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.test.context.TestPropertySource; - -import java.net.MalformedURLException; -import java.net.URL; +import org.springframework.boot.test.web.server.LocalServerPort; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/figaro-validation-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/FigValidationServiceAppTests.java b/src/figaro-validation-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/FigValidationServiceAppTests.java index 062c296c..04aafa26 100644 --- a/src/figaro-validation-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/FigValidationServiceAppTests.java +++ b/src/figaro-validation-service/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/FigValidationServiceAppTests.java @@ -6,7 +6,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index b90f84a2..6149915f 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -79,7 +79,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-base - + com.fasterxml.jackson.core jackson-core diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index c5eec5ee..8dca07af 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -30,8 +30,8 @@ 0.2.6 2.12.5 2.2 - 5.10.0 - 5.10.0 + 5.9.3 + 5.9.3 5.4.0 2.7.1 3.0.2 diff --git a/src/spd-notification-worker/pom.xml b/src/spd-notification-worker/pom.xml index 2b0cf5f4..9f10527b 100644 --- a/src/spd-notification-worker/pom.xml +++ b/src/spd-notification-worker/pom.xml @@ -221,7 +221,7 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.5.0 + 3.1.0 xjc diff --git a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumer.java b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumer.java index f0d49605..1ea5ffdb 100644 --- a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumer.java +++ b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumer.java @@ -18,9 +18,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; diff --git a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/configuration/JaxbConfig.java b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/configuration/JaxbConfig.java index 55bf39c1..ff965051 100644 --- a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/configuration/JaxbConfig.java +++ b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/configuration/JaxbConfig.java @@ -6,8 +6,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; @Configuration public class JaxbConfig { diff --git a/src/spd-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumerTest.java b/src/spd-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumerTest.java index 2ed06188..b091bef1 100644 --- a/src/spd-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumerTest.java +++ b/src/spd-notification-worker/src/test/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/OutputNotificationConsumerTest.java @@ -15,9 +15,9 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.ByteArrayInputStream; import java.io.Reader; import java.text.MessageFormat; diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index 9b173c4f..ea372603 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -59,7 +59,6 @@ com.jcraft jsch - 0.1.55 diff --git a/tests/springboot-ewsconntest/pom.xml b/tests/springboot-ewsconntest/pom.xml index cebf5b66..4eeff951 100644 --- a/tests/springboot-ewsconntest/pom.xml +++ b/tests/springboot-ewsconntest/pom.xml @@ -40,7 +40,7 @@ commons-codec commons-codec - 1.9 + 1.16.0 From 4e01b9f3e130e7ceabee6144592dfb3f9548f749 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 2 Jan 2024 14:03:50 -0800 Subject: [PATCH 09/52] replace jupiter with spring-boot-starter-test to avoidError TestEngine with ID junit-jupiter failed to discover --- src/libs/dfcms-ords-client/pom.xml | 16 ++-------------- src/libs/dps-bom/pom.xml | 21 --------------------- src/libs/dps-email-client/pom.xml | 15 ++------------- src/libs/dps-files/pom.xml | 16 ++-------------- src/libs/dps-monitoring/pom.xml | 5 +++-- src/libs/figaro-ords-client/pom.xml | 16 ++-------------- 6 files changed, 11 insertions(+), 78 deletions(-) diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 6149915f..31d8a6be 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -117,21 +117,9 @@ com.brsanthu migbase64 - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - org.mockito - mockito-core + org.springframework.boot + spring-boot-starter-test test diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index 8dca07af..fb1953d9 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -30,8 +30,6 @@ 0.2.6 2.12.5 2.2 - 5.9.3 - 5.9.3 5.4.0 2.7.1 3.0.2 @@ -230,25 +228,6 @@ migbase64 ${migbase64.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.api.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.engine.version} - test - - - org.mockito - mockito-core - ${mockito.core.version} - test - org.apache.cxf cxf-spring-boot-starter-jaxws diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index e6dbe74c..73f63a0c 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -120,20 +120,9 @@ migbase64 - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-core + org.springframework.boot + spring-boot-starter-test test diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index e6902fc5..1b8022bf 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -23,21 +23,9 @@ dps-sftp-starter 0.4.1-SNAPSHOT - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - org.mockito - mockito-core + org.springframework.boot + spring-boot-starter-test test diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 42bd11f2..b4407f1d 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -25,8 +25,9 @@ - org.junit.jupiter - junit-jupiter-api + org.springframework.boot + spring-boot-starter-test + test diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 0bcf0376..d47d1d81 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -118,21 +118,9 @@ com.brsanthu migbase64 - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - org.mockito - mockito-core + org.springframework.boot + spring-boot-starter-test test From 67d3547474ee23386827ed15ae26a37ea94a1614 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 11 Jan 2024 10:02:03 -0800 Subject: [PATCH 10/52] swagger to OpenAPI, update AutoConfiguration, fix docker-compose --- Dockerfile | 4 +- README.md | 52 ++++++++-------- docker-compose.yml | 16 +++-- src/dps-email-poller/pom.xml | 4 +- .../DpsEmailPollerApplication.java | 2 +- .../configuration/SwaggerConfig.java | 37 +++--------- .../src/main/resources/application.properties | 3 +- .../DpsEmailWorkerApplication.java | 2 +- .../DpsnotificationserviceApplication.java | 2 +- src/dps-payment-service/pom.xml | 4 +- .../configuration/SwaggerConfig.java | 58 ++++-------------- .../src/main/resources/application.properties | 2 +- src/dps-validation-service/pom.xml | 4 +- .../configuration/SwaggerConfig.java | 38 +++--------- .../src/main/resources/application.properties | 2 +- src/figaro-validation-service/pom.xml | 5 +- .../configuration/SwaggerConfig.java | 60 ++++--------------- .../src/main/resources/application.properties | 2 +- src/libs/dfcms-ords-client/pom.xml | 5 ++ src/libs/dps-bom/pom.xml | 27 ++++++++- ...ation.java => CacheAutoConfiguration.java} | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../rsbc/dps/cache/AutoConfigurationTest.java | 4 +- src/libs/dps-email-client/pom.xml | 6 ++ ...ion.java => MessageAutoConfiguration.java} | 4 +- ...ration.java => SftpAutoConfiguration.java} | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- src/libs/figaro-ords-client/pom.xml | 6 ++ src/spd-notification-worker/pom.xml | 12 ++++ .../SpdNotificationWorkerApplication.java | 2 +- src/vips-notification-worker/pom.xml | 12 ++++ .../VipsNotificationWorkerApplication.java | 2 +- 32 files changed, 170 insertions(+), 219 deletions(-) rename src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/{AutoConfiguration.java => CacheAutoConfiguration.java} (99%) rename src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/{AutoConfiguration.java => MessageAutoConfiguration.java} (98%) rename src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/{AutoConfiguration.java => SftpAutoConfiguration.java} (93%) diff --git a/Dockerfile b/Dockerfile index 5282ff86..8fcd4a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ### Stage where Docker is caching the dependencies spring boot app using maven ### ############################################################################################# #FROM image-registry.apps.silver.devops.gov.bc.ca/043918-tools/maven:3.8.6-eclipse-temurin-8 as dependencies -FROM maven:3.8.6-eclipse-temurin-8 as dependencies +FROM maven:3.8.6-eclipse-temurin-17 as dependencies ## Defining Arguments and env vars ARG NEXUS_URL=https://nexus-043918-tools.apps.silver.devops.gov.bc.ca @@ -79,7 +79,7 @@ RUN mvn clean package \ #### Stage where Docker is running a java process to run a service built in previous stage ### ############################################################################################## #FROM image-registry.apps.silver.devops.gov.bc.ca/043918-tools/eclipse-temurin:8-jre-jammy -FROM eclipse-temurin:8-jre-jammy +FROM eclipse-temurin:17-jre-alpine ARG DPS_SERVICE_NAME diff --git a/README.md b/README.md index 738e10cd..e77e5dc5 100644 --- a/README.md +++ b/README.md @@ -82,33 +82,33 @@ docker-compose up --build -d ## Endpoints -| URL | Method | Description | -| --- | --- | --- | -| **Payment Service** | --- | --- | -| [http://localhost:5050/paymentservice/bamboraconfiguration](http://localhost:5050/paymentservice/bamboraconfiguration) | GET | Bambora configuration url | -| [http://localhost:5050/paymentservice/getSinglePaymentURL](http://localhost:5050/paymentservice/getSinglePaymentURL) | GET | Single Payment Url | -| [http://localhost:8081/paymentservice/actuator/health](http://localhost:8081/paymentservice/actuator/health) | GET | Payment Service Health | -| [http://localhost:8081/paymentservice/swagger-ui.html](http://localhost:8081/paymentservice/swagger-ui.html) | GET | Figaro Validator Swagger-UI | -| [http://localhost:8081/paymentservice/v2/api-docs](http://localhost:8081/paymentservice/v2/api-docs) | GET | Figaro Validator Api docs | -| **Figaro Validation** | --- | --- | -| [http://localhost:5050/figvalidationservice/locateMatchingApplicants](http://localhost:5050/figvalidationservice/locateMatchingApplicants) | GET | Locate Matching Applicants | -| [http://localhost:5050/figvalidationservice/validateApplicantService](http://localhost:5050/figvalidationservice/validateApplicantService) | GET | Validate Applicant Service | +| URL | Method | Description | +|--------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- | +| **Payment Service** | --- | --- | +| [http://localhost:5050/paymentservice/bamboraconfiguration](http://localhost:5050/paymentservice/bamboraconfiguration) | GET | Bambora configuration url | +| [http://localhost:5050/paymentservice/getSinglePaymentURL](http://localhost:5050/paymentservice/getSinglePaymentURL) | GET | Single Payment Url | +| [http://localhost:8081/paymentservice/actuator/health](http://localhost:8084/paymentservice/actuator/health) | GET | Payment Service Health | +| [http://localhost:8081/paymentservice/swagger-ui.html](http://localhost:8084/paymentservice/swagger-ui.html) | GET | Figaro Validator Swagger-UI | +| [http://localhost:8081/paymentservice/v2/api-docs](http://localhost:8084/paymentservice/v3/api-docs) | GET | Figaro Validator Api docs | +| **Figaro Validation** | --- | --- | +| [http://localhost:5050/figvalidationservice/locateMatchingApplicants](http://localhost:5050/figvalidationservice/locateMatchingApplicants) | GET | Locate Matching Applicants | +| [http://localhost:5050/figvalidationservice/validateApplicantService](http://localhost:5050/figvalidationservice/validateApplicantService) | GET | Validate Applicant Service | | [http://localhost:5050/figvalidationservice/validateApplicantForSharing](http://localhost:5050/figvalidationservice/validateApplicantForSharing) | GET | Validate Applicant Sharing | -| [http://localhost:5050/figvalidationservice/validateApplicantPartyId](http://localhost:5050/figvalidationservice/validateApplicantPartyId) | GET | Validate Applicant Party ID | -| [http://localhost:8082/figvalidationservice/actuator/health](http://localhost:8082/figvalidationservice/actuator/health) | GET | Figaro Validator Health | -| [http://localhost:8082/figvalidationservice/swagger-ui.html](http://localhost:8082/figvalidationservice/swagger-ui.html) | GET | Figaro Validator Swagger-UI | -| **DPS Validation** | --- | --- | -| [http://localhost:5050/dpsvalidationservice/getValidOpenDFCMCase](http://localhost:5050/dpsvalidationservice/getValidOpenDFCMCase) | GET | Valid Open DFCM Case | -| [http://localhost:8083/dpsvalidationservice/actuator/health](http://localhost:8083/dpsvalidationservice/actuator/health) | GET | DPS Validation Service Health | -| [http://localhost:8083/dpsvalidationservice/swagger-ui.html](http://localhost:8083/dpsvalidationservice/swagger-ui.html) | GET | DPS Validation Service Swagger-UI | -| [http://localhost:8083/dpsvalidationservice/v2/api-docs](http://localhost:8083/dpsvalidationservice/v2/api-docs) | GET | DPS Validation Service Swagger | -| **DPS Output Notification** | --- | --- | -| [http://localhost:5054/dpsnotificationservice/actuator/health](http://localhost:5054/dpsnotificationservice/actuator/health) | GET | DPS Notification Service Health | -| [http://localhost:5050/ws/dpsOutputNotification.wsdl](http://localhost:5050/ws/dpsOutputNotification.wsdl) | GET | DPS Output Notification Service WSDL | -| **CRRP Notification Worker** | --- | --- | -| [http://localhost:5055/crrpnotificationworker/actuator/health](http://localhost:5054/crrpnotificationworker/actuator/health) | GET | CRRP Notification -| **CRRP Notification Worker** | --- | --- | -| [http://localhost:5056/vipsnotificationworker/actuator/health](http://localhost:5056/vipsnotificationworker/actuator/health) | GET | CRRP Notification +| [http://localhost:5050/figvalidationservice/validateApplicantPartyId](http://localhost:5050/figvalidationservice/validateApplicantPartyId) | GET | Validate Applicant Party ID | +| [http://localhost:8082/figvalidationservice/actuator/health](http://localhost:8082/figvalidationservice/actuator/health) | GET | Figaro Validator Health | +| [http://localhost:8082/figvalidationservice/swagger-ui.html](http://localhost:8082/figvalidationservice/swagger-ui.html) | GET | Figaro Validator Swagger-UI | +| **DPS Validation** | --- | --- | +| [http://localhost:5050/dpsvalidationservice/getValidOpenDFCMCase](http://localhost:5050/dpsvalidationservice/getValidOpenDFCMCase) | GET | Valid Open DFCM Case | +| [http://localhost:8083/dpsvalidationservice/actuator/health](http://localhost:8083/dpsvalidationservice/actuator/health) | GET | DPS Validation Service Health | +| [http://localhost:8083/dpsvalidationservice/swagger-ui.html](http://localhost:8083/dpsvalidationservice/swagger-ui.html) | GET | DPS Validation Service Swagger-UI | +| [http://localhost:8083/dpsvalidationservice/v2/api-docs](http://localhost:8083/dpsvalidationservice/v3/api-docs) | GET | DPS Validation Service Swagger | +| **DPS Output Notification** | --- | --- | +| [http://localhost:5054/dpsnotificationservice/actuator/health](http://localhost:5054/dpsnotificationservice/actuator/health) | GET | DPS Notification Service Health | +| [http://localhost:5050/ws/dpsOutputNotification.wsdl](http://localhost:5050/ws/dpsOutputNotification.wsdl) | GET | DPS Output Notification Service WSDL | +| **CRRP Notification Worker** | --- | --- | +| [http://localhost:5055/crrpnotificationworker/actuator/health](http://localhost:5054/crrpnotificationworker/actuator/health) | GET | CRRP Notification +| **CRRP Notification Worker** | --- | --- | +| [http://localhost:5056/vipsnotificationworker/actuator/health](http://localhost:5056/vipsnotificationworker/actuator/health) | GET | CRRP Notification Worker Health | diff --git a/docker-compose.yml b/docker-compose.yml index 0c64cfa9..67e9131a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ services: - SPLUNK_TOKEN=${SPLUNK_TOKEN} - SWAGGER_UI_ENABLED=true ports: - - "8081:8080" + - "8084:8080" networks: - dps-net @@ -71,9 +71,9 @@ services: - DPS_SERVICE_NAME=figaro-validation-service environment: - SWAGGER_UI_ENABLED=true - - FIGCR_BASE_PATH=$FIGCR_BASE_PATH + - FIGCR_BASE_PATH=${FIGCR_BASE_PATH} ports: - - "8082:8081" + - "8082:8080" networks: - dps-net @@ -88,9 +88,10 @@ services: - DPS_SERVICE_NAME=dps-validation-service environment: - SWAGGER_UI_ENABLED=true - - DFCMS_BASE_PATH=$DFCMS_BASE_PATH + - DFCMS_BASE_PATH=${DFCMS_BASE_PATH} + - DFCMS_EIGHT_DIGIT_LICENSE=${DFCMS_EIGHT_DIGIT_LICENSE} ports: - - "8083:8081" + - "8083:8080" networks: - dps-net @@ -136,7 +137,10 @@ services: - "5056:8080" environment: - RABBITMQ_HOST=rabbitmq - - FIGCR_BASE_PATH=$FIGCR_BASE_PATH + - FIGCR_BASE_PATH=${FIGCR_BASE_PATH} + - VIPS_BASE_PATH=${VIPS_BASE_PATH} + - VIPS_USERNAME=${VIPS_USERNAME} + - VIPS_PASSWORD=${VIPS_PASSWORD} networks: - dps-net diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index ac7622c5..fd880129 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -132,8 +132,8 @@ - io.springfox - springfox-swagger-ui + org.springdoc + springdoc-openapi-starter-webmvc-ui diff --git a/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/DpsEmailPollerApplication.java b/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/DpsEmailPollerApplication.java index bd46f4a2..002066f2 100644 --- a/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/DpsEmailPollerApplication.java +++ b/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/DpsEmailPollerApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"ca.bc.gov.open.pssg.rsbc.dps.dpsemailpoller", "ca.bc.gov.open.pssg.rsbc.dps.cache"}) @EnableScheduling public class DpsEmailPollerApplication { diff --git a/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/configuration/SwaggerConfig.java b/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/configuration/SwaggerConfig.java index 9f5ad4f1..9be84633 100644 --- a/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/configuration/SwaggerConfig.java +++ b/src/dps-email-poller/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailpoller/configuration/SwaggerConfig.java @@ -1,43 +1,22 @@ package ca.bc.gov.open.pssg.rsbc.dps.dpsemailpoller.configuration; -import ca.bc.gov.open.pssg.rsbc.dps.dpsemailpoller.DpsEmailPollerApplication; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration -@EnableSwagger2 public class SwaggerConfig { @Value("${dpsemailpoller.api.version}") private String version; - @Value("${dpsemailpoller.api.swagger.enabled:false}") - private Boolean enabled; - - ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("Email service API") - .description("Email Service API") - .version(version) - .build(); - } - @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage(DpsEmailPollerApplication.class.getPackage().getName())) - .paths(PathSelectors.any()) - .build() - .apiInfo(apiInfo()) - .enable(enabled); + public OpenAPI apiDocConfig() { + return new OpenAPI() + .info(new Info() + .title("Email service API") + .description("Email Service API") + .version(version)); } - } diff --git a/src/dps-email-poller/src/main/resources/application.properties b/src/dps-email-poller/src/main/resources/application.properties index 53901293..9c69537e 100644 --- a/src/dps-email-poller/src/main/resources/application.properties +++ b/src/dps-email-poller/src/main/resources/application.properties @@ -14,8 +14,7 @@ dps.messaging.retryDelay=10 dps.messaging.type=producer dps.tenant="${DPS_TENANT}" - -dpsemailpoller.api.swagger.enabled:${SWAGGER_ENABLE:false} +springdoc.enable-native-support:${SWAGGER_ENABLE:false} dpsemailpoller.api.version:1.0 # Exchange configuration diff --git a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/DpsEmailWorkerApplication.java b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/DpsEmailWorkerApplication.java index eb53b05e..f74caf8c 100644 --- a/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/DpsEmailWorkerApplication.java +++ b/src/dps-email-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsemailworker/DpsEmailWorkerApplication.java @@ -3,7 +3,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"ca.bc.gov.open.pssg.rsbc.dps.dpsemailworker", "ca.bc.gov.open.pssg.rsbc.dps", "ca.bc.gov.open.pssg.rsbc.dps.sftp.starter"}) public class DpsEmailWorkerApplication { public static void main(String[] args) { diff --git a/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/DpsnotificationserviceApplication.java b/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/DpsnotificationserviceApplication.java index 676aa7ff..cf0679c2 100644 --- a/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/DpsnotificationserviceApplication.java +++ b/src/dps-notification-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsnotificationservice/DpsnotificationserviceApplication.java @@ -9,7 +9,7 @@ * @author alexjoybc@github * */ -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"ca.bc.gov.open.pssg.rsbc.dps.dpsnotificationservice", "ca.bc.gov.open.pssg.rsbc.dps.messaging"}) public class DpsnotificationserviceApplication { public static void main(String[] args) { diff --git a/src/dps-payment-service/pom.xml b/src/dps-payment-service/pom.xml index 93764ca0..c575175c 100644 --- a/src/dps-payment-service/pom.xml +++ b/src/dps-payment-service/pom.xml @@ -43,8 +43,8 @@ springfox-swagger2 - io.springfox - springfox-swagger-ui + org.springdoc + springdoc-openapi-starter-webmvc-ui org.springframework.boot diff --git a/src/dps-payment-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/configuration/SwaggerConfig.java b/src/dps-payment-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/configuration/SwaggerConfig.java index 5c098823..f075efb0 100644 --- a/src/dps-payment-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/configuration/SwaggerConfig.java +++ b/src/dps-payment-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/paymentservice/configuration/SwaggerConfig.java @@ -3,54 +3,20 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * - * @author smillar - * - */ @Configuration -@EnableSwagger2 -@PropertySource("classpath:application.properties") public class SwaggerConfig { - - @Value("${payment.service.api.version}") - private String version; - - @Value("${payment.service.swagger.enabled:false}") - private Boolean enabled; - - ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("DPS Payment service API") - .description("A Payment Service API") - .license("") - .licenseUrl("") - .termsOfServiceUrl("") - .version(version) - .build(); + @Value("${payment.service.api.version}") + private String version; + + @Bean + public OpenAPI apiDocConfig() { + return new OpenAPI() + .info(new Info() + .title("DPS Payment service API") + .description("A Payment Service API") + .version(version)); } - - @Bean - public Docket customImplementation(){ - - // Note: Enable of service based on application configuration. - - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage("ca.bc.gov.open.pssg.rsbc.dps.paymentservice")) - .paths(PathSelectors.any()) - .build() - .apiInfo(apiInfo()) - .enable(enabled); - } } diff --git a/src/dps-payment-service/src/main/resources/application.properties b/src/dps-payment-service/src/main/resources/application.properties index 957d5205..c448d2ed 100644 --- a/src/dps-payment-service/src/main/resources/application.properties +++ b/src/dps-payment-service/src/main/resources/application.properties @@ -6,7 +6,7 @@ server.tomcat.accesslog.enabled=true payment.service.api.version=0.0.1 # Swagger-UI visibility -payment.service.swagger.enabled=true +springdoc.enable-native-support=true # Hosted Payment url should be placed in configMap. bambora.hostedpaymentendpoint=https://web.na.bambora.com/scripts/payment/payment.asp diff --git a/src/dps-validation-service/pom.xml b/src/dps-validation-service/pom.xml index 98ec8672..4c60e3f3 100644 --- a/src/dps-validation-service/pom.xml +++ b/src/dps-validation-service/pom.xml @@ -49,8 +49,8 @@ springfox-swagger2 - io.springfox - springfox-swagger-ui + org.springdoc + springdoc-openapi-starter-webmvc-ui diff --git a/src/dps-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsvalidationservice/configuration/SwaggerConfig.java b/src/dps-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsvalidationservice/configuration/SwaggerConfig.java index 5c9746e5..2431a870 100644 --- a/src/dps-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsvalidationservice/configuration/SwaggerConfig.java +++ b/src/dps-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/dpsvalidationservice/configuration/SwaggerConfig.java @@ -3,41 +3,19 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.OpenAPI; @Configuration -@EnableSwagger2 public class SwaggerConfig { @Value("${dpsvalidation.service.api.version}") private String version; - @Value("${dpsvalidation.service.swagger.enabled:false}") - private Boolean enabled; - - ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("DPS Validation service API") - .description("A DPS Validation Service API") - .license("") - .licenseUrl("") - .termsOfServiceUrl("") - .version(version) - .build(); - } - @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage("ca.bc.gov.open.pssg.rsbc.dps.dpsvalidationservice")) - .paths(PathSelectors.any()) - .build(); + public OpenAPI apiDocConfig() { + return new OpenAPI() + .info(new Info() + .title("DPS Validation service API") + .description("A DPS Validation Service API") + .version(version)); } - } diff --git a/src/dps-validation-service/src/main/resources/application.properties b/src/dps-validation-service/src/main/resources/application.properties index 870df2cb..aff8697d 100644 --- a/src/dps-validation-service/src/main/resources/application.properties +++ b/src/dps-validation-service/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=${PORT:8080} # Swagger Ui dpsvalidation.service.api.version=0.0.1 -dpsvalidation.service.swagger.enabled=true +springdoc.enable-native-support=true # ORDS DFCMS client configuration dpsvalidation.service.ords.dfcms.client.base-path=${DFCMS_BASE_PATH} diff --git a/src/figaro-validation-service/pom.xml b/src/figaro-validation-service/pom.xml index 486c0d42..40dc039c 100644 --- a/src/figaro-validation-service/pom.xml +++ b/src/figaro-validation-service/pom.xml @@ -48,9 +48,8 @@ compile - io.springfox - springfox-swagger-ui - compile + org.springdoc + springdoc-openapi-starter-webmvc-ui diff --git a/src/figaro-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/configuration/SwaggerConfig.java b/src/figaro-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/configuration/SwaggerConfig.java index bf6b626d..3c2fdb25 100644 --- a/src/figaro-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/configuration/SwaggerConfig.java +++ b/src/figaro-validation-service/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/figvalidationservice/configuration/SwaggerConfig.java @@ -3,57 +3,21 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.OpenAPI; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * - * SwaggerConfig class - * - * @author shaunmillargov - * - */ @Configuration -@EnableSwagger2 -@PropertySource("classpath:application.properties") public class SwaggerConfig { - - @Value("${validation.service.api.version}") - private String version; - - @Value("${validation.service.swagger.enabled:false}") - private Boolean enabled; - - ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("DPS Figaro Validation Service API") - .description("A Validation Service API") - .license("") - .licenseUrl("") - .termsOfServiceUrl("") - .version(version) - .build(); + @Value("${validation.service.api.version}") + private String version; + + @Bean + public OpenAPI apiDocConfig() { + return new OpenAPI() + .info(new Info() + .title("DPS Figaro Validation Service API") + .description("A Validation Service API") + .version(version)); } - - @Bean - public Docket customImplementation(){ - - // Note: Enable of service based on application configuration. - - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage("ca.bc.gov.open.pssg.rsbc.dps.figvalidationservice")) - .paths(PathSelectors.any()) - .build() - .apiInfo(apiInfo()) - .enable(enabled); - } } diff --git a/src/figaro-validation-service/src/main/resources/application.properties b/src/figaro-validation-service/src/main/resources/application.properties index 4edaf412..04328b1b 100644 --- a/src/figaro-validation-service/src/main/resources/application.properties +++ b/src/figaro-validation-service/src/main/resources/application.properties @@ -5,7 +5,7 @@ server.servlet.context-path=/figvalidationservice validation.service.api.version=0.0.1 # Swagger-UI visibility -validation.service.swagger.enabled=true +springdoc.enable-native-support=true # ORDS FIGC client configuration dpsvalidation.service.ords.figcr.client.base-path=${FIGCR_BASE_PATH} diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 31d8a6be..2bc48c59 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -122,6 +122,11 @@ spring-boot-starter-test test + + javax.xml.bind + jaxb-api + + diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index fb1953d9..1b730590 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -44,6 +44,9 @@ 2.0 1.17.1 0.1.9 + 2.2.0 + 2.3.1 + 4.0.0 @@ -92,9 +95,9 @@ ${springfox.version} - io.springfox - springfox-swagger-ui - ${springfox.version} + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi.version} io.swagger @@ -290,6 +293,24 @@ ${java-grok.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jabx-impl.version} + + + com.sun.xml.bind + jaxb-impl + ${jabx-impl.version} + runtime + + + + javax.xml.bind + jaxb-api + ${jaxb-api.version} + + diff --git a/src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfiguration.java b/src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/CacheAutoConfiguration.java similarity index 99% rename from src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfiguration.java rename to src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/CacheAutoConfiguration.java index dabab11b..579e9520 100644 --- a/src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfiguration.java +++ b/src/libs/dps-cache-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/cache/CacheAutoConfiguration.java @@ -19,7 +19,7 @@ @Configuration @ComponentScan -public class AutoConfiguration { +public class CacheAutoConfiguration { /** * Configure the JedisConnectionFactory diff --git a/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5f757343..02d39cd6 100644 --- a/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -ca.bc.gov.open.pssg.rsbc.dps.cache.AutoConfiguration \ No newline at end of file +ca.bc.gov.open.pssg.rsbc.dps.cache.CacheAutoConfiguration \ No newline at end of file diff --git a/src/libs/dps-cache-starter/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfigurationTest.java b/src/libs/dps-cache-starter/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfigurationTest.java index b19a9951..6d506c6a 100644 --- a/src/libs/dps-cache-starter/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfigurationTest.java +++ b/src/libs/dps-cache-starter/src/test/java/ca/bc/gov/open/pssg/rsbc/dps/cache/AutoConfigurationTest.java @@ -17,12 +17,12 @@ public class AutoConfigurationTest { @Mock private RedisProperties redisProperties; - private AutoConfiguration autoConfiguration; + private CacheAutoConfiguration autoConfiguration; @BeforeAll public void init() throws Exception { MockitoAnnotations.initMocks(this); - autoConfiguration = new AutoConfiguration(); + autoConfiguration = new CacheAutoConfiguration(); redisProperties = Mockito.mock(RedisProperties.class); } diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 73f63a0c..3f270ca8 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -125,6 +125,12 @@ spring-boot-starter-test test + + + javax.xml.bind + jaxb-api + + diff --git a/src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/AutoConfiguration.java b/src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/MessageAutoConfiguration.java similarity index 98% rename from src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/AutoConfiguration.java rename to src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/MessageAutoConfiguration.java index 79145140..5f46cf14 100644 --- a/src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/AutoConfiguration.java +++ b/src/libs/dps-messaging-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/messaging/starter/MessageAutoConfiguration.java @@ -24,11 +24,11 @@ @Configuration @ComponentScan @EnableConfigurationProperties(DpsMessagingProperties.class) -public class AutoConfiguration { +public class MessageAutoConfiguration { private final DpsMessagingProperties dpsMessagingProperties; - public AutoConfiguration(DpsMessagingProperties dpsMessagingProperties) { + public MessageAutoConfiguration(DpsMessagingProperties dpsMessagingProperties) { this.dpsMessagingProperties = dpsMessagingProperties; } diff --git a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/AutoConfiguration.java b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java similarity index 93% rename from src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/AutoConfiguration.java rename to src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java index 6bc99630..90a0df11 100644 --- a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/AutoConfiguration.java +++ b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java @@ -13,15 +13,15 @@ @Configuration @ComponentScan @EnableConfigurationProperties(SftpProperties.class) -public class AutoConfiguration { +public class SftpAutoConfiguration { public static final String STRICT_HOST_KEY_CHECKING = "StrictHostKeyChecking"; public static final String NO = "no"; - private Logger logger = LoggerFactory.getLogger(AutoConfiguration.class); + private Logger logger = LoggerFactory.getLogger(SftpAutoConfiguration.class); private final SftpProperties sftpProperties; - public AutoConfiguration(SftpProperties sftpProperties) { + public SftpAutoConfiguration(SftpProperties sftpProperties) { this.sftpProperties = sftpProperties; logger.debug("SFTP Configuration: Host => [{}]", this.sftpProperties.getHost()); logger.debug("SFTP Configuration: Port => [{}]", this.sftpProperties.getPort()); diff --git a/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 136f9d61..2301926d 100644 --- a/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.AutoConfiguration \ No newline at end of file +ca.bc.gov.open.pssg.rsbc.dps.sftp.starter.SftpAutoConfiguration \ No newline at end of file diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index d47d1d81..a7fe12bb 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -123,6 +123,12 @@ spring-boot-starter-test test + + + javax.xml.bind + jaxb-api + + diff --git a/src/spd-notification-worker/pom.xml b/src/spd-notification-worker/pom.xml index 9f10527b..9fc15786 100644 --- a/src/spd-notification-worker/pom.xml +++ b/src/spd-notification-worker/pom.xml @@ -174,6 +174,18 @@ 0.4.1-SNAPSHOT + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + com.sun.xml.bind + jaxb-impl + runtime + + diff --git a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/SpdNotificationWorkerApplication.java b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/SpdNotificationWorkerApplication.java index bb24c4b4..0771f390 100644 --- a/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/SpdNotificationWorkerApplication.java +++ b/src/spd-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/spd/notification/worker/SpdNotificationWorkerApplication.java @@ -3,7 +3,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"ca.bc.gov.open.pssg.rsbc.spd.notification.worker", "ca.bc.gov.open.pssg.rsbc.dps.sftp.starter"}) public class SpdNotificationWorkerApplication { public static void main(String[] args) { diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index ea372603..20715436 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -124,6 +124,18 @@ 0.4.1-SNAPSHOT + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + com.sun.xml.bind + jaxb-impl + runtime + + diff --git a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/VipsNotificationWorkerApplication.java b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/VipsNotificationWorkerApplication.java index 667cabd6..0a28f212 100644 --- a/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/VipsNotificationWorkerApplication.java +++ b/src/vips-notification-worker/src/main/java/ca/bc/gov/open/pssg/rsbc/vips/notification/worker/VipsNotificationWorkerApplication.java @@ -3,7 +3,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"ca.bc.gov.open.pssg.rsbc.vips.notification.worker", "ca.bc.gov.open.jagvipsclient", "ca.bc.gov.open.pssg.rsbc.dps.sftp.starter"}) public class VipsNotificationWorkerApplication { public static void main(String[] args) { From 9cb29c95e1620a61d2f159331eed1424731955dc Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 11 Jan 2024 12:08:06 -0800 Subject: [PATCH 11/52] change to JDK17 --- .github/workflows/maven-sonar.yml | 4 ++-- .github/workflows/maven-test-pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-sonar.yml b/.github/workflows/maven-sonar.yml index bfc8db70..ad0a575b 100644 --- a/.github/workflows/maven-sonar.yml +++ b/.github/workflows/maven-sonar.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - uses: actions/cache@v1 with: path: ~/.m2/repository diff --git a/.github/workflows/maven-test-pr.yml b/.github/workflows/maven-test-pr.yml index 57eba4c9..15390b4d 100644 --- a/.github/workflows/maven-test-pr.yml +++ b/.github/workflows/maven-test-pr.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 - uses: whelk-io/maven-settings-xml-action@v20 with: From 9e12a2aaa301a89f65df39e29e68e524624dbccf Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 11 Jan 2024 12:18:10 -0800 Subject: [PATCH 12/52] change to JDK17 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8438e738..a03c9fce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,7 @@ jobs: with: working_directory: "src" profile: ${{ github.event.inputs.app_name }} + java_version: "17" secrets: nexus_url: ${{ secrets.NEXUS_URL }} From 036c07084b376d0836aaf3ecb2a7fa2e1db1046e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 11 Jan 2024 12:32:58 -0800 Subject: [PATCH 13/52] change to JDK17 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a03c9fce..edd4e4e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: with: working_directory: "src" profile: ${{ github.event.inputs.app_name }} - java_version: "17" + java_version: 17 secrets: nexus_url: ${{ secrets.NEXUS_URL }} From 1c68f8195ecb2abbdcc625fb28c4e0782b02763d Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 12 Jan 2024 08:57:41 -0800 Subject: [PATCH 14/52] fix vulnerabilities --- src/dps-email-poller/pom.xml | 21 +++++++++++++++++++++ src/libs/dps-bom/pom.xml | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index fd880129..12cf899d 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -155,6 +155,27 @@ net.rakugakibox.spring.boot logback-access-spring-boot-starter + + + org.apache.tomcat.embed + tomcat-embed-core + + + + org.json + json + + + + org.springframework + spring-webmvc + + + + org.yaml + snakeyaml + + diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index 1b730590..ce302bc9 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -34,8 +34,7 @@ 2.7.1 3.0.2 2.16.0 - 1.4.8 - 1.4.14 + 1.4.14 4.4.6 2.0 2.0.9 @@ -47,6 +46,10 @@ 2.2.0 2.3.1 4.0.0 + 11.0.0-M16 + 20231013 + 6.1.1 + 2.2 @@ -254,12 +257,12 @@ ch.qos.logback logback-classic - ${logback.classic.version} + ${logback.version} ch.qos.logback logback-core - ${logback.core.version} + ${logback.version} org.slf4j @@ -311,6 +314,30 @@ ${jaxb-api.version} + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed-core.version} + + + + org.json + json + ${json.version} + + + + org.springframework + spring-webmvc + ${spring-webmvc.version} + + + + org.yaml + snakeyaml + ${snakeyaml.version} + + From 5c0d7e63ffe9cbeb6ed057077a3a9b1641f119c6 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 12 Jan 2024 10:09:42 -0800 Subject: [PATCH 15/52] fix vulnerablities --- src/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pom.xml b/src/pom.xml index e54cfc67..f4effd84 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.2.1 ca.bc.gov.open From ab3222ac341ca32642b37a0a051c0358f05b9d0a Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 12 Jan 2024 14:06:15 -0800 Subject: [PATCH 16/52] fix java.lang.NoClassDefFoundError: javax/xml/ws/http/HTTPException --- src/dps-email-poller/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index 12cf899d..eeb1bc03 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -176,6 +176,12 @@ snakeyaml + + javax.xml.ws + jaxws-api + 2.3.1 + + From c014d4caf345b6ce787466880a767be83017e20d Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 12 Jan 2024 14:33:25 -0800 Subject: [PATCH 17/52] fix java.lang.NoClassDefFoundError: javax/xml/ws/http/HTTPException --- src/dps-email-poller/pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index eeb1bc03..a7b1392f 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -176,12 +176,43 @@ snakeyaml + + javax.xml + jaxb-impl + 2.1 + + + + javax.xml.bind + jaxb-api + 2.1 + + javax.xml.ws jaxws-api 2.3.1 + + javax.jws + javax.jws-api + 1.1 + + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + + + + javax.xml.soap + javax.xml.soap-api + 1.4.0 + + + From 8940e348c6d58d0fc9f417381bba098748299518 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Sat, 13 Jan 2024 17:40:33 -0800 Subject: [PATCH 18/52] change AutoConfiguration to MessageAutoConfiguration --- ...springframework.boot.autoconfigure.AutoConfiguration.imports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1c5ebb26..d14abe6f 100644 --- a/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -ca.bc.gov.open.pssg.rsbc.dps.messaging.starter.AutoConfiguration \ No newline at end of file +ca.bc.gov.open.pssg.rsbc.dps.messaging.starter.MessageAutoConfiguration \ No newline at end of file From de30c4a87defec09d614945166e9242dcd7aea9e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Sun, 14 Jan 2024 14:49:21 -0800 Subject: [PATCH 19/52] change libs autoconfig meta-info path --- ...g.springframework.boot.autoconfigure.AutoConfiguration.imports | 0 ...g.springframework.boot.autoconfigure.AutoConfiguration.imports | 0 ...g.springframework.boot.autoconfigure.AutoConfiguration.imports | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/libs/dps-cache-starter/src/main/resources/META-INF/{ => spring}/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename src/libs/dps-messaging-starter/src/main/resources/META-INF/{ => spring}/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename src/libs/dps-sftp-starter/src/main/resources/META-INF/{ => spring}/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) diff --git a/src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-cache-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from src/libs/dps-cache-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to src/libs/dps-cache-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-messaging-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from src/libs/dps-messaging-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to src/libs/dps-messaging-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/libs/dps-sftp-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from src/libs/dps-sftp-starter/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to src/libs/dps-sftp-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports From 93546cff1bdc5199f91154ccac07ae9887a8bde0 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 07:57:27 -0800 Subject: [PATCH 20/52] mvn install all libs modules in Dockerfile --- Dockerfile | 6 +++++ src/dps-email-poller/pom.xml | 12 ++++----- src/dps-email-worker/pom.xml | 20 +++++++------- src/dps-notification-service/pom.xml | 8 +++--- src/dps-payment-service/pom.xml | 4 +-- src/dps-validation-service/pom.xml | 6 ++--- src/figaro-validation-service/pom.xml | 6 ++--- src/libs/dfcms-ords-client/pom.xml | 4 +-- src/libs/dps-cache-starter/pom.xml | 2 +- src/libs/dps-commons/pom.xml | 2 +- src/libs/dps-email-client/pom.xml | 4 +-- src/libs/dps-files/pom.xml | 4 +-- src/libs/dps-messaging-starter/pom.xml | 2 +- src/libs/dps-monitoring/pom.xml | 2 +- src/libs/dps-notification/pom.xml | 2 +- src/libs/dps-sftp-starter/pom.xml | 2 +- src/libs/figaro-ords-client/pom.xml | 4 +-- src/pom.xml | 2 +- src/report/pom.xml | 36 +++++++++++++------------- src/spd-notification-worker/pom.xml | 16 ++++++------ src/vips-notification-worker/pom.xml | 14 +++++----- 21 files changed, 82 insertions(+), 76 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fcd4a33..288d8989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,6 +68,12 @@ WORKDIR $HOME COPY src . +RUN mvn -B clean install \ + --no-transfer-progress \ + --batch-mode \ + -DskipTests=${SKIP_TESTS} \ + -P libs + RUN mvn clean package \ --no-transfer-progress \ --batch-mode \ diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index a7b1392f..c73b1dac 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -7,12 +7,12 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps dps-email-poller - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps-email-poller DPS Email Poller module @@ -38,25 +38,25 @@ ca.bc.gov.open.pssg.rsbc dps-commons - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/dps-email-worker/pom.xml b/src/dps-email-worker/pom.xml index ec432920..946ba11e 100644 --- a/src/dps-email-worker/pom.xml +++ b/src/dps-email-worker/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps dps-email-worker - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps-email-worker DPS Email Worker subscribes to queue and gets messages. @@ -161,50 +161,50 @@ ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-commons - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT compile ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT compile ca.bc.gov.open.pssg.rsbc dps-email-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT compile ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT compile ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-files - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/dps-notification-service/pom.xml b/src/dps-notification-service/pom.xml index 145c92e4..c1079f37 100644 --- a/src/dps-notification-service/pom.xml +++ b/src/dps-notification-service/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open dps-notification-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps-notification-service DPS Notification Service dispatch messages to notification worker @@ -102,13 +102,13 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/dps-payment-service/pom.xml b/src/dps-payment-service/pom.xml index c575175c..a705d886 100644 --- a/src/dps-payment-service/pom.xml +++ b/src/dps-payment-service/pom.xml @@ -6,12 +6,12 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open dps-payment-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps-payment-service DPS Payment Service module diff --git a/src/dps-validation-service/pom.xml b/src/dps-validation-service/pom.xml index 4c60e3f3..27e51ff4 100644 --- a/src/dps-validation-service/pom.xml +++ b/src/dps-validation-service/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps dps-validation-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps-validation-service DPS Validation Service module @@ -182,7 +182,7 @@ ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/figaro-validation-service/pom.xml b/src/figaro-validation-service/pom.xml index 40dc039c..327f406e 100644 --- a/src/figaro-validation-service/pom.xml +++ b/src/figaro-validation-service/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps figaro-validation-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT figaro-validation-service FIGARO DPS Validation Service module @@ -168,7 +168,7 @@ ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 2bc48c59..9eeb8be2 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 17 diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 36b19adb..772e23d9 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index b460e194..360cf79e 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-commons - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 3f270ca8..a8949273 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc dps-email-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 1b8022bf..7c0994c6 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-files - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 @@ -21,7 +21,7 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT org.springframework.boot diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 38b006e2..9cf721ec 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index b4407f1d..07e31f60 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index cf15c9e3..3c9e54de 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index f431569d..c0bc7b56 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index a7fe12bb..18ec3760 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 2.17.1 diff --git a/src/pom.xml b/src/pom.xml index f4effd84..afc837ea 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -11,7 +11,7 @@ ca.bc.gov.open dps - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT dps https://github.com/bcgov/jag-dps diff --git a/src/report/pom.xml b/src/report/pom.xml index 78d758a8..315b8052 100644 --- a/src/report/pom.xml +++ b/src/report/pom.xml @@ -5,7 +5,7 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT 4.0.0 @@ -21,87 +21,87 @@ ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps dps-email-poller - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-commons - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open dps-notification-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps dps-validation-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.pssg.rsbc.dps figaro-validation-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open dps-payment-service - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc spd-notification-worker - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc vips-notification-worker - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-files - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-email-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/spd-notification-worker/pom.xml b/src/spd-notification-worker/pom.xml index 9fc15786..39429a99 100644 --- a/src/spd-notification-worker/pom.xml +++ b/src/spd-notification-worker/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc spd-notification-worker - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT spd-notification-worker CRRP Output Notification Worker @@ -141,37 +141,37 @@ ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-files - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index 20715436..22465f62 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc vips-notification-worker - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT vips-notification-worker @@ -91,7 +91,7 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT @@ -103,25 +103,25 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-files - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT From 9ee350e636293fb830e7467fcd49c39de3df21a2 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 08:08:12 -0800 Subject: [PATCH 21/52] changed to 17 in dev-libs.yml --- .github/workflows/dev-libs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-libs.yml b/.github/workflows/dev-libs.yml index d3f162df..6903eac1 100644 --- a/.github/workflows/dev-libs.yml +++ b/.github/workflows/dev-libs.yml @@ -16,6 +16,7 @@ jobs: with: working-directory: src profile: libs + java_version: 17 secrets: nexus_snapshot_username: "${{ secrets.NEXUS_SNAPSHOT_USERNAME }}" nexus_snapshot_password: "${{ secrets.NEXUS_SNAPSHOT_PASSWORD }}" From 81a5d915475ed8930a101ddfe242a7420e85618e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 10:10:39 -0800 Subject: [PATCH 22/52] Update redis properties --- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dps-email-poller/src/main/resources/application.properties b/src/dps-email-poller/src/main/resources/application.properties index 9c69537e..0c758ba4 100644 --- a/src/dps-email-poller/src/main/resources/application.properties +++ b/src/dps-email-poller/src/main/resources/application.properties @@ -24,9 +24,9 @@ exchange.service.password=${EXCHANGE_PASSWORD} # current (DEV) API Gateway endpoint for EWS exchange.service.endpoint=${EXCHANGE_ENDPOINT} -spring.redis.host:${REDIS_HOST:localhost} -spring.redis.port:${REDIS_PORT:6379} -spring.redis.password:${REDIS_PASSWORD:admin} +spring.redis.data.host:${REDIS_HOST:localhost} +spring.redis.data.port:${REDIS_PORT:6379} +spring.redis.data.password:${REDIS_PASSWORD:admin} # every 5 seconds mailbox.poller.cron=*/5 * * * * ? diff --git a/src/dps-email-worker/src/main/resources/application.properties b/src/dps-email-worker/src/main/resources/application.properties index 0c6189b1..cad8ebcb 100644 --- a/src/dps-email-worker/src/main/resources/application.properties +++ b/src/dps-email-worker/src/main/resources/application.properties @@ -17,9 +17,9 @@ dps.registration.enabled=${USE_REGISTRATION:false} dps.email.service.base-path=${DPS_EMAIL_SERVICE_BASE_PATH:http://localhost:8080} -spring.redis.host=${REDIS_HOST:localhost} -spring.redis.port=${REDIS_PORT:6379} -spring.redis.password=${REDIS_PASSWORD:admin} +spring.redis.data.host=${REDIS_HOST:localhost} +spring.redis.data.port=${REDIS_PORT:6379} +spring.redis.data.password=${REDIS_PASSWORD:admin} dps.sftp.host=${DPS_SFTP_HOST:localhost} dps.sftp.port=${DPS_SFTP_PORT:22} From 26d6b1080c3119d7b2d4f3800ffb6594694a5903 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 11:47:25 -0800 Subject: [PATCH 23/52] Update redis properties --- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dps-email-poller/src/main/resources/application.properties b/src/dps-email-poller/src/main/resources/application.properties index 0c758ba4..686ae374 100644 --- a/src/dps-email-poller/src/main/resources/application.properties +++ b/src/dps-email-poller/src/main/resources/application.properties @@ -24,9 +24,9 @@ exchange.service.password=${EXCHANGE_PASSWORD} # current (DEV) API Gateway endpoint for EWS exchange.service.endpoint=${EXCHANGE_ENDPOINT} -spring.redis.data.host:${REDIS_HOST:localhost} -spring.redis.data.port:${REDIS_PORT:6379} -spring.redis.data.password:${REDIS_PASSWORD:admin} +spring.data.redis.host:${REDIS_HOST:localhost} +spring.data.redis.port:${REDIS_PORT:6379} +spring.data.redis.password:${REDIS_PASSWORD:admin} # every 5 seconds mailbox.poller.cron=*/5 * * * * ? diff --git a/src/dps-email-worker/src/main/resources/application.properties b/src/dps-email-worker/src/main/resources/application.properties index cad8ebcb..83a2672e 100644 --- a/src/dps-email-worker/src/main/resources/application.properties +++ b/src/dps-email-worker/src/main/resources/application.properties @@ -17,9 +17,9 @@ dps.registration.enabled=${USE_REGISTRATION:false} dps.email.service.base-path=${DPS_EMAIL_SERVICE_BASE_PATH:http://localhost:8080} -spring.redis.data.host=${REDIS_HOST:localhost} -spring.redis.data.port=${REDIS_PORT:6379} -spring.redis.data.password=${REDIS_PASSWORD:admin} +spring.data.redis.host=${REDIS_HOST:localhost} +spring.data.redis.port=${REDIS_PORT:6379} +spring.data.redis.password=${REDIS_PASSWORD:admin} dps.sftp.host=${DPS_SFTP_HOST:localhost} dps.sftp.port=${DPS_SFTP_PORT:22} From 2f8da6c66cb28689f2de33bc55e2ab61e8044236 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 13:00:46 -0800 Subject: [PATCH 24/52] downgrade jedis to 3.8.0 to avoid the exception, java.lang.NoClassDefFoundError: redis/clients/jedis/Queable --- src/libs/dps-cache-starter/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 772e23d9..96ad3f67 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -15,6 +15,7 @@ 17 3.10.1 3.1.2 + 3.8.0 @@ -36,6 +37,7 @@ redis.clients jedis + ${jedis} From fdfacc4d4cef6c045949ce22f14c74ee97f3b031 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 14:37:40 -0800 Subject: [PATCH 25/52] Update redis properties --- src/libs/dps-bom/pom.xml | 2 +- src/libs/dps-cache-starter/pom.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index ce302bc9..1ae2d689 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -35,7 +35,7 @@ 3.0.2 2.16.0 1.4.14 - 4.4.6 + 3.8.0 2.0 2.0.9 3.1.3 diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 96ad3f67..772e23d9 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -15,7 +15,6 @@ 17 3.10.1 3.1.2 - 3.8.0 @@ -37,7 +36,6 @@ redis.clients jedis - ${jedis} From ab1e1df444eabc20344b296c1774c746b0892326 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 14:49:44 -0800 Subject: [PATCH 26/52] Update redis properties --- src/dps-email-poller/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index c73b1dac..fb71645a 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -62,6 +62,7 @@ redis.clients jedis + 3.8.0 From 39bc308e0879d71ca3cdba554018a3d9e059ff0e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 15:00:50 -0800 Subject: [PATCH 27/52] Update redis properties --- src/dps-email-poller/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index fb71645a..8cb90174 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -62,7 +62,7 @@ redis.clients jedis - 3.8.0 + 4.2.0 From 80652d83b0b53ae957ab36d1c028d08243ac436b Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 15 Jan 2024 16:41:04 -0800 Subject: [PATCH 28/52] Update redis properties --- src/dps-email-poller/pom.xml | 19 ++++++++++++++++++- src/dps-email-worker/pom.xml | 18 ++++++++++++++++++ src/libs/dps-bom/pom.xml | 5 +++-- src/libs/dps-cache-starter/pom.xml | 5 +++++ 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index 8cb90174..d7c323bb 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -16,6 +16,11 @@ dps-email-poller DPS Email Poller module + + 3.8.0 + 2.7.12 + + central @@ -59,10 +64,22 @@ 0.5.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-data-redis + ${spring-redis.version} + + + + org.springframework.data + spring-data-redis + ${spring-redis.version} + + redis.clients jedis - 4.2.0 + ${jedis.version} diff --git a/src/dps-email-worker/pom.xml b/src/dps-email-worker/pom.xml index 946ba11e..0c64c6cd 100644 --- a/src/dps-email-worker/pom.xml +++ b/src/dps-email-worker/pom.xml @@ -14,6 +14,11 @@ dps-email-worker DPS Email Worker subscribes to queue and gets messages. + + 3.8.0 + 2.7.12 + + central @@ -207,9 +212,22 @@ 0.5.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-data-redis + ${spring-redis.version} + + + + org.springframework.data + spring-data-redis + ${spring-redis.version} + + redis.clients jedis + ${jedis.version} diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index 1ae2d689..530664ab 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -50,6 +50,7 @@ 20231013 6.1.1 2.2 + 2.7.12 @@ -62,12 +63,12 @@ org.springframework.boot spring-boot-starter-data-redis - ${spring-boot.version} + ${spring-redis.version} org.springframework.data spring-data-redis - ${spring-boot.version} + ${spring-redis.version} org.springframework.boot diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index 772e23d9..dafd070f 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -15,6 +15,8 @@ 17 3.10.1 3.1.2 + 3.8.0 + 2.7.12 @@ -26,16 +28,19 @@ org.springframework.boot spring-boot-starter-data-redis + ${spring-redis.version} org.springframework.data spring-data-redis + ${spring-redis.version} redis.clients jedis + ${jedis.version} From 31cfff5bdf108aa28803d2eb66e0027c5ccb26ce Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 16 Jan 2024 12:42:32 -0800 Subject: [PATCH 29/52] logs --- .../rsbc/dps/sftp/starter/SftpAutoConfiguration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java index 90a0df11..a6e6abf6 100644 --- a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java +++ b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java @@ -23,11 +23,11 @@ public class SftpAutoConfiguration { public SftpAutoConfiguration(SftpProperties sftpProperties) { this.sftpProperties = sftpProperties; - logger.debug("SFTP Configuration: Host => [{}]", this.sftpProperties.getHost()); - logger.debug("SFTP Configuration: Port => [{}]", this.sftpProperties.getPort()); - logger.debug("SFTP Configuration: Username => [{}]", this.sftpProperties.getUsername()); - logger.debug("SFTP Configuration: Remote Directory => [{}]", this.sftpProperties.getRemoteLocation()); - logger.debug("SFTP Configuration: Known Host File => [{}]", this.sftpProperties.getKnownHostsFileName()); + logger.info("SFTP Configuration: Host => [{}]", this.sftpProperties.getHost()); + logger.info("SFTP Configuration: Port => [{}]", this.sftpProperties.getPort()); + logger.info("SFTP Configuration: Username => [{}]", this.sftpProperties.getUsername()); + logger.info("SFTP Configuration: Remote Directory => [{}]", this.sftpProperties.getRemoteLocation()); + logger.info("SFTP Configuration: Known Host File => [{}]", this.sftpProperties.getKnownHostsFileName()); } /** From 04ed1d2f1a4ce3cfb1eb1ebf79c88bffdd1670b5 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 18 Jan 2024 07:57:05 -0800 Subject: [PATCH 30/52] //comment is not allowed in application.properties --- .../src/main/resources/application.properties | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/spd-notification-worker/src/main/resources/application.properties b/src/spd-notification-worker/src/main/resources/application.properties index 4f918a37..6e476a1c 100644 --- a/src/spd-notification-worker/src/main/resources/application.properties +++ b/src/spd-notification-worker/src/main/resources/application.properties @@ -7,10 +7,14 @@ spring.rabbitmq.password=${RABBITMQ_PASSWORD:guest} spring.rabbitmq.cache.connection.size=${RABBITMQ_CACHECONNSIZE:50} spring.rabbitmq.listener.simple.retry.enabled=${RABBITMQ_RETRY:true} spring.rabbitmq.listener.simple.missing-queues-fatal=false -spring.rabbitmq.listener.simple.retry.initial-interval=5000 // the first time will wait 5 seconds to try again -spring.rabbitmq.listener.simple.retry.max-attempts=10 //will try a maximum of 10 times -spring.rabbitmq.listener.simple.retry.max-interval=300000 // the maximum interval between attempts is 5 minutes -spring.rabbitmq.listener.simple.retry.multiplier=1.0 // multiplies the range by 3 +# the first time will wait 5 seconds to try again +spring.rabbitmq.listener.simple.retry.initial-interval=5000 +# will try a maximum of 10 times +spring.rabbitmq.listener.simple.retry.max-attempts=10 +# the maximum interval between attempts is 5 minutes +spring.rabbitmq.listener.simple.retry.max-interval=300000 +# multiplies the range by 3 +spring.rabbitmq.listener.simple.retry.multiplier=1.0 dps.messaging.exchange-name=notification From 066cdb23293eb871e035f5667663cdaad83d54ca Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 26 Feb 2024 16:55:49 -0800 Subject: [PATCH 31/52] add the submodule jag-vips-client.git; remove nexus; modify Dockerfile to read the submodule --- .gitmodules | 3 +++ Dockerfile | 29 ++++++++++++++++---------- src/dps-email-poller/pom.xml | 9 -------- src/dps-email-worker/pom.xml | 4 ---- src/libs/dfcms-ords-client/pom.xml | 15 ------------- src/libs/dps-bom/pom.xml | 28 ++++++++++++------------- src/libs/dps-cache-starter/pom.xml | 15 ------------- src/libs/dps-commons/pom.xml | 15 ------------- src/libs/dps-email-client/pom.xml | 15 ------------- src/libs/dps-files/pom.xml | 15 ------------- src/libs/dps-messaging-starter/pom.xml | 14 ------------- src/libs/dps-monitoring/pom.xml | 15 ------------- src/libs/dps-notification/pom.xml | 15 ------------- src/libs/dps-sftp-starter/pom.xml | 15 ------------- src/libs/figaro-ords-client/pom.xml | 15 ------------- src/libs/jag-vips-client | 1 + src/pom.xml | 28 +++---------------------- src/vips-notification-worker/pom.xml | 21 ++++++++++--------- tests/springboot-ewsconntest/pom.xml | 2 +- 19 files changed, 50 insertions(+), 224 deletions(-) create mode 100644 .gitmodules create mode 160000 src/libs/jag-vips-client diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..37757768 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/libs/jag-vips-client"] + path = src/libs/jag-vips-client + url = https://github.com/bcgov/jag-vips-client.git diff --git a/Dockerfile b/Dockerfile index 288d8989..21321b55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,14 @@ +############################################################################################## +#### Stage where the git submodules are updated ### +############################################################################################## +## Defining Arguments and env vars +ARG DPS_SERVICE_NAME + +FROM alpine/git as libraries +WORKDIR /libs +COPY . . +RUN git submodule update --init + ############################################################################################# ### Stage where Docker is caching the dependencies spring boot app using maven ### ############################################################################################# @@ -5,11 +16,8 @@ FROM maven:3.8.6-eclipse-temurin-17 as dependencies ## Defining Arguments and env vars -ARG NEXUS_URL=https://nexus-043918-tools.apps.silver.devops.gov.bc.ca ARG DPS_SERVICE_NAME -ENV NEXUS_URL=${NEXUS_URL} - ## Definig home folder ENV HOME=/opt/app RUN mkdir -p $HOME @@ -28,6 +36,9 @@ COPY src/figaro-validation-service/pom.xml figaro-validation-service/pom.xml COPY src/spd-notification-worker/pom.xml spd-notification-worker/pom.xml COPY src/vips-notification-worker/pom.xml vips-notification-worker/pom.xml +COPY src/report/pom.xml report/pom.xml + +COPY --from=libraries /libs/src/libs/jag-vips-client/src/jag-vips-client/pom.xml libs/jag-vips-client/src/jag-vips-client/pom.xml COPY src/libs/dps-bom/pom.xml libs/dps-bom/pom.xml COPY src/libs/dfcms-ords-client/pom.xml libs/dfcms-ords-client/pom.xml @@ -48,26 +59,23 @@ RUN mvn dependency:go-offline \ --batch-mode \ --fail-never - ############################################################################################# ### Stage where Docker is building spring boot app using maven ### ############################################################################################# FROM dependencies as build -ARG NEXUS_URL=https://nexus-043918-tools.apps.silver.devops.gov.bc.ca - ARG DPS_SERVICE_NAME ARG MVN_PROFILES=${DPS_SERVICE_NAME} ARG SKIP_TESTS=true -ENV NEXUS_URL=${NEXUS_URL} - ENV HOME=/opt/app RUN mkdir -p $HOME WORKDIR $HOME COPY src . +COPY --from=libraries /libs/src/libs/jag-vips-client/src/jag-vips-client libs/jag-vips-client/src/jag-vips-client + RUN mvn -B clean install \ --no-transfer-progress \ --batch-mode \ @@ -80,12 +88,11 @@ RUN mvn clean package \ -DskipTests=${SKIP_TESTS} \ -P ${MVN_PROFILES} - ############################################################################################## #### Stage where Docker is running a java process to run a service built in previous stage ### ############################################################################################## #FROM image-registry.apps.silver.devops.gov.bc.ca/043918-tools/eclipse-temurin:8-jre-jammy -FROM eclipse-temurin:17-jre-alpine +FROM maven:3.8.2-eclipse-temurin-17 as dependencies-cache ARG DPS_SERVICE_NAME @@ -96,4 +103,4 @@ WORKDIR $HOME COPY --from=build ${HOME}/${DPS_SERVICE_NAME}/target/${DPS_SERVICE_NAME}-*.jar ${HOME}/service.jar CMD ["java", "-jar", "service.jar"] -############################################################################################# +############################################################################################# \ No newline at end of file diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index d7c323bb..ed54be50 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -27,15 +27,6 @@ Maven Central https://repo1.maven.org/maven2/ - - nexus-releases - ${env.NEXUS_URL}/repository/dps-group - - - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - true - diff --git a/src/dps-email-worker/pom.xml b/src/dps-email-worker/pom.xml index 0c64c6cd..a48e4fd4 100644 --- a/src/dps-email-worker/pom.xml +++ b/src/dps-email-worker/pom.xml @@ -25,10 +25,6 @@ Maven Central https://repo1.maven.org/maven2/ - - nexus - ${env.NEXUS_URL}/repository/dps-group - diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 9eeb8be2..06db35f0 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -230,19 +230,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - \ No newline at end of file diff --git a/src/libs/dps-bom/pom.xml b/src/libs/dps-bom/pom.xml index 530664ab..0ae3c4c7 100644 --- a/src/libs/dps-bom/pom.xml +++ b/src/libs/dps-bom/pom.xml @@ -51,6 +51,7 @@ 6.1.1 2.2 2.7.12 + 6.1.4 @@ -339,22 +340,19 @@ ${snakeyaml.version} + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-web + ${spring.version} + + - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index dafd070f..f77a80ce 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -120,19 +120,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index 360cf79e..0fe0acb6 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -62,19 +62,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index a8949273..1b4b6fd3 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -236,19 +236,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 7c0994c6..2a200c8f 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -91,19 +91,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - \ No newline at end of file diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 9cf721ec..5cc2a437 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -106,19 +106,5 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - \ No newline at end of file diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 07e31f60..13bd5558 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -58,19 +58,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - \ No newline at end of file diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index 3c9e54de..a41ac882 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -74,19 +74,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index c0bc7b56..2fcbcca3 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -115,19 +115,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - \ No newline at end of file diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index 18ec3760..ed10986c 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -234,19 +234,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - \ No newline at end of file diff --git a/src/libs/jag-vips-client b/src/libs/jag-vips-client new file mode 160000 index 00000000..c91e9b36 --- /dev/null +++ b/src/libs/jag-vips-client @@ -0,0 +1 @@ +Subproject commit c91e9b361da16eb50446b6829a02e46c830d5a9f diff --git a/src/pom.xml b/src/pom.xml index afc837ea..2a31b4d9 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -22,15 +22,6 @@ Maven Central https://repo1.maven.org/maven2/ - - nexus-releases - ${env.NEXUS_URL}/repository/dps-group - - - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - true - @@ -53,14 +44,15 @@ all + libs/jag-vips-client/src/jag-vips-client libs/dps-bom libs/dfcms-ords-client libs/dps-cache-starter + libs/dps-sftp-starter libs/dps-files libs/dps-messaging-starter libs/dps-notification libs/figaro-ords-client - libs/dps-sftp-starter libs/dps-commons libs/dps-email-client libs/dps-monitoring @@ -128,6 +120,7 @@ vips-notification-worker + libs/jag-vips-client/src/jag-vips-client libs/dps-bom libs/dps-notification libs/dps-files @@ -152,19 +145,4 @@ - - - false - nexus-release - ${env.NEXUS_URL}/repository/dps-releases - default - - - true - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - default - - - diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index 22465f62..bc3b3b7d 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -22,16 +22,6 @@ Maven Central https://repo1.maven.org/maven2/ - - nexus-releases - ${env.NEXUS_URL}/repository/dps-group - - - - nexus-snapshots - ${env.NEXUS_URL}/repository/dps-snapshots - true - @@ -136,6 +126,17 @@ runtime + + + org.springframework + spring-core + + + + org.springframework + spring-web + + diff --git a/tests/springboot-ewsconntest/pom.xml b/tests/springboot-ewsconntest/pom.xml index 4eeff951..30580eb1 100644 --- a/tests/springboot-ewsconntest/pom.xml +++ b/tests/springboot-ewsconntest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.2.1 my.pkg.name From 68c71dfc1ce3b6aa1cbfe91e97d89a266d193b4e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 26 Feb 2024 17:47:17 -0800 Subject: [PATCH 32/52] fix vulnerabilities for vips-notification-worker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 21321b55..4422ff00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -92,7 +92,7 @@ RUN mvn clean package \ #### Stage where Docker is running a java process to run a service built in previous stage ### ############################################################################################## #FROM image-registry.apps.silver.devops.gov.bc.ca/043918-tools/eclipse-temurin:8-jre-jammy -FROM maven:3.8.2-eclipse-temurin-17 as dependencies-cache +FROM eclipse-temurin:17-jre-jammy ARG DPS_SERVICE_NAME From b873d35c8bf36ef228f7fe01709f9193fb75e6c7 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 29 Feb 2024 13:23:44 -0800 Subject: [PATCH 33/52] update the submodule link --- src/libs/jag-vips-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/jag-vips-client b/src/libs/jag-vips-client index c91e9b36..398ac387 160000 --- a/src/libs/jag-vips-client +++ b/src/libs/jag-vips-client @@ -1 +1 @@ -Subproject commit c91e9b361da16eb50446b6829a02e46c830d5a9f +Subproject commit 398ac387263692817ef46746f08a84572e656e9e From 1de55e65ed072e53b4c4f283950356e09fc84a5e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Thu, 29 Feb 2024 14:31:29 -0800 Subject: [PATCH 34/52] add module dependencies to profiles so modules are built before application is built --- src/pom.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pom.xml b/src/pom.xml index 2a31b4d9..7208cc7c 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -44,8 +44,8 @@ all - libs/jag-vips-client/src/jag-vips-client libs/dps-bom + libs/jag-vips-client/src/jag-vips-client libs/dfcms-ords-client libs/dps-cache-starter libs/dps-sftp-starter @@ -120,8 +120,8 @@ vips-notification-worker - libs/jag-vips-client/src/jag-vips-client libs/dps-bom + libs/jag-vips-client/src/jag-vips-client libs/dps-notification libs/dps-files libs/dps-sftp-starter @@ -133,6 +133,10 @@ dps-email-poller libs/dps-bom + libs/dps-commons + libs/dps-cache-starter + libs/dps-messaging-starter + libs/dps-monitoring dps-email-poller @@ -140,6 +144,14 @@ dps-email-worker libs/dps-bom + libs/dps-messaging-starter + libs/dps-commons + libs/dps-notification + libs/dps-email-client + libs/dps-cache-starter + libs/dps-sftp-starter + libs/dps-files + libs/dps-monitoring dps-email-worker From 30ec12200378fd4166972a7ad4235320336eb209 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 1 Mar 2024 13:26:33 -0800 Subject: [PATCH 35/52] remove unit-test from main.yml --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edd4e4e2..c8767b40 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,14 +27,14 @@ on: - prod jobs: - unit-test: - uses: SierraSystems/reusable-workflows/.github/workflows/java-unit-tests.yml@main - with: - working_directory: "src" - profile: ${{ github.event.inputs.app_name }} - java_version: 17 - secrets: - nexus_url: ${{ secrets.NEXUS_URL }} +# unit-test: +# uses: SierraSystems/reusable-workflows/.github/workflows/java-unit-tests.yml@main +# with: +# working_directory: "src" +# profile: ${{ github.event.inputs.app_name }} +# java_version: 17 +# secrets: +# nexus_url: ${{ secrets.NEXUS_URL }} # app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) # app-version: @@ -44,7 +44,7 @@ jobs: build-and-push-image: needs: - - unit-test +# - unit-test # - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: From d90e54a3b573bac6916da489008522a33781bf13 Mon Sep 17 00:00:00 2001 From: jianmingtu <49298757+jianmingtu@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:33:09 -0800 Subject: [PATCH 36/52] Update main.yml remove unit-test from main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8767b40..ba90a3f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: # working_directory: "src/${{ github.event.inputs.app_name }}" build-and-push-image: - needs: + # needs: # - unit-test # - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main From 9b0ec27ac89729327cbb09b97b1b5d362cefe87f Mon Sep 17 00:00:00 2001 From: jianmingtu <49298757+jianmingtu@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:51:00 -0800 Subject: [PATCH 37/52] Update main.yml remove unit-test from main.yml --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba90a3f9..c3a9441b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,9 +43,6 @@ jobs: # working_directory: "src/${{ github.event.inputs.app_name }}" build-and-push-image: - # needs: -# - unit-test -# - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} From b94a2ce3f4c74c756750ab9e1bc9224199d0bba8 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 1 Mar 2024 14:31:24 -0800 Subject: [PATCH 38/52] revert the app-version in main.yml --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3a9441b..b3327b20 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,11 +36,11 @@ jobs: # secrets: # nexus_url: ${{ secrets.NEXUS_URL }} -# app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) -# app-version: -# uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main -# with: -# working_directory: "src/${{ github.event.inputs.app_name }}" + app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) + app-version: + uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main + with: + working_directory: "src/${{ github.event.inputs.app_name }}" build-and-push-image: uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main From c8d6b1e805a334672fc2ae80e510e16a8fc296cc Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 4 Mar 2024 11:03:01 -0800 Subject: [PATCH 39/52] change version to 0.5.0 --- src/dps-email-poller/pom.xml | 12 ++++----- src/dps-email-worker/pom.xml | 20 +++++++------- src/dps-notification-service/pom.xml | 8 +++--- src/dps-payment-service/pom.xml | 4 +-- src/dps-validation-service/pom.xml | 6 ++--- src/figaro-validation-service/pom.xml | 6 ++--- src/libs/dfcms-ords-client/pom.xml | 4 +-- src/libs/dps-cache-starter/pom.xml | 2 +- src/libs/dps-commons/pom.xml | 2 +- src/libs/dps-email-client/pom.xml | 4 +-- src/libs/dps-files/pom.xml | 4 +-- src/libs/dps-messaging-starter/pom.xml | 2 +- src/libs/dps-monitoring/pom.xml | 2 +- src/libs/dps-notification/pom.xml | 2 +- src/libs/dps-sftp-starter/pom.xml | 2 +- src/libs/figaro-ords-client/pom.xml | 4 +-- src/pom.xml | 2 +- src/report/pom.xml | 36 +++++++++++++------------- src/spd-notification-worker/pom.xml | 16 ++++++------ src/vips-notification-worker/pom.xml | 14 +++++----- 20 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/dps-email-poller/pom.xml b/src/dps-email-poller/pom.xml index ed54be50..f5ffa712 100644 --- a/src/dps-email-poller/pom.xml +++ b/src/dps-email-poller/pom.xml @@ -7,12 +7,12 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps dps-email-poller - 0.5.0-SNAPSHOT + 0.5.0 dps-email-poller DPS Email Poller module @@ -34,25 +34,25 @@ ca.bc.gov.open.pssg.rsbc dps-commons - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/dps-email-worker/pom.xml b/src/dps-email-worker/pom.xml index a48e4fd4..68429d52 100644 --- a/src/dps-email-worker/pom.xml +++ b/src/dps-email-worker/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps dps-email-worker - 0.5.0-SNAPSHOT + 0.5.0 dps-email-worker DPS Email Worker subscribes to queue and gets messages. @@ -162,50 +162,50 @@ ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-commons - 0.5.0-SNAPSHOT + 0.5.0 compile ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 compile ca.bc.gov.open.pssg.rsbc dps-email-client - 0.5.0-SNAPSHOT + 0.5.0 compile ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.5.0-SNAPSHOT + 0.5.0 compile ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-files - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/dps-notification-service/pom.xml b/src/dps-notification-service/pom.xml index c1079f37..0f038889 100644 --- a/src/dps-notification-service/pom.xml +++ b/src/dps-notification-service/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open dps-notification-service - 0.5.0-SNAPSHOT + 0.5.0 dps-notification-service DPS Notification Service dispatch messages to notification worker @@ -102,13 +102,13 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/dps-payment-service/pom.xml b/src/dps-payment-service/pom.xml index a705d886..a48ce54d 100644 --- a/src/dps-payment-service/pom.xml +++ b/src/dps-payment-service/pom.xml @@ -6,12 +6,12 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open dps-payment-service - 0.5.0-SNAPSHOT + 0.5.0 dps-payment-service DPS Payment Service module diff --git a/src/dps-validation-service/pom.xml b/src/dps-validation-service/pom.xml index 27e51ff4..f0931fc1 100644 --- a/src/dps-validation-service/pom.xml +++ b/src/dps-validation-service/pom.xml @@ -5,12 +5,12 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps dps-validation-service - 0.5.0-SNAPSHOT + 0.5.0 dps-validation-service DPS Validation Service module @@ -182,7 +182,7 @@ ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/figaro-validation-service/pom.xml b/src/figaro-validation-service/pom.xml index 327f406e..6682efb5 100644 --- a/src/figaro-validation-service/pom.xml +++ b/src/figaro-validation-service/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps figaro-validation-service - 0.5.0-SNAPSHOT + 0.5.0 figaro-validation-service FIGARO DPS Validation Service module @@ -168,7 +168,7 @@ ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/libs/dfcms-ords-client/pom.xml b/src/libs/dfcms-ords-client/pom.xml index 06db35f0..b686c5cf 100644 --- a/src/libs/dfcms-ords-client/pom.xml +++ b/src/libs/dfcms-ords-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.5.0-SNAPSHOT + 0.5.0 17 diff --git a/src/libs/dps-cache-starter/pom.xml b/src/libs/dps-cache-starter/pom.xml index f77a80ce..7d81023b 100644 --- a/src/libs/dps-cache-starter/pom.xml +++ b/src/libs/dps-cache-starter/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-commons/pom.xml b/src/libs/dps-commons/pom.xml index 0fe0acb6..0679b9cf 100644 --- a/src/libs/dps-commons/pom.xml +++ b/src/libs/dps-commons/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-commons - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-email-client/pom.xml b/src/libs/dps-email-client/pom.xml index 1b4b6fd3..3ebfa140 100644 --- a/src/libs/dps-email-client/pom.xml +++ b/src/libs/dps-email-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc dps-email-client - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-files/pom.xml b/src/libs/dps-files/pom.xml index 2a200c8f..d74c4a74 100644 --- a/src/libs/dps-files/pom.xml +++ b/src/libs/dps-files/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-files - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 @@ -21,7 +21,7 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 org.springframework.boot diff --git a/src/libs/dps-messaging-starter/pom.xml b/src/libs/dps-messaging-starter/pom.xml index 5cc2a437..f2302e06 100644 --- a/src/libs/dps-messaging-starter/pom.xml +++ b/src/libs/dps-messaging-starter/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-monitoring/pom.xml b/src/libs/dps-monitoring/pom.xml index 13bd5558..cae3bceb 100644 --- a/src/libs/dps-monitoring/pom.xml +++ b/src/libs/dps-monitoring/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-notification/pom.xml b/src/libs/dps-notification/pom.xml index a41ac882..a9fdbba9 100644 --- a/src/libs/dps-notification/pom.xml +++ b/src/libs/dps-notification/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/dps-sftp-starter/pom.xml b/src/libs/dps-sftp-starter/pom.xml index 2fcbcca3..125f1cbf 100644 --- a/src/libs/dps-sftp-starter/pom.xml +++ b/src/libs/dps-sftp-starter/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/libs/figaro-ords-client/pom.xml b/src/libs/figaro-ords-client/pom.xml index ed10986c..532e3e53 100644 --- a/src/libs/figaro-ords-client/pom.xml +++ b/src/libs/figaro-ords-client/pom.xml @@ -5,14 +5,14 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ../../pom.xml 4.0.0 ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.5.0-SNAPSHOT + 0.5.0 2.17.1 diff --git a/src/pom.xml b/src/pom.xml index 7208cc7c..92b8ab5a 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -11,7 +11,7 @@ ca.bc.gov.open dps - 0.5.0-SNAPSHOT + 0.5.0 dps https://github.com/bcgov/jag-dps diff --git a/src/report/pom.xml b/src/report/pom.xml index 315b8052..727eb03c 100644 --- a/src/report/pom.xml +++ b/src/report/pom.xml @@ -5,7 +5,7 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 4.0.0 @@ -21,87 +21,87 @@ ca.bc.gov.open.pssg.rsbc dps-cache-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps dps-email-poller - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-commons - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open dps-notification-service - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps dps-validation-service - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.pssg.rsbc.dps figaro-validation-service - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open dps-payment-service - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc spd-notification-worker - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc vips-notification-worker - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dfcms-ords-client - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-files - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-email-client - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/spd-notification-worker/pom.xml b/src/spd-notification-worker/pom.xml index 39429a99..1a1ad29c 100644 --- a/src/spd-notification-worker/pom.xml +++ b/src/spd-notification-worker/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc spd-notification-worker - 0.5.0-SNAPSHOT + 0.5.0 spd-notification-worker CRRP Output Notification Worker @@ -141,37 +141,37 @@ ca.bc.gov.open.pssg.rsbc figaro-ords-client - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-files - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 diff --git a/src/vips-notification-worker/pom.xml b/src/vips-notification-worker/pom.xml index bc3b3b7d..46cbc2ec 100644 --- a/src/vips-notification-worker/pom.xml +++ b/src/vips-notification-worker/pom.xml @@ -5,11 +5,11 @@ dps ca.bc.gov.open - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc vips-notification-worker - 0.5.0-SNAPSHOT + 0.5.0 vips-notification-worker @@ -81,7 +81,7 @@ ca.bc.gov.open.pssg.rsbc dps-notification - 0.5.0-SNAPSHOT + 0.5.0 @@ -93,25 +93,25 @@ ca.bc.gov.open.pssg.rsbc dps-sftp-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-messaging-starter - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-files - 0.5.0-SNAPSHOT + 0.5.0 ca.bc.gov.open.pssg.rsbc dps-monitoring - 0.5.0-SNAPSHOT + 0.5.0 From 9aba54af92651032e8fd9962b844ba46ee541ca5 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Mon, 11 Mar 2024 08:12:43 -0700 Subject: [PATCH 40/52] change log back to debug --- .../rsbc/dps/sftp/starter/SftpAutoConfiguration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java index a6e6abf6..90a0df11 100644 --- a/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java +++ b/src/libs/dps-sftp-starter/src/main/java/ca/bc/gov/open/pssg/rsbc/dps/sftp/starter/SftpAutoConfiguration.java @@ -23,11 +23,11 @@ public class SftpAutoConfiguration { public SftpAutoConfiguration(SftpProperties sftpProperties) { this.sftpProperties = sftpProperties; - logger.info("SFTP Configuration: Host => [{}]", this.sftpProperties.getHost()); - logger.info("SFTP Configuration: Port => [{}]", this.sftpProperties.getPort()); - logger.info("SFTP Configuration: Username => [{}]", this.sftpProperties.getUsername()); - logger.info("SFTP Configuration: Remote Directory => [{}]", this.sftpProperties.getRemoteLocation()); - logger.info("SFTP Configuration: Known Host File => [{}]", this.sftpProperties.getKnownHostsFileName()); + logger.debug("SFTP Configuration: Host => [{}]", this.sftpProperties.getHost()); + logger.debug("SFTP Configuration: Port => [{}]", this.sftpProperties.getPort()); + logger.debug("SFTP Configuration: Username => [{}]", this.sftpProperties.getUsername()); + logger.debug("SFTP Configuration: Remote Directory => [{}]", this.sftpProperties.getRemoteLocation()); + logger.debug("SFTP Configuration: Known Host File => [{}]", this.sftpProperties.getKnownHostsFileName()); } /** From fed89393ef558b80cf75280d17d0d23218e63965 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 12 Mar 2024 16:00:26 -0700 Subject: [PATCH 41/52] workflow build failure --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3327b20..a3476fa3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,8 +35,6 @@ jobs: # java_version: 17 # secrets: # nexus_url: ${{ secrets.NEXUS_URL }} - - app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) app-version: uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main with: From b916ca8bed51d510d977b25fdd4f82c717163d48 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 12 Mar 2024 16:04:37 -0700 Subject: [PATCH 42/52] workflow build failure --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3476fa3..d717e890 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,10 +35,10 @@ jobs: # java_version: 17 # secrets: # nexus_url: ${{ secrets.NEXUS_URL }} - app-version: - uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main - with: - working_directory: "src/${{ github.event.inputs.app_name }}" +# app-version: +# uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main +# with: +# working_directory: "src/${{ github.event.inputs.app_name }}" build-and-push-image: uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main From 1e721fef172c5d4bd2710c05ddd068e7a56c38ce Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 12 Mar 2024 16:12:33 -0700 Subject: [PATCH 43/52] workflow build failure --- .github/workflows/main.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d717e890..f9d5ebbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,18 +35,21 @@ jobs: # java_version: 17 # secrets: # nexus_url: ${{ secrets.NEXUS_URL }} -# app-version: -# uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main -# with: -# working_directory: "src/${{ github.event.inputs.app_name }}" + app-version: + uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main + with: + working_directory: "src/${{ github.event.inputs.app_name }}" + java_version: 17 build-and-push-image: + needs: + - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} working_directory: . -# image_tags: "dev,${{ needs.app-version.outputs.app-version }}" - image_tags: "dev,1" + image_tags: "dev,${{ needs.app-version.outputs.app-version }}" +# image_tags: "dev,1" env: tools build_args: |- DPS_SERVICE_NAME=${{ github.event.inputs.app_name }} @@ -61,13 +64,13 @@ jobs: trivy: needs: -# - app-version + - app-version - build-and-push-image uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main with: imagestream_name: ${{ github.event.inputs.app_name }} -# image_tag: "${{ needs.app-version.outputs.app-version }}" - image_tag: "latest" + image_tag: "${{ needs.app-version.outputs.app-version }}" +# image_tag: "latest" secrets: openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}" openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" From 56a00c90e7c1516d315632452a60545e83afe81f Mon Sep 17 00:00:00 2001 From: jianming tu Date: Tue, 12 Mar 2024 18:19:38 -0700 Subject: [PATCH 44/52] workflow build failure --- .github/workflows/main.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9d5ebbd..13890113 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,12 @@ jobs: java_version: 17 build-and-push-image: - needs: - - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} working_directory: . - image_tags: "dev,${{ needs.app-version.outputs.app-version }}" -# image_tags: "dev,1" +# image_tags: "dev,${{ needs.app-version.outputs.app-version }}" + image_tags: "dev,1" env: tools build_args: |- DPS_SERVICE_NAME=${{ github.event.inputs.app_name }} @@ -64,13 +62,13 @@ jobs: trivy: needs: - - app-version +# - app-version - build-and-push-image uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main with: imagestream_name: ${{ github.event.inputs.app_name }} - image_tag: "${{ needs.app-version.outputs.app-version }}" -# image_tag: "latest" +# image_tag: "${{ needs.app-version.outputs.app-version }}" + image_tag: "latest" secrets: openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}" openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" From 9db22a44759060cccdd34fe6236e723db42ef1e8 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 09:19:24 -0700 Subject: [PATCH 45/52] workflow build failure --- .github/workflows/main.yml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 13890113..db5782c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,13 +41,31 @@ jobs: working_directory: "src/${{ github.event.inputs.app_name }}" java_version: 17 + define_image_tag: + runs-on: ubuntu-latest + needs: + - app-version + - github-tag + outputs: + image-tag: ${{ steps.tag.outputs.image-tag }} + steps: + - name: defining tag + id: tag + run: | + tag=${{ needs.app-version.outputs.app-version }} + if [ "${{ needs.github-tag.outputs.git-tag }}" ]; then + tag=${{ needs.github-tag.outputs.git-tag }} + fi + echo "::set-output name=image-tag::$tag" + echo "$tag" + build-and-push-image: uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} working_directory: . -# image_tags: "dev,${{ needs.app-version.outputs.app-version }}" - image_tags: "dev,1" + image_tags: "dev,${{ needs.app-version.outputs.app-version }}" +# image_tags: "dev,1" env: tools build_args: |- DPS_SERVICE_NAME=${{ github.event.inputs.app_name }} @@ -62,13 +80,13 @@ jobs: trivy: needs: -# - app-version + - app-version - build-and-push-image uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main with: imagestream_name: ${{ github.event.inputs.app_name }} -# image_tag: "${{ needs.app-version.outputs.app-version }}" - image_tag: "latest" + image_tag: "${{ needs.app-version.outputs.app-version }}" +# image_tag: "latest" secrets: openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}" openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" From f5e83eaa1c489030431249489b9e6ef2d1f81735 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 09:23:15 -0700 Subject: [PATCH 46/52] workflow build failure --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db5782c1..f9b9cc87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,10 @@ on: - prod jobs: + + github-tag: + uses: SierraSystems/reusable-workflows/.github/workflows/github-get-tag.yml@main + # unit-test: # uses: SierraSystems/reusable-workflows/.github/workflows/java-unit-tests.yml@main # with: From ba1b8067247f0a499d9ab064a05a715c9b36bf26 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 16:11:33 -0700 Subject: [PATCH 47/52] workflow build failure --- .github/workflows/main.yml | 59 ++++++++++++-------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9b9cc87..4d07a421 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,49 +27,28 @@ on: - prod jobs: + # unit-test: + # uses: SierraSystems/reusable-workflows/.github/workflows/java-unit-tests.yml@main + # with: + # working_directory: "src" + # profile: ${{ github.event.inputs.app_name }} + # java_version: 17 + # secrets: + # nexus_url: ${{ secrets.NEXUS_URL }} - github-tag: - uses: SierraSystems/reusable-workflows/.github/workflows/github-get-tag.yml@main - -# unit-test: -# uses: SierraSystems/reusable-workflows/.github/workflows/java-unit-tests.yml@main -# with: -# working_directory: "src" -# profile: ${{ github.event.inputs.app_name }} -# java_version: 17 -# secrets: -# nexus_url: ${{ secrets.NEXUS_URL }} - app-version: - uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main - with: - working_directory: "src/${{ github.event.inputs.app_name }}" - java_version: 17 - - define_image_tag: - runs-on: ubuntu-latest - needs: - - app-version - - github-tag - outputs: - image-tag: ${{ steps.tag.outputs.image-tag }} - steps: - - name: defining tag - id: tag - run: | - tag=${{ needs.app-version.outputs.app-version }} - if [ "${{ needs.github-tag.outputs.git-tag }}" ]; then - tag=${{ needs.github-tag.outputs.git-tag }} - fi - echo "::set-output name=image-tag::$tag" - echo "$tag" + # app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) + # app-version: + # uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main + # with: + # working_directory: "src/${{ github.event.inputs.app_name }}" build-and-push-image: uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} working_directory: . - image_tags: "dev,${{ needs.app-version.outputs.app-version }}" -# image_tags: "dev,1" + # image_tags: "dev,${{ needs.app-version.outputs.app-version }}" + image_tags: "dev,1" env: tools build_args: |- DPS_SERVICE_NAME=${{ github.event.inputs.app_name }} @@ -84,17 +63,17 @@ jobs: trivy: needs: - - app-version + # - app-version - build-and-push-image uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main with: imagestream_name: ${{ github.event.inputs.app_name }} - image_tag: "${{ needs.app-version.outputs.app-version }}" -# image_tag: "latest" + # image_tag: "${{ needs.app-version.outputs.app-version }}" + image_tag: "latest" secrets: openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}" openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" openshift_sa_name: "${{ secrets.OPENSHIFT_SA_PIPELINE_PASSWORD_SILVER }}" openshift_sa_password: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}" openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}" - openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}" + openshift_token: "${{ secrets.OPENSHIFT_SA_PIPELINE_TOKEN_SILVER }}" \ No newline at end of file From 4df67358bac435f98f671e57f848399d29741aaa Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 16:39:39 -0700 Subject: [PATCH 48/52] update jdk version --- .github/workflows/dev-email-worker.yml | 4 ++-- .github/workflows/maven-test-pr.yml | 2 +- openshift/templates/dps-payment-service.bc.yaml | 2 +- openshift/templates/dps-validation-service.bc.yaml | 2 +- openshift/templates/figaro-validation-service.bc.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-email-worker.yml b/.github/workflows/dev-email-worker.yml index 46ae5126..33a46466 100644 --- a/.github/workflows/dev-email-worker.yml +++ b/.github/workflows/dev-email-worker.yml @@ -32,11 +32,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: "Set up JDK 8" + - name: "Set up JDK 17" uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 8 + java-version: 17 - name: Get Java Project Version id: get-version diff --git a/.github/workflows/maven-test-pr.yml b/.github/workflows/maven-test-pr.yml index 15390b4d..d2e2961f 100644 --- a/.github/workflows/maven-test-pr.yml +++ b/.github/workflows/maven-test-pr.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '17' cache: 'maven' - name: Build with Maven run: mvn -B test --file src/pom.xml -P all diff --git a/openshift/templates/dps-payment-service.bc.yaml b/openshift/templates/dps-payment-service.bc.yaml index 9d4b0263..519242bf 100644 --- a/openshift/templates/dps-payment-service.bc.yaml +++ b/openshift/templates/dps-payment-service.bc.yaml @@ -43,7 +43,7 @@ spec: value: 'http://nexus:8081/repository/dps-group/' from: kind: ImageStreamTag - name: 'java:8' + name: 'java:17' namespace: openshift type: Source successfulBuildsHistoryLimit: 5 diff --git a/openshift/templates/dps-validation-service.bc.yaml b/openshift/templates/dps-validation-service.bc.yaml index 68557200..ceab59a4 100644 --- a/openshift/templates/dps-validation-service.bc.yaml +++ b/openshift/templates/dps-validation-service.bc.yaml @@ -43,7 +43,7 @@ spec: value: 'http://nexus:8081/repository/dps-group/' from: kind: ImageStreamTag - name: 'java:8' + name: 'java:17' namespace: openshift type: Source successfulBuildsHistoryLimit: 5 diff --git a/openshift/templates/figaro-validation-service.bc.yaml b/openshift/templates/figaro-validation-service.bc.yaml index f0ecb251..6f902f40 100644 --- a/openshift/templates/figaro-validation-service.bc.yaml +++ b/openshift/templates/figaro-validation-service.bc.yaml @@ -43,7 +43,7 @@ spec: value: 'http://nexus:8081/repository/dps-group/' from: kind: ImageStreamTag - name: 'java:8' + name: 'java:17' namespace: openshift type: Source successfulBuildsHistoryLimit: 5 From 4bedb99497983d3423f69771e969caa7219ad91e Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 17:27:08 -0700 Subject: [PATCH 49/52] fix unit tests --- .github/workflows/maven-test-pr.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-test-pr.yml b/.github/workflows/maven-test-pr.yml index d2e2961f..a458cac9 100644 --- a/.github/workflows/maven-test-pr.yml +++ b/.github/workflows/maven-test-pr.yml @@ -16,18 +16,10 @@ jobs: with: java-version: 17 - - uses: whelk-io/maven-settings-xml-action@v20 - with: - servers: >- - [{ - "id":"nexus-snapshots", - "username": "${{ secrets.NEXUS_SNAPSHOT_USERNAME }}", - "password": "${{ secrets.NEXUS_SNAPSHOT_PASSWORD }}" - },{ - "id":"nexus-releases", - "username": "${{ secrets.NEXUS_RELEASES_USERNAME }}", - "password": "${{ secrets.NEXUS_RELEASES_PASSWORD }}" - }] + - name: Pull & update submodules recursively + run: | + git submodule update --init --recursive + git submodule update --recursive --remote - uses: actions/setup-java@v3 with: From beaad84c921216f871840ce8617e4f149cd8642f Mon Sep 17 00:00:00 2001 From: jianming tu Date: Wed, 13 Mar 2024 20:29:22 -0700 Subject: [PATCH 50/52] retag image --- .github/workflows/openshift-imagetagging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openshift-imagetagging.yml b/.github/workflows/openshift-imagetagging.yml index 03326d92..24bc1e6e 100644 --- a/.github/workflows/openshift-imagetagging.yml +++ b/.github/workflows/openshift-imagetagging.yml @@ -37,7 +37,7 @@ jobs: with: image_stream_name: "${{ github.event.inputs.app_name }}" source_image_tag: "${{ github.event.inputs.source_image_tag }}" - image_tags: "${{ github.event.inputs.environment }}" + image_tags: "${{ github.event.inputs.target_environment }}" secrets: openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" openshift_server_url: "${{ secrets.OPENSHIFT_SERVER_URL_SILVER }}" From 885f419eac870d24c612b1d41d56f4fdb637a849 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Sun, 17 Mar 2024 19:28:52 -0700 Subject: [PATCH 51/52] get app versions --- .github/workflows/main.yml | 44 +++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d07a421..2fc0195a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,13 +42,48 @@ jobs: # with: # working_directory: "src/${{ github.event.inputs.app_name }}" + app-version: + name: Get the app-version from the POM file + runs-on: ubuntu-latest + defaults: + run: + working-directory: "." + outputs: + app-version: ${{ steps.step1.outputs.version }} + + steps: + - uses: actions/checkout@v2 + + - name: "Set up JDK 17" + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: 17 + cache: 'maven' + + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Get Project Version + id: step1 + working-directory: "./src" + run: | + _version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -P${{ github.event.inputs.app_name }}) + echo "version=$_version " >> "$GITHUB_OUTPUT" + echo $_version + build-and-push-image: + needs: + - app-version uses: SierraSystems/reusable-workflows/.github/workflows/docker-build-and-push-image.yml@main with: app_name: ${{ github.event.inputs.app_name }} working_directory: . - # image_tags: "dev,${{ needs.app-version.outputs.app-version }}" - image_tags: "dev,1" + image_tags: "dev,${{ needs.app-version.outputs.app-version }}" env: tools build_args: |- DPS_SERVICE_NAME=${{ github.event.inputs.app_name }} @@ -63,13 +98,12 @@ jobs: trivy: needs: - # - app-version + - app-version - build-and-push-image uses: SierraSystems/reusable-workflows/.github/workflows/trivy-scan-openshift-image.yml@main with: imagestream_name: ${{ github.event.inputs.app_name }} - # image_tag: "${{ needs.app-version.outputs.app-version }}" - image_tag: "latest" + image_tag: "${{ needs.app-version.outputs.app-version }}" secrets: openshift_external_repository: "${{ secrets.OPENSHIFT_EXTERNAL_REPOSITORY_SILVER }}" openshift_namespace: "${{ secrets.OPENSHIFT_LICENSE_PLATE_SILVER }}-tools" From b718d28169b5d62aa71bbde9731c92471542d79c Mon Sep 17 00:00:00 2001 From: jianming tu Date: Sun, 17 Mar 2024 20:00:30 -0700 Subject: [PATCH 52/52] get app versions --- .github/workflows/main.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2fc0195a..88b7afa1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,12 +36,6 @@ jobs: # secrets: # nexus_url: ${{ secrets.NEXUS_URL }} - # app-version disabled since "Error: Process completed with exit code 1.", not sure exit code 1 is because of echo 1 (${version) - # app-version: - # uses: SierraSystems/reusable-workflows/.github/workflows/java-maven-app-version.yml@main - # with: - # working_directory: "src/${{ github.event.inputs.app_name }}" - app-version: name: Get the app-version from the POM file runs-on: ubuntu-latest @@ -49,11 +43,15 @@ jobs: run: working-directory: "." outputs: - app-version: ${{ steps.step1.outputs.version }} + app-version: ${{ steps.get-app-version.outputs.version }} steps: - uses: actions/checkout@v2 + - name: Build Vips Client + working-directory: "./src/libs" + run: git submodule update --init + - name: "Set up JDK 17" uses: actions/setup-java@v2 with: @@ -69,12 +67,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Get Project Version - id: step1 + id: get-app-version working-directory: "./src" run: | _version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -P${{ github.event.inputs.app_name }}) echo "version=$_version " >> "$GITHUB_OUTPUT" - echo $_version + echo $_version build-and-push-image: needs: