Merge branch 'master' into dependabot/maven/org.apache.commons-commons-lang3-3.18.0

Author: mikebell90

.github/workflows/maven.yml

@@ -15,11 +15,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
-        distribution: 'temurin'
+        distribution: 'corretto'
+        cache: maven
+    - name: Specific Maven Version
+      run: mvn wrapper:wrapper -Dmaven=3.9.9
+    - name: test maven version
+      run: ./mvnw -v
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: ./mvnw -B package --file pom.xml

CHANGELOG.md

@@ -1,3 +1,15 @@
+1.1.1
+----
+More or less dependency updates
+
+* testcontainers 1.20.6
+* postgres 42.7.5
+* flyway 10.20.1
+* commons-lang 3.17.0
+* commons-compress 1.27.1
+* junit 5.11.4
+* slf4j 2.0.17
+* Default docker image tag is now `17-alpine` (previously `13-alpine`)
 
 1.1.0
 -----

pom.xml

@@ -41,16 +41,16 @@
     <project.build.targetJdk>11</project.build.targetJdk>
     <maven.compiler.target>${project.build.targetJdk}</maven.compiler.target>
     <project.build.systemJdk>${project.build.targetJdk}</project.build.systemJdk>
-    <dep.testcontainers.version>1.19.8</dep.testcontainers.version>
-    <dep.postgres-jdbc.version>42.7.3</dep.postgres-jdbc.version>
+    <dep.testcontainers.version>1.20.6</dep.testcontainers.version>
+    <dep.postgres-jdbc.version>42.7.5</dep.postgres-jdbc.version>
     <dep.liquibase.version>4.23.1</dep.liquibase.version>
-    <dep.slf4j.version>1.7.36</dep.slf4j.version>
-    <dep.jackson.version>2.15.2</dep.jackson.version>
-    <dep.flyway.version>10.10.0</dep.flyway.version>
+    <dep.slf4j.version>2.0.17</dep.slf4j.version>
+    <dep.jackson.version>2.18.3</dep.jackson.version>
+    <dep.flyway.version>10.20.1</dep.flyway.version>
     <dep.commons-lang.version>3.18.0</dep.commons-lang.version>
-    <dep.commons-compress.version>1.26.0</dep.commons-compress.version>
+    <dep.commons-compress.version>1.27.1</dep.commons-compress.version>
     <dep.junit.version>4.13.2</dep.junit.version>
-    <dep.junit5.version>5.8.2</dep.junit5.version>
+    <dep.junit5.version>5.11.4</dep.junit5.version>
     <basepom.test.timeout>1800</basepom.test.timeout>
     <basepom.javadoc.skip>false</basepom.javadoc.skip>
     <basepom.oss.skip-scala-doc>true</basepom.oss.skip-scala-doc>

src/main/java/com/opentable/db/postgres/embedded/EmbeddedPostgres.java

@@ -62,7 +62,7 @@ public class EmbeddedPostgres implements Closeable {
     static final String ENV_DOCKER_PREFIX = "TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX";
     // 3) Otherwise we'll just pull from docker hub with the DOCKER_DEFAULT_TAG
     static final DockerImageName DOCKER_DEFAULT_IMAGE_NAME = DockerImageName.parse(POSTGRES);
-    static final String DOCKER_DEFAULT_TAG = "13-alpine";
+    static final String DOCKER_DEFAULT_TAG = "17-alpine";
     // Note you can override any of these defaults explicitly in the builder.
 
     private final PostgreSQLContainer<?> postgreDBContainer;