From 62a207907aea19a6c22edd9c07f0aa1efb34f47c Mon Sep 17 00:00:00 2001 From: MagzhanArtykov Date: Wed, 23 Oct 2024 12:15:12 +0500 Subject: [PATCH 1/4] CIRC-2163 Upgrade to RMB v35.3.0 --- .github/workflows/postgres.yml | 26 ++++++++++++++++++++++++++ pom.xml | 9 +++++++-- ramls/circulation-rules.raml | 3 --- ramls/circulation-settings.raml | 1 - ramls/circulation.raml | 3 +-- ramls/inventory-reports.raml | 3 --- ramls/requests-reports.raml | 3 --- ramls/staff-slips.raml | 3 --- 8 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/postgres.yml diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml new file mode 100644 index 0000000000..1d4d0f80f2 --- /dev/null +++ b/.github/workflows/postgres.yml @@ -0,0 +1,26 @@ +name: postgres +on: + workflow_dispatch: + inputs: + postgres: + description: "List of postgres container images, to be injected as TESTCONTAINERS_POSTGRES_IMAGE" + default: '["postgres:16-alpine", "postgres:18-alpine"]' +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + postgres: ${{ fromJSON(github.event.inputs.postgres) }} + fail-fast: false + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + cache: maven + - run: mvn --batch-mode verify + env: + TESTCONTAINERS_POSTGRES_IMAGE: ${{ matrix.postgres }} diff --git a/pom.xml b/pom.xml index bb6da6be23..964270022e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 4.11.1 7.74.1.Final - 35.2.0 + 35.3.0 4.5.5 2.23.1 UTF-8 @@ -106,7 +106,12 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.17.0 + + + commons-io + commons-io + 2.17.0 org.apache.commons diff --git a/ramls/circulation-rules.raml b/ramls/circulation-rules.raml index ba8b6d26d3..9e74fef840 100644 --- a/ramls/circulation-rules.raml +++ b/ramls/circulation-rules.raml @@ -12,9 +12,6 @@ types: error: !include raml-util/schemas/error.schema errors: !include raml-util/schemas/errors.schema -traits: - language: !include raml-util/traits/language.raml - /circulation: /rules: displayName: Circulation rules diff --git a/ramls/circulation-settings.raml b/ramls/circulation-settings.raml index 731b9187c6..a4de28312d 100644 --- a/ramls/circulation-settings.raml +++ b/ramls/circulation-settings.raml @@ -9,7 +9,6 @@ documentation: content: API for circulation settings traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml diff --git a/ramls/circulation.raml b/ramls/circulation.raml index ff2081a21b..3749bfcdbd 100644 --- a/ramls/circulation.raml +++ b/ramls/circulation.raml @@ -18,7 +18,6 @@ types: errors: !include extended-errors.json traits: - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml searchable: !include raml-util/traits/searchable.raml validate: !include raml-util/traits/validation.raml @@ -364,4 +363,4 @@ resourceTypes: description: "Internal server error" body: text/plain: - example: "Internal server error" \ No newline at end of file + example: "Internal server error" diff --git a/ramls/inventory-reports.raml b/ramls/inventory-reports.raml index 7a95b32c6d..160034f149 100644 --- a/ramls/inventory-reports.raml +++ b/ramls/inventory-reports.raml @@ -11,9 +11,6 @@ documentation: types: items: !include items-in-transit.json -traits: - language: !include raml-util/traits/language.raml - resourceTypes: collection-get: !include raml-util/rtypes/collection-get.raml diff --git a/ramls/requests-reports.raml b/ramls/requests-reports.raml index 9a7505a6ab..f3a552527d 100644 --- a/ramls/requests-reports.raml +++ b/ramls/requests-reports.raml @@ -11,9 +11,6 @@ documentation: types: requests: !include requests.json -traits: - language: !include raml-util/traits/language.raml - resourceTypes: collection-get: !include raml-util/rtypes/collection-get.raml diff --git a/ramls/staff-slips.raml b/ramls/staff-slips.raml index 45c1a7a023..2b57085e5b 100644 --- a/ramls/staff-slips.raml +++ b/ramls/staff-slips.raml @@ -11,9 +11,6 @@ documentation: types: staff-slips: !include staff-slips-response.json -traits: - language: !include raml-util/traits/language.raml - resourceTypes: collection-get: !include raml-util/rtypes/collection-get.raml From b84102fb0a116d0900973a4eea9ce5b74242d971 Mon Sep 17 00:00:00 2001 From: MagzhanArtykov Date: Wed, 23 Oct 2024 12:38:07 +0500 Subject: [PATCH 2/4] CIRC-2163 Upgrade to RMB v35.3.0 --- ramls/raml-util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ramls/raml-util b/ramls/raml-util index 9d7fe883b4..f48a63f3e4 160000 --- a/ramls/raml-util +++ b/ramls/raml-util @@ -1 +1 @@ -Subproject commit 9d7fe883b4e08a262ee3cffc69c33f8b7b63710b +Subproject commit f48a63f3e45b9a3b437d21c3a61ed10b8ceb5f25 From 806b19470c29a66b2cf85b454a9710d6f83796ed Mon Sep 17 00:00:00 2001 From: MagzhanArtykov Date: Wed, 23 Oct 2024 12:47:06 +0500 Subject: [PATCH 3/4] CIRC-2163 Upgrade to RMB v35.3.0 --- ramls/circulation.raml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ramls/circulation.raml b/ramls/circulation.raml index 3749bfcdbd..ea45ea2779 100644 --- a/ramls/circulation.raml +++ b/ramls/circulation.raml @@ -33,7 +33,6 @@ resourceTypes: post: description: Creates a loan by checking out an item to a loanee is: [ - language, validate ] body: @@ -57,7 +56,6 @@ resourceTypes: post: description: Updates the due date of an existing loan is: [ - language, validate ] body: @@ -85,7 +83,6 @@ resourceTypes: post: description: Updates the due date of an existing loan is: [ - language, validate ] body: @@ -113,7 +110,6 @@ resourceTypes: post: description: Updates the status of an existing loan is: [ - language, validate ] body: @@ -295,7 +291,6 @@ resourceTypes: post: description: Creates a request for any item from the given instance ID is: [ - language, validate ] body: From d8dec91c6ddd55060c089db2d8efec4d53c8ebf2 Mon Sep 17 00:00:00 2001 From: MagzhanArtykov Date: Wed, 23 Oct 2024 13:21:02 +0500 Subject: [PATCH 4/4] CIRC-2163 Upgrade to RMB v35.3.0 --- .github/workflows/postgres.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/postgres.yml diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml deleted file mode 100644 index 1d4d0f80f2..0000000000 --- a/.github/workflows/postgres.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: postgres -on: - workflow_dispatch: - inputs: - postgres: - description: "List of postgres container images, to be injected as TESTCONTAINERS_POSTGRES_IMAGE" - default: '["postgres:16-alpine", "postgres:18-alpine"]' -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - postgres: ${{ fromJSON(github.event.inputs.postgres) }} - fail-fast: false - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: maven - - run: mvn --batch-mode verify - env: - TESTCONTAINERS_POSTGRES_IMAGE: ${{ matrix.postgres }}