From 41d1f3c86e9fac53cd2238b1d92964c7a0e699c3 Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:22:05 +0200
Subject: [PATCH 1/7] chore(deps): Update dependencies
---
.github/dependabot.yml | 10 +++
.github/workflows/release.yml | 2 +-
.github/workflows/test.yml | 4 +-
pom.xml | 88 ++++++++++++++-----
.../resources/sh/detect_linux_distribution.sh | 4 +-
5 files changed, 83 insertions(+), 25 deletions(-)
create mode 100644 .github/dependabot.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..c9b2105b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 71e40e54..096409a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9064f36a..84b53f3a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,10 +6,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11, 13, 15, 17, 18, 19]
+ java: [8, 11, 17, 21, 22] # LTS and newer versions
steps:
- name: Checkout project
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
diff --git a/pom.xml b/pom.xml
index 38adb356..49a9763e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
UTF-8
UTF-8
- 14.10.1
+ 14.11.0
https://github.com/zonkyio/embedded-postgres
@@ -71,6 +71,44 @@
+
+
+
+ commons-io
+ commons-io
+ 2.16.1
+
+
+ org.apache.commons
+ commons-lang3
+ 3.14.0
+
+
+ org.apache.commons
+ commons-compress
+ 1.26.2
+
+
+ commons-codec
+ commons-codec
+ 1.17.0
+
+
+ org.junit
+ junit-bom
+ 5.10.3
+ pom
+ import
+
+
+ org.slf4j
+ slf4j-bom
+ 2.0.13
+ pom
+ import
+
+
+
io.zonky.test.postgres
@@ -100,17 +138,14 @@
org.slf4j
slf4j-api
- 1.7.36
org.apache.commons
commons-lang3
- 3.12.0
org.apache.commons
commons-compress
- 1.26.0
org.tukaani
@@ -120,12 +155,10 @@
commons-io
commons-io
- 2.11.0
commons-codec
commons-codec
- 1.15
org.flywaydb
@@ -136,7 +169,7 @@
org.liquibase
liquibase-core
- 4.10.0
+ 4.28.0
true
@@ -154,46 +187,61 @@
org.junit.jupiter
junit-jupiter-api
- 5.8.2
provided
true
org.junit.vintage
junit-vintage-engine
- 5.8.2
test
org.junit.jupiter
junit-jupiter-engine
- 5.8.2
test
org.slf4j
slf4j-simple
- 1.7.36
test
org.mockito
mockito-core
- 3.12.4
+ 4.11.0
test
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 3.5.0
+
+
+ enforce-versions
+ validate
+
+ enforce
+
+
+
+
+
+
+
+
+
maven-surefire-plugin
- 2.22.2
+ 3.3.1
maven-pmd-plugin
- 3.13.0
+ 3.23.0
verify
@@ -206,13 +254,13 @@
net.sourceforge.pmd
pmd-core
- 6.55.0
+ 7.3.0
compile
net.sourceforge.pmd
pmd-java
- 6.55.0
+ 7.3.0
compile
@@ -220,7 +268,7 @@
false
true
1.8
- UTF-8
+ UTF-8
100
4
@@ -228,7 +276,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.1
attach-sources
@@ -241,7 +289,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ 3.7.0
attach-javadocs
@@ -257,7 +305,7 @@
org.apache.maven.plugins
maven-release-plugin
- 2.5.3
+ 3.1.0
false
release
diff --git a/src/main/resources/sh/detect_linux_distribution.sh b/src/main/resources/sh/detect_linux_distribution.sh
index 2ef4f015..8304880a 100644
--- a/src/main/resources/sh/detect_linux_distribution.sh
+++ b/src/main/resources/sh/detect_linux_distribution.sh
@@ -12,7 +12,7 @@ detect_linux_distribution() {
else
DISTRO=''
fi
- echo $DISTRO
+ echo "$DISTRO"
}
-echo $(detect_linux_distribution)
\ No newline at end of file
+detect_linux_distribution
From bf15a2063783c9d51195f5b63c9096114ecc8eda Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:16:50 +0200
Subject: [PATCH 2/7] Extract versions to properties
---
pom.xml | 62 ++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 41 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49a9763e..c9a006d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,26 @@
UTF-8
14.11.0
+ 1.17.0
+ 1.26.2
+ 2.16.1
+ 3.14.0
+ 7.15.0
+ 5.10.3
+ 4.13.2
+ 4.28.0
+ 4.11.0
+ 7.3.0
+ 42.7.3
+ 2.0.13
+ 1.9
+ 3.5.0
+ 1.6
+ 3.7.0
+ 3.23.0
+ 3.1.0
+ 3.3.1
+ 3.3.1
https://github.com/zonkyio/embedded-postgres
@@ -76,34 +96,34 @@
commons-io
commons-io
- 2.16.1
+ ${commons-io.version}
org.apache.commons
commons-lang3
- 3.14.0
+ ${commons-lang3.version}
org.apache.commons
commons-compress
- 1.26.2
+ ${commons-compress.version}
commons-codec
commons-codec
- 1.17.0
+ ${commons-codec.version}
org.junit
junit-bom
- 5.10.3
+ ${junit5.version}
pom
import
org.slf4j
slf4j-bom
- 2.0.13
+ ${slf4j.version}
pom
import
@@ -150,7 +170,7 @@
org.tukaani
xz
- 1.9
+ ${xz.version}
commons-io
@@ -163,24 +183,24 @@
org.flywaydb
flyway-core
- 7.15.0
+ ${flyway.version}
true
org.liquibase
liquibase-core
- 4.28.0
+ ${liquibase.version}
true
org.postgresql
postgresql
- 42.7.3
+ ${postgresql.version}
junit
junit
- 4.13.2
+ ${junit4.version}
provided
true
@@ -209,7 +229,7 @@
org.mockito
mockito-core
- 4.11.0
+ ${mockito.version}
test
@@ -219,7 +239,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.5.0
+ ${maven-enforcer-plugin.version}
enforce-versions
@@ -237,11 +257,11 @@
maven-surefire-plugin
- 3.3.1
+ ${maven-surefire-plugin.version}
maven-pmd-plugin
- 3.23.0
+ ${maven-pmd-plugin.version}
verify
@@ -254,13 +274,13 @@
net.sourceforge.pmd
pmd-core
- 7.3.0
+ ${pmd.version}
compile
net.sourceforge.pmd
pmd-java
- 7.3.0
+ ${pmd.version}
compile
@@ -276,7 +296,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.3.1
+ ${maven-source-plugin.version}
attach-sources
@@ -289,7 +309,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.7.0
+ ${maven-javadoc-plugin.version}
attach-javadocs
@@ -305,7 +325,7 @@
org.apache.maven.plugins
maven-release-plugin
- 3.1.0
+ ${maven-release-plugin.version}
false
release
@@ -323,7 +343,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 1.6
+ ${maven-gpg-plugin.version}
sign-artifacts
From acac93ae12607316bf7d352052f1d422ea50b631 Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Sat, 13 Jul 2024 13:47:11 +0200
Subject: [PATCH 3/7] fix: Parallel tests and default LC_ALL for initdb
---
pom.xml | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/pom.xml b/pom.xml
index c9a006d4..d39bb370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,12 @@
maven-surefire-plugin
${maven-surefire-plugin.version}
+
+
+ ${env.LC_ALL}
+
+ 1C
+
maven-pmd-plugin
@@ -336,6 +342,21 @@
+
+
+ default-lc-all
+
+
+ !env.LC_ALL
+
+
+ Unix
+
+
+
+ en_US.UTF-8
+
+
release
From 1de9409590e2c9852cdf14ff1e563f31f257c571 Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:11:08 +0200
Subject: [PATCH 4/7] Remove default forkCount to allow better log readability
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d39bb370..494b36eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,7 +262,6 @@
${env.LC_ALL}
- 1C
From 18256476c27ec547f24dcf2698ac76c097c5ee6e Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:19:09 +0200
Subject: [PATCH 5/7] Update to latest versions where possible
---
pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 494b36eb..9df6e5ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,25 +30,25 @@
UTF-8
UTF-8
- 14.11.0
- 1.17.0
+ 14.12.0
+ 1.17.1
1.26.2
2.16.1
- 3.14.0
+ 3.15.0
7.15.0
5.10.3
4.13.2
- 4.28.0
+ 4.29.1
4.11.0
- 7.3.0
+ 7.4.0
42.7.3
2.0.13
- 1.9
+ 1.10
3.5.0
1.6
- 3.7.0
- 3.23.0
- 3.1.0
+ 3.8.0
+ 3.24.0
+ 3.1.1
3.3.1
3.3.1
From 3f5393d591bb8bc2e7939529ee9e44fa791edfd2 Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:41:55 +0200
Subject: [PATCH 6/7] Downgrade slf4j and remove management
---
pom.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9df6e5ea..a540a2d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
4.11.0
7.4.0
42.7.3
- 2.0.13
+ 1.7.36
1.10
3.5.0
1.6
@@ -120,13 +120,6 @@
pom
import
-
- org.slf4j
- slf4j-bom
- ${slf4j.version}
- pom
- import
-
@@ -158,6 +151,7 @@
org.slf4j
slf4j-api
+ ${slf4j.version}
org.apache.commons
@@ -224,6 +218,7 @@
org.slf4j
slf4j-simple
+ ${slf4j.version}
test
From edb503dd1d104609b054616b7bdfd849482115fc Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:09:34 +0200
Subject: [PATCH 7/7] Update Flyway 7 (2021) to 9 (2023)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a540a2d1..09de240c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
1.26.2
2.16.1
3.15.0
- 7.15.0
+ 9.22.3
5.10.3
4.13.2
4.29.1