From cb3bb7e5fe3a298548f3e9125732ee172bd2a1fe Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:20:12 +0200
Subject: [PATCH 1/8] [#77] Update to java 17
---
.github/workflows/build_girders.yml | 18 ++++++++++
.idea/compiler.xml | 50 ++-------------------------
.idea/misc.xml | 4 +--
girders-demos/pom.xml | 6 ++--
girders-parent/pom.xml | 4 +--
pom.xml | 2 +-
src/site/markdown/quickstart/index.md | 2 +-
7 files changed, 29 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/build_girders.yml b/.github/workflows/build_girders.yml
index 691ec34e..66526455 100644
--- a/.github/workflows/build_girders.yml
+++ b/.github/workflows/build_girders.yml
@@ -78,4 +78,22 @@ jobs:
cache: 'maven'
- name: run integration tests
run: mvn --batch-mode -f girders-demos/girders-demo-test/pom.xml install
+
+ integration_tests_21:
+ name: Integration tests for Java 21
+ runs-on: ubuntu-latest
+ needs: build_girders
+ permissions:
+ contents: read
+ packages: write
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up JDK 21
+ uses: actions/setup-java@v3
+ with:
+ java-version: '21.0.0'
+ distribution: 'zulu'
+ cache: 'maven'
+ - name: run integration tests
+ run: mvn --batch-mode -f girders-demos/girders-demo-test/pom.xml install
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4c7f0592..5f523abe 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -26,6 +26,7 @@
+
@@ -52,54 +53,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e3254577..67af4ca5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/girders-demos/pom.xml b/girders-demos/pom.xml
index b3d2fe87..7cc16673 100644
--- a/girders-demos/pom.xml
+++ b/girders-demos/pom.xml
@@ -23,9 +23,9 @@
- 17
- 17
- 17
+ 21
+ 21
+ 21
4.6.2
6.2.2-SNAPSHOT
diff --git a/girders-parent/pom.xml b/girders-parent/pom.xml
index 77fa3971..1a7bc37b 100644
--- a/girders-parent/pom.xml
+++ b/girders-parent/pom.xml
@@ -16,8 +16,8 @@
Girders Parent
- 17
- 17
+ 21
+ 21
UTF-8
10.12.1
diff --git a/pom.xml b/pom.xml
index 22240511..6f7f6550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
- 17
+ 21
UTF-8
UTF-8
0.8
diff --git a/src/site/markdown/quickstart/index.md b/src/site/markdown/quickstart/index.md
index fed5d1f0..5aa6dc89 100644
--- a/src/site/markdown/quickstart/index.md
+++ b/src/site/markdown/quickstart/index.md
@@ -38,7 +38,7 @@ pom.xml:
- 17
+ 21
From a64cdac971934df20135b7fc5379871eac9c4b6a Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:26:45 +0200
Subject: [PATCH 2/8] [#77] Set java 21 version in workflow as well
---
.github/workflows/build_girders.yml | 4 ++--
.github/workflows/release_girders.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_girders.yml b/.github/workflows/build_girders.yml
index 66526455..e6339f64 100644
--- a/.github/workflows/build_girders.yml
+++ b/.github/workflows/build_girders.yml
@@ -23,10 +23,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- - name: Set up JDK 17
+ - name: Set up JDK 21
uses: actions/setup-java@v3
with:
- java-version: '17.0.0'
+ java-version: '21.0.0'
distribution: 'zulu'
cache: 'maven'
server-id: 'ossrh' # Value of the distributionManagement/repository/id field of the pom.xml
diff --git a/.github/workflows/release_girders.yml b/.github/workflows/release_girders.yml
index 399f3f5a..3943641b 100644
--- a/.github/workflows/release_girders.yml
+++ b/.github/workflows/release_girders.yml
@@ -46,10 +46,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- - name: Set up JDK 17
+ - name: Set up JDK 21
uses: actions/setup-java@v3
with:
- java-version: '17.0.0'
+ java-version: '21.0.0'
distribution: 'zulu'
cache: 'maven'
server-id: 'ossrh' # Value of the distributionManagement/repository/id field of the pom.xml
From 038d1c9b147e23507f7e8a6ce8a63b53d6b5d9de Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:54:04 +0200
Subject: [PATCH 3/8] [#77] Disable parallel running tests
Let's see if this fixes the issues with the tests running on github actions.
---
.../girders-dbunit/src/test/resources/junit-platform.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/girders-libs/girders-dbunit/src/test/resources/junit-platform.properties b/girders-libs/girders-dbunit/src/test/resources/junit-platform.properties
index 809878a5..a2c7d487 100644
--- a/girders-libs/girders-dbunit/src/test/resources/junit-platform.properties
+++ b/girders-libs/girders-dbunit/src/test/resources/junit-platform.properties
@@ -1 +1 @@
-junit.jupiter.execution.parallel.enabled=true
\ No newline at end of file
+junit.jupiter.execution.parallel.enabled=false
\ No newline at end of file
From 307827cf752dc5e0df81f84447d0bceea518941a Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Mon, 9 Oct 2023 16:54:40 +0200
Subject: [PATCH 4/8] [#77] Adjust dependabot to group dependency update pull
requests
See also:
https://github.blog/changelog/2023-08-24-grouped-version-updates-for-dependabot-are-generally-available/
---
.github/dependabot.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b7e3c811..763c6652 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,21 +5,23 @@ version: 2
updates:
# Checks for outdated maven dependencies
- package-ecosystem: "maven"
+ patterns: *
directory: "/"
schedule:
interval: "weekly"
day: "monday"
- open-pull-requests-limit: 5
+ open-pull-requests-limit: 10
commit-message:
prefix: "[dependabot]"
include: "scope"
# Checks for outdated GitHub actions
- package-ecosystem: "github-actions"
+ patterns: *
directory: "/"
schedule:
interval: "weekly"
day: "monday"
- open-pull-requests-limit: 5
+ open-pull-requests-limit: 10
commit-message:
prefix: "[dependabot]"
include: "scope"
From 88a3a9cedcf894055ee327240c9febb97c2b4221 Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:10:16 +0200
Subject: [PATCH 5/8] [#77] Remove java 17 integration test
---
.github/workflows/build_girders.yml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/.github/workflows/build_girders.yml b/.github/workflows/build_girders.yml
index e6339f64..c2ff9fe3 100644
--- a/.github/workflows/build_girders.yml
+++ b/.github/workflows/build_girders.yml
@@ -61,24 +61,6 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=girders-java
- integration_tests_17:
- name: Integration tests for Java 17
- runs-on: ubuntu-latest
- needs: build_girders
- permissions:
- contents: read
- packages: write
- steps:
- - uses: actions/checkout@v3
- - name: Set up JDK 17
- uses: actions/setup-java@v3
- with:
- java-version: '17.0.0'
- distribution: 'zulu'
- cache: 'maven'
- - name: run integration tests
- run: mvn --batch-mode -f girders-demos/girders-demo-test/pom.xml install
-
integration_tests_21:
name: Integration tests for Java 21
runs-on: ubuntu-latest
From 74938f1366b309af81a3f21f7dc35650ed11446f Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:33:32 +0200
Subject: [PATCH 6/8] [#77] Add back java 17 integration test and set build jdk
to 17
---
.github/workflows/build_girders.yml | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build_girders.yml b/.github/workflows/build_girders.yml
index c2ff9fe3..00b5ee8d 100644
--- a/.github/workflows/build_girders.yml
+++ b/.github/workflows/build_girders.yml
@@ -23,10 +23,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- - name: Set up JDK 21
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: '21.0.0'
+ java-version: '17.0.0'
distribution: 'zulu'
cache: 'maven'
server-id: 'ossrh' # Value of the distributionManagement/repository/id field of the pom.xml
@@ -78,4 +78,22 @@ jobs:
cache: 'maven'
- name: run integration tests
run: mvn --batch-mode -f girders-demos/girders-demo-test/pom.xml install
+
+ integration_tests_17:
+ name: Integration tests for Java 17
+ runs-on: ubuntu-latest
+ needs: build_girders
+ permissions:
+ contents: read
+ packages: write
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up JDK 17
+ uses: actions/setup-java@v3
+ with:
+ java-version: '17.0.0'
+ distribution: 'zulu'
+ cache: 'maven'
+ - name: run integration tests
+ run: mvn --batch-mode -f girders-demos/girders-demo-test/pom.xml install
From 6faaeb3cf54b37b74ac9498432a27c273cb1a4b6 Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:36:07 +0200
Subject: [PATCH 7/8] Revert "[#77] Update to java 17"
This reverts commit cb3bb7e5fe3a298548f3e9125732ee172bd2a1fe.
# Conflicts:
# .github/workflows/build_girders.yml
---
.idea/compiler.xml | 2 +-
.idea/misc.xml | 3 ++-
girders-demos/pom.xml | 6 +++---
girders-parent/pom.xml | 4 ++--
pom.xml | 2 +-
src/site/markdown/quickstart/index.md | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5f523abe..a447057c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -53,7 +53,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 67af4ca5..3496ecdf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+
@@ -11,7 +12,7 @@
-
+
diff --git a/girders-demos/pom.xml b/girders-demos/pom.xml
index 4c9a7b0e..02d7e02e 100644
--- a/girders-demos/pom.xml
+++ b/girders-demos/pom.xml
@@ -23,9 +23,9 @@
- 21
- 21
- 21
+ 17
+ 17
+ 17
4.6.2
6.2.3-SNAPSHOT
diff --git a/girders-parent/pom.xml b/girders-parent/pom.xml
index 444b0d88..1717440b 100644
--- a/girders-parent/pom.xml
+++ b/girders-parent/pom.xml
@@ -16,8 +16,8 @@
Girders Parent
- 21
- 21
+ 17
+ 17
UTF-8
10.12.1
diff --git a/pom.xml b/pom.xml
index 84f21740..03a7bf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
- 21
+ 17
UTF-8
UTF-8
0.8
diff --git a/src/site/markdown/quickstart/index.md b/src/site/markdown/quickstart/index.md
index 5aa6dc89..fed5d1f0 100644
--- a/src/site/markdown/quickstart/index.md
+++ b/src/site/markdown/quickstart/index.md
@@ -38,7 +38,7 @@ pom.xml:
- 21
+ 17
From dd8516c9b7ddc8775686b266a4bbd8086d79d7d8 Mon Sep 17 00:00:00 2001
From: Valentin Meier <9212976+meierval@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:40:03 +0200
Subject: [PATCH 8/8] [#77] Set release script jdk version to 17
---
.github/workflows/release_girders.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release_girders.yml b/.github/workflows/release_girders.yml
index 3943641b..399f3f5a 100644
--- a/.github/workflows/release_girders.yml
+++ b/.github/workflows/release_girders.yml
@@ -46,10 +46,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- - name: Set up JDK 21
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: '21.0.0'
+ java-version: '17.0.0'
distribution: 'zulu'
cache: 'maven'
server-id: 'ossrh' # Value of the distributionManagement/repository/id field of the pom.xml