Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Bump org.postgresql:postgresql from 42.2.5 to 42.3.9 in /cirras-underwriting-api #162

Closed
wants to merge 7 commits into from
Closed

Bump org.postgresql:postgresql from 42.2.5 to 42.3.9 in /cirras-underwriting-api #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7185583
Merge pull request #102 from bcgov/feature/3.5.0
dpitk2222 Nov 13, 2024
64d8f3f
Merge pull request #106 from bcgov/feature/3.5.0
mhostett Nov 19, 2024
cd72de4
Merge pull request #109 from bcgov/feature/3.5.0
mhostett Nov 22, 2024
a7d7639
Merge pull request #118 from bcgov/feature/3.5.0
mhostett Dec 6, 2024
806951c
Merge branch 'master' into release/3.5.0
mhostett Dec 19, 2024
c84b8e7
Merge pull request #105 from bcgov/release/3.5.0
mhostett Dec 19, 2024
6b88ecf
Bump org.postgresql:postgresql in /cirras-underwriting-api
dependabot[bot] Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
with:
ENVIRONMENT: DEV
MICROSERVICE_NAME: cirras-underwriting-war
TAG: ${{ inputs.TAG }}
TAG: ${{ inputs.TAG }}
2 changes: 1 addition & 1 deletion .github/workflows/openshift-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
CIRRAS_UNDERWRITING_REST_URI: https://cirras-underwriting-api-route-${{ inputs.ENVIRONMENT_NAME }}-${{inputs.NAMESPACE}}.apps.silver.devops.gov.bc.ca/cirras-underwriting-api/v1
WEBADE_CIRRAS_UNDERWRITING_UI_SECRET: ${{secrets.WEBADE_CIRRAS_UNDERWRITING_UI_SECRET}}

ACTIVE_PORT: ${{ vars.TARGET_PORT }}
ACTIVE_PORT: ${{ vars.TOMCAT_PORT }}
LOCAL_CHECKTOKEN_ENDPOINT: ${{ vars.LOCAL_CHECKTOKEN_ENDPOINT }}

WEBADE_OAUTH2_ENABLE_CHECKTOKEN: 'true'
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM tomcat:9.0.86-jre17

COPY ./cirras-underwriting-api-rest-endpoints/target/cirras-underwriting-api-rest-endpoints-3.5.0-SNAPSHOT.war .
COPY ./cirras-underwriting-api-rest-endpoints/target/cirras-underwriting-api-rest-endpoints-3.5.0.war .
COPY ./deploy-tools ./deploy-tools

RUN ls
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-api-rest-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-api-rest-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-api-rest-ear/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-api-rest-endpoints/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-api-rest-integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<dependencies>

Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-api/cirras-underwriting-service-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions cirras-underwriting-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-parent</artifactId>
<name>cirras-underwriting-api-parent</name>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
<version>42.3.9</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions cirras-underwriting-liquibase/changelog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{ "include": {"file": "scripts/03_00_xx/03_02_00/00/cirras.cuws.03_02_00_00.ddl.json"} },
{ "include": {"file": "scripts/03_00_xx/03_03_00/00/cirras.cuws.03_03_00_00.ddl.json"} },
{ "include": {"file": "scripts/03_00_xx/03_05_00/01/cirras.cuws.03_05_00_01.ddl.json"} },
{ "include": {"file": "scripts/03_00_xx/03_05_00/01/cirras.cuws.03_05_00_01.dml.json"} },
{ "include": {"file": "scripts/03_00_xx/03_06_00/00/cirras.cuws.03_06_00_00.ddl.json"} }
{ "include": {"file": "scripts/03_00_xx/03_05_00/01/cirras.cuws.03_05_00_01_fix.ddl.json"} },
{ "include": {"file": "scripts/03_00_xx/03_05_00/01/cirras.cuws.03_05_00_01.dml.json"} }
]
}
6 changes: 6 additions & 0 deletions ...-underwriting-liquibase/scripts/03_00_xx/03_05_00/01/cirras.cuws.03_05_00_01_fix.ddl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

