Merge branch 'main' into spring-batch-s3

Signed-off-by: Andrea Cioni <[email protected]>

Author: andreacioni

.github/CODEOWNERS

@@ -1,6 +1,5 @@
 /spring-batch-bigquery/ @dgray16
-/spring-batch-elasticsearch/
+/spring-batch-elasticsearch/ @hpoettker
 /spring-batch-excel/ @mdeinum
-/spring-batch-geode/
 /spring-batch-neo4j/ @michael-simons @meistermeier
 /spring-batch-notion/ @scordio

.github/workflows/spring-batch-bigquery.yml

@@ -3,9 +3,11 @@ name: Spring Batch BigQuery
 on:
   pull_request:
     paths:
+      - '.github/workflows/spring-batch-bigquery.yml'
       - 'spring-batch-bigquery/**'
   push:
     paths:
+      - '.github/workflows/spring-batch-bigquery.yml'
       - 'spring-batch-bigquery/**'
 
 jobs:

.github/workflows/spring-batch-elasticsearch.yml

@@ -3,9 +3,11 @@ name: Spring Batch Elasticsearch
 on:
   pull_request:
     paths:
+      - '.github/workflows/spring-batch-elasticsearch.yml'
       - 'spring-batch-elasticsearch/**'
   push:
     paths:
+      - '.github/workflows/spring-batch-elasticsearch.yml'
       - 'spring-batch-elasticsearch/**'
 
 jobs:

.github/workflows/spring-batch-excel.yml

@@ -3,21 +3,23 @@ name: Spring Batch Excel
 on:
   pull_request:
     paths:
+      - '.github/workflows/spring-batch-excel.yml'
       - 'spring-batch-excel/**'
   push:
     paths:
+      - '.github/workflows/spring-batch-excel.yml'
       - 'spring-batch-excel/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: Build with Maven
         run: mvn -B package

.github/workflows/spring-batch-geode.yml

@@ -3,9 +3,11 @@ name: Spring Batch Neo4j
 on:
   pull_request:
     paths:
+      - '.github/workflows/spring-batch-neo4j.yml'
       - 'spring-batch-neo4j/**'
   push:
     paths:
+      - '.github/workflows/spring-batch-neo4j.yml'
       - 'spring-batch-neo4j/**'
 
 jobs:

.github/workflows/spring-batch-neo4j.yml

@@ -3,9 +3,11 @@ name: Spring Batch Notion
 on:
   pull_request:
     paths:
+      - '.github/workflows/spring-batch-notion.yml'
       - 'spring-batch-notion/**'
   push:
     paths:
+      - '.github/workflows/spring-batch-notion.yml'
       - 'spring-batch-notion/**'
 
 env:
@@ -20,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
           cache: 'maven'
       - name: Build with Maven
         run: ./mvnw $MAVEN_ARGS verify javadoc:javadoc

.github/workflows/spring-batch-notion.yml

@@ -3,7 +3,8 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
 ## Directory-based project format
-.idea/
+.idea/*
+!/.idea/icon.svg
 *.iml
 # if you remove the above rule, at least ignore user-specific stuff:
 # .idea/workspace.xml

.gitignore

@@ -9,9 +9,8 @@ This project is part of the [Spring organization][] on GitHub.
 | Module                                                     | Description                   | Lead                                                 | Version                                                                                                                                                                                                                                 | CI build                                                                                                                                                                                                                                                                                |
 |------------------------------------------------------------|-------------------------------|------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [`spring-batch-bigquery`](spring-batch-bigquery)           | Support for [Google BigQuery] | [@dgray16](https://github.com/dgray16)               | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-bigquery?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-bigquery)           | [![Spring Batch BigQuery](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-bigquery.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-bigquery.yml?query=branch%3Amain)                |
-| [`spring-batch-elasticsearch`](spring-batch-elasticsearch) | Support for [Elasticsearch]   | TBA                                                  | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-elasticsearch?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-elasticsearch) | [![Spring Batch Elasticsearch](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-elasticsearch.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-elasticsearch.yml?query=branch%3Amain) |
+| [`spring-batch-elasticsearch`](spring-batch-elasticsearch) | Support for [Elasticsearch]   | [@hpoettker](https://github.com/hpoettker)           | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-elasticsearch?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-elasticsearch) | [![Spring Batch Elasticsearch](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-elasticsearch.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-elasticsearch.yml?query=branch%3Amain) |
 | [`spring-batch-excel`](spring-batch-excel)                 | Support for [Microsoft Excel] | [@mdeinum](https://github.com/mdeinum)               | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-excel?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-excel)                 | [![Spring Batch Excel](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-excel.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-excel.yml?query=branch%3Amain)                         |
-| [`spring-batch-geode`](spring-batch-geode)                 | Support for [Apache Geode]    | TBA                                                  | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-geode?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-geode)                 | [![Spring Batch Geode](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-geode.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-geode.yml?query=branch%3Amain)                         |
 | [`spring-batch-neo4j`](spring-batch-neo4j)                 | Support for [Neo4j]           | [@michael-simons](https://github.com/michael-simons) | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-neo4j?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-neo4j)                 | [![Spring Batch Neo4j](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-neo4j.yml/badge.svg)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-neo4j.yml?query=branch%3Amain)                         |
 | [`spring-batch-notion`](spring-batch-notion)               | Support for [Notion]          | [@scordio](https://github.com/scordio)               | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-notion?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-notion)               | [![Spring Batch Notion](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-notion.yml/badge.svg?branch=main)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-notion.yml?query=branch%3Amain)          |
 | [`spring-batch-s3`](spring-batch-s3)                       | Support for [Amazon S3]       | [@andreacioni](https://github.com/andreacioni)       | [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.batch.extensions/spring-batch-s3?label)](https://central.sonatype.com/artifact/org.springframework.batch.extensions/spring-batch-s3)                       | [![Spring Batch S3](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-s3.yml/badge.svg?branch=main)](https://github.com/spring-projects/spring-batch-extensions/actions/workflows/spring-batch-s3.yml?query=branch%3Amain)                      |