Merge branch 'master' into MODINVSTOR-1247

folio-org · Oct 15, 2024 · 995ada0 · 995ada0
2 parents c17551a + 6feed42
commit 995ada0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -17,6 +17,9 @@
 ### Features
 * Add module descriptor validator plugin and fix the permission names ([MODINVSTOR-1247](https://folio-org.atlassian.net/browse/MODINVSTOR-1247))
 
+### 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
@@ -24,7 +24,7 @@
     <log4j.version>2.24.0</log4j.version>
     <folio-s3-client.version>2.2.0-SNAPSHOT</folio-s3-client.version>
 
-    <okapi-testing.version>6.0.2</okapi-testing.version>
+    <okapi-testing.version>6.0.3</okapi-testing.version>
     <junit.version>5.11.1</junit.version>
     <testcontainers.version>1.20.1</testcontainers.version>
     <joda-time.version>2.13.0</joda-time.version>
@@ -36,7 +36,6 @@
     <rest-assured.version>5.5.0</rest-assured.version>
     <awaitility.version>4.2.2</awaitility.version>
     <assertj.version>3.26.3</assertj.version>
-    <localstack.version>1.20.2</localstack.version>
 
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
@@ -238,7 +237,6 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>localstack</artifactId>
-      <version>${localstack.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git 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
@@ -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/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();

diff --git 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";