{
"databaseChangeLog": [
{ "changeSet": {"author":"mhostettler","id":"87","changes": [
{"sqlFile": {"relativeToChangelogFile": "true", "path": "ddl/tables/cuws.alter.declared_yield_rollup_forage.sql"}}
] } }]}
3 changes: 3 additions & 0 deletions ...ibase/scripts/03_00_xx/03_05_00/01/ddl/tables/cuws.alter.declared_yield_rollup_forage.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--add two more digits to the total bales columns

ALTER TABLE cuws.declared_yield_field_rollup_forage ALTER COLUMN total_bales_loads TYPE numeric(6,0);
2 changes: 1 addition & 1 deletion cirras-underwriting-ngclient-lib/cirras-underwriting-ngclient-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-rest-endpoints</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
<type>json</type>
<classifier>swagger</classifier>

Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-ngclient-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-api-rest-endpoints</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
<type>json</type>
<classifier>swagger</classifier>

Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-war/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM tomcat:9.0.86-jre8

COPY ./cirras-underwriting-war/target/cirras-underwriting-war-3.5.0-SNAPSHOT.war .
COPY ./cirras-underwriting-war/target/cirras-underwriting-war-3.5.0.war .
COPY ./deploy-tools/log4j2.xml .
COPY ./deploy-tools/server.xml .

Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-war/cirras-underwriting-ear/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-war-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<artifactId>cirras-underwriting-ear</artifactId>
<packaging>ear</packaging>
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-war/cirras-underwriting-war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-war-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
</parent>
<artifactId>cirras-underwriting-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ...s-underwriting-war/cirras-underwriting-war/src/main/angular/src/dev-config/appConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"application": {
"acronym": "cirras-underwriting",
"version": "3.5.0-SNAPSHOT",
"version": "3.5.0",
"baseUrl": "http://localhost:11200/",
"environment": "LOCAL",
"buildNumber": "0000"
Expand Down
2 changes: 1 addition & 1 deletion cirras-underwriting-war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
<artifactId>cirras-underwriting-war-parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.5.0</version>
<packaging>pom</packaging>
<name>cirras-underwriting-war-parent</name>
<modules>
Expand Down
10 changes: 10 additions & 0 deletions openshift/cirras-underwriting-api-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ spec:
configMapKeyRef:
name: cirras-underwriting-api-config-#{ENV}#
key: LOG_LEVEL
livenessProbe:
httpGet:
path: /cirras-underwriting-api/v1/checkHealth?callstack=test
port: #{TOMCAT_PORT}#
scheme: HTTP
initialDelaySeconds: 200
timeoutSeconds: 5
periodSeconds: 10
successThreshold: 1
failureThreshold: 2
resources:
requests:
cpu: #{API_CPU_REQUEST}#
Expand Down
10 changes: 10 additions & 0 deletions openshift/cirras-underwriting-jasper-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ spec:
configMapKeyRef:
name: cirras-underwriting-jasper-config-#{ENV}#
key: JASPERREPORTS_UI_PASSWORD
livenessProbe:
httpGet:
scheme: HTTP
path: /jasperserver/
port: 8080
initialDelaySeconds: 1200
timeoutSeconds: 15
periodSeconds: 60
successThreshold: 1
failureThreshold: 2
volumeMounts:
- name: jasper-#{ENV}#
mountPath: /bitnami/jasperreports
Expand Down
10 changes: 10 additions & 0 deletions openshift/cirras-underwriting-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@ spec:
key: LOG_LEVEL
- name: APPLICATION_ENVIRONMENT_NAME
value: #{ENV}#
livenessProbe:
httpGet:
scheme: HTTP
path: /pub/cirras-underwriting/
port: #{TOMCAT_PORT}#
initialDelaySeconds: 60
timeoutSeconds: 5
periodSeconds: 10
successThreshold: 1
failureThreshold: 2
resources:
requests:
cpu: 50m
Expand Down