From 2734a4334da11ec069e1741543291602365becf3 Mon Sep 17 00:00:00 2001 From: Pavlo Smahin Date: Fri, 11 Oct 2024 17:32:51 +0300 Subject: [PATCH 1/3] fix: revert changes related to publication period migration (#1094) Related: MODINVSTOR-1232 --- ramls/instance.json | 15 +++++++++++++++ .../resources/templates/db_scripts/schema.json | 5 ----- .../rest/api/PublicationPeriodMigrationTest.java | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ramls/instance.json b/ramls/instance.json index 50088d2bf..8f0d6c1a5 100644 --- a/ramls/instance.json +++ b/ramls/instance.json @@ -286,6 +286,21 @@ }, "uniqueItems": true }, + "publicationPeriod": { + "type": "object", + "description": "Publication period", + "properties": { + "start": { + "type": "integer", + "description": "Publication start year" + }, + "end": { + "type": "integer", + "description": "Publication end year" + } + }, + "additionalProperties": false + }, "electronicAccess": { "type": "array", "description": "List of electronic access items", diff --git a/src/main/resources/templates/db_scripts/schema.json b/src/main/resources/templates/db_scripts/schema.json index e2c76f3e1..e3cd3a41b 100644 --- a/src/main/resources/templates/db_scripts/schema.json +++ b/src/main/resources/templates/db_scripts/schema.json @@ -1227,11 +1227,6 @@ "run": "after", "snippetPath": "subjectIdsReferenceCheckTrigger.sql", "fromModuleVersion": "27.2.0" - }, - { - "run": "after", - "snippetPath": "publication-period/migratePublicationPeriod.sql", - "fromModuleVersion": "28.0.0" } ] } diff --git a/src/test/java/org/folio/rest/api/PublicationPeriodMigrationTest.java b/src/test/java/org/folio/rest/api/PublicationPeriodMigrationTest.java index 8828a65ee..f66d4b087 100644 --- a/src/test/java/org/folio/rest/api/PublicationPeriodMigrationTest.java +++ b/src/test/java/org/folio/rest/api/PublicationPeriodMigrationTest.java @@ -18,7 +18,9 @@ import org.folio.rest.persist.PostgresClient; import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.Disabled; +@Disabled public class PublicationPeriodMigrationTest extends MigrationTestBase { private static final String MIGRATION_SCRIPT = loadScript("publication-period/migratePublicationPeriod.sql"); private static final String TAG_VALUE = "test-tag"; From 1366050170cfada7889ed64b7306a144f799aa69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:07:52 +0000 Subject: [PATCH 2/3] chore(deps-dev): bump org.folio.okapi:okapi-testing (#1095) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81e9542ca..b57bd6348 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 2.24.0 2.2.0-SNAPSHOT - 6.0.2 + 6.0.3 5.11.1 1.20.1 2.13.0 From 6feed42b418a1bba27a47e22d1ce2c258f82a361 Mon Sep 17 00:00:00 2001 From: julianladisch Date: Tue, 15 Oct 2024 10:01:10 +0200 Subject: [PATCH 3/3] MODINVSTOR-1272: Upgrade localstack from 0.11.3 to s3-latest (#1097) https://folio-org.atlassian.net/browse/MODINVSTOR-1272 0.11.3 has been released 2020-06-28: https://github.com/localstack/localstack/releases/tag/v0.11.3 0.11.3 has an image size of 454 MB: https://hub.docker.com/r/localstack/localstack/tags?name=0.11.3 s3-latest has been released 2024-10-03 and has an image size of 108 MB: https://hub.docker.com/r/localstack/localstack/tags?name=0.11.3 This reduces the image size from 454 MB to 108 MB. For the s3 only image there's no version tag, only the -latest tag. --- NEWS.md | 3 +++ pom.xml | 2 -- .../folio/rest/api/InstanceStorageInstancesBulkApiTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 84c8485a3..9d4fe667f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -11,6 +11,9 @@ * Provides `inventory-view-instance-set 3.0` * Provides `instance-iteration 1.0` +### Tech Dept +* Upgrade localstack from 0.11.3 to s3-latest (=3.8.0) ([MODINVSTOR-1272](https://folio-org.atlassian.net/browse/MODINVSTOR-1272)) + ## v27.2.0 2024-09-24 ### Breaking changes * Required sourceId field in holdings record ([MODINVSTOR-1161](https://folio-org.atlassian.net/browse/MODINVSTOR-1161)) diff --git a/pom.xml b/pom.xml index b57bd6348..6eb1de693 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ 5.5.0 4.2.2 3.26.3 - 1.20.2 3.13.0 3.6.0 @@ -237,7 +236,6 @@ org.testcontainers localstack - ${localstack.version} test diff --git a/src/test/java/org/folio/rest/api/InstanceStorageInstancesBulkApiTest.java b/src/test/java/org/folio/rest/api/InstanceStorageInstancesBulkApiTest.java index 80016be75..0a8ef90fd 100644 --- a/src/test/java/org/folio/rest/api/InstanceStorageInstancesBulkApiTest.java +++ b/src/test/java/org/folio/rest/api/InstanceStorageInstancesBulkApiTest.java @@ -79,7 +79,7 @@ public class InstanceStorageInstancesBulkApiTest extends TestBaseWithInventoryUt @BeforeClass public static void setUpClass() { - localStackContainer = new LocalStackContainer(DockerImageName.parse("localstack/localstack:0.11.3")) + localStackContainer = new LocalStackContainer(DockerImageName.parse("localstack/localstack:s3-latest")) .withServices(S3); localStackContainer.start();