Merge branch 'master' into localstack-s3-latest

Author: julianladisch

.github/workflows/maven.yml

@@ -0,0 +1,19 @@
+name: Maven central workflow
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  maven:
+    uses: folio-org/.github/.github/workflows/maven.yml@v1
+    # Only handle push events from the main branch or tags, to decrease PR noise
+    if: github.ref_name == github.event.repository.default_branch || github.event_name != 'push' || github.ref_type == 'tag'
+    secrets: inherit
+    with:
+      java-version: '21'
+      publish-module-descriptor: true
+      allow-snapshots-release: false
+      do-sonar-scan: true
+      do-docker: true

Jenkinsfile Jenkinsfile-disabledJenkinsfile renamed to Jenkinsfile-disabled

@@ -1,6 +1,12 @@
 ## Unreleased v3.5.0
 ### Stories
 * [MODEXPW-576](https://folio-org.atlassian.net/browse/MODEXPW-576) Enhance "MARC authority headings update" Report with Record Type Column Based on Consortium Environment.
+* [MODEXPW-619](https://folio-org.atlassian.net/browse/MODEXPW-619) Remove the Linked bib fields column for the Authority headings change report
+* [MODEXPW-624](https://folio-org.atlassian.net/browse/MODEXPW-624) Support running bursar exports as a dry run (no transferring accounts).
+
+### Bug fixes
+* [MODEXPW-617](https://folio-org.atlassian.net/browse/MODEXPW-617) Update Apache Kafka topic template to prevent ambiguous env name matches.
+* [MODEXPW-620](https://folio-org.atlassian.net/browse/MODEXPW-620) Fix Bursar export filtering by age.
 
 ## 2025-03-27 v3.4.1
 

NEWS.md

@@ -38,10 +38,6 @@
       "id": "electronic-access-relationships",
       "version": "1.1"
     },
-    {
-      "id": "instance-authority-links-statistics",
-      "version": "2.1"
-    },
     {
       "id": "holdings-note-types",
       "version": "1.0"
@@ -151,8 +147,12 @@
       "version": "1.2"
     },
     {
-      "id": "settings",
-      "version": "1.2"
+      "id": "locale",
+      "version": "1.0"
+    },
+    {
+      "id": "tenant-addresses",
+      "version": "1.0"
     }
   ],
   "optional": [
@@ -215,6 +215,10 @@
     {
       "id": "eholdings",
       "version": "4.0"
+    },
+    {
+      "id": "instance-authority-links-statistics",
+      "version": "2.1 3.0"
     }
   ],
   "provides": [

descriptors/ModuleDescriptor-template.json

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.4</version>
+        <version>4.0.2</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
@@ -47,13 +47,12 @@
         <refresh-presigned-url.yaml.file>
           ${project.basedir}/src/main/resources/swagger.api/refresh-presigned-url.yaml
         </refresh-presigned-url.yaml.file>
-        <folio-spring-base.version>10.0.0-SNAPSHOT</folio-spring-base.version>
+        <folio-spring-base.version>10.0.0-RC1</folio-spring-base.version>
         <folio-service-tools.version>4.1.1</folio-service-tools.version>
         <folio-spring-cql.version>9.0.0</folio-spring-cql.version>
         <folio-module-descriptor-validator.version>1.0.0</folio-module-descriptor-validator.version>
         <openapi-generator.version>6.2.1</openapi-generator.version>
         <commons-collections4.version>4.5.0</commons-collections4.version>
-        <hypersistence-utils-hibernate-63.version>3.7.3</hypersistence-utils-hibernate-63.version>
         <opencsv.version>5.11.2</opencsv.version>
         <feign-jackson.version>12.1</feign-jackson.version>
         <marc4j.version>2.9.2</marc4j.version>
@@ -62,10 +61,11 @@
         <!-- Test properties-->
         <junit-extensions.version>2.4.0</junit-extensions.version>
         <spring-cloud-starter-bootstrap.version>4.2.0</spring-cloud-starter-bootstrap.version>
-        <wiremock.version>2.27.2</wiremock.version>
+        <wiremock.version>3.13.0</wiremock.version>
         <localstack.version>1.20.5</localstack.version>
         <marc4j.version>2.9.1</marc4j.version>
-        <testcontainers.version>1.17.6</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
+        <testcontainers.extensions.version>1.21.4</testcontainers.extensions.version>
         <aws.sdk.version>2.40.2</aws.sdk.version>
         <folio-s3-client.version>3.0.0-SNAPSHOT</folio-s3-client.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
@@ -126,10 +126,6 @@
           <groupId>org.springframework.batch</groupId>
           <artifactId>spring-batch-integration</artifactId>
       </dependency>
-      <dependency>
-          <groupId>org.springframework.kafka</groupId>
-          <artifactId>spring-kafka</artifactId>
-      </dependency>
 
       <dependency>
           <groupId>org.springframework.boot</groupId>
@@ -142,6 +138,11 @@
           </exclusions>
       </dependency>
 
+      <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-kafka</artifactId>
+      </dependency>
+
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-cache</artifactId>
@@ -189,12 +190,6 @@
         <version>3.11.1</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.hypersistence</groupId>
-        <artifactId>hypersistence-utils-hibernate-63</artifactId>
-        <version>${hypersistence-utils-hibernate-63.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>io.xlate</groupId>
         <artifactId>staedi</artifactId>
@@ -262,14 +257,14 @@
       <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>${testcontainers.version}</version>
+        <version>${testcontainers.extensions.version}</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>postgresql</artifactId>
-        <version>${testcontainers.version}</version>
+        <version>${testcontainers.extensions.version}</version>
         <scope>test</scope>
       </dependency>
 
@@ -279,16 +274,9 @@
         <version>2.7.1</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        <version>${spring-cloud-starter-bootstrap.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-test</artifactId>
-        <version>3.4.0</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -345,11 +333,16 @@
           <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
+            <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
             <version>${wiremock.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

folio-export-common

@@ -1,6 +1,5 @@
 package org.folio.de.entity;
 
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import lombok.Data;
 import org.folio.dew.domain.dto.EntityType;
 import org.folio.dew.domain.dto.ExportType;
@@ -9,7 +8,8 @@
 import org.folio.dew.domain.dto.JobStatus;
 import org.folio.dew.domain.dto.Progress;
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
 
@@ -44,18 +44,18 @@ public class Job {
   @Enumerated(EnumType.STRING)
   private ExportType type;
 
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column(columnDefinition = "jsonb")
   private ExportTypeSpecificParameters exportTypeSpecificParameters;
 
   @Enumerated(EnumType.STRING)
   private JobStatus status;
 
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column(columnDefinition = "jsonb")
   private List<String> files = null;
 
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column(columnDefinition = "jsonb")
   private List<String> fileNames = null;
 
@@ -82,7 +82,7 @@ public class Job {
   @Enumerated(EnumType.STRING)
   private BatchStatus batchStatus;
 
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column(columnDefinition = "jsonb")
   private ExitStatus exitStatus;
 
@@ -92,7 +92,7 @@ public class Job {
   @Enumerated(EnumType.STRING)
   private EntityType entityType;
 
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   @Column(columnDefinition = "jsonb")
   private Progress progress;
 

pom.xml

@@ -1,6 +1,5 @@
 package org.folio.de.entity;
 
-import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -10,8 +9,9 @@
 import org.folio.dew.domain.dto.EntityType;
 import org.folio.dew.domain.dto.ExportType;
 import org.folio.dew.domain.dto.IdentifierType;
-import org.hibernate.annotations.Type;
-import org.springframework.batch.core.JobParameters;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+import org.springframework.batch.core.job.parameters.JobParameters;
 
 import java.util.UUID;
 
@@ -27,7 +27,7 @@ public class JobCommand {
   private String description;
   @Enumerated(EnumType.STRING)
   private ExportType exportType;
-  @Type(JsonBinaryType.class)
+  @JdbcTypeCode(SqlTypes.JSON)
   private JobParameters jobParameters;
   @Enumerated(EnumType.STRING)
   private IdentifierType identifierType;

src/main/java/org/folio/de/entity/Job.java

@@ -3,12 +3,13 @@
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 
-@SpringBootApplication
-@EnableFeignClients(basePackages = "org.folio.dew.client")
-@EnableBatchProcessing(isolationLevelForCreate = "ISOLATION_READ_COMMITTED")
+@SpringBootApplication(scanBasePackages = {
+  "org.folio.dew",
+  "org.folio.spring.scope"
+})
+@EnableBatchProcessing
 @EntityScan("org.folio.de.entity")
 public class ModDataExportWorkerApplication {
 

src/main/java/org/folio/de/entity/JobCommand.java

@@ -9,11 +9,11 @@
 import org.folio.dew.repository.LocalFilesStorage;
 import org.folio.dew.repository.S3CompatibleResource;
 import org.folio.dew.repository.S3CompatibleStorage;
-import org.springframework.batch.item.Chunk;
-import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.item.file.transform.BeanWrapperFieldExtractor;
-import org.springframework.batch.item.file.transform.DelimitedLineAggregator;
-import org.springframework.batch.item.file.transform.LineAggregator;
+import org.springframework.batch.infrastructure.item.Chunk;
+import org.springframework.batch.infrastructure.item.ItemWriter;
+import org.springframework.batch.infrastructure.item.file.transform.BeanWrapperFieldExtractor;
+import org.springframework.batch.infrastructure.item.file.transform.DelimitedLineAggregator;
+import org.springframework.batch.infrastructure.item.file.transform.LineAggregator;
 import org.springframework.core.io.WritableResource;
 
 import java.nio.charset.StandardCharsets;