From 9600a22bb366917f0303ee5b29e002a3626fa340 Mon Sep 17 00:00:00 2001 From: Mikko Tiihonen Date: Thu, 11 Apr 2024 11:22:47 +0300 Subject: [PATCH 1/5] Version bump phase 2 --- CHANGELOG.md | 5 ++++- pom.xml | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9101ba49c..253b805db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - Jetty 11.0.20 - Apache CFX 4.0.4 - Dropwizard metrics 4.2.19 - - logback 1.5.3 + - logback 1.5.4 - jackson 2.17.0 - h2 2.2.224 - protobuf 3.25.1 @@ -23,6 +23,9 @@ - joda-time 2.12.5 - commons-lang3 3.14.0 - slf4j 2.0.12 + - spring 6.0.18 + - reactor-netty 1.1.18 + - reactor-core 3.6.5 ## 9.0.0 (2023-08-30) diff --git a/pom.xml b/pom.xml index 90be456ff..bbf269feb 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 2.17.0 2.17.0 3.30.2-GA - 2.1.1 + 3.0.0 6.0.0 2.0.1 3.1.0 @@ -140,13 +140,13 @@ 2.12.7 5.10.0 1.10.2 - 1.5.3 + 1.5.4 3.3.3 3.7.1 3.3.2 3.13.0 3.1.1 - 1.8.1 + 1.9.0 2.10 3.4.1 3.2.2 @@ -171,18 +171,18 @@ v20.12.1 10.5.0 1.3 - 23.2.0.0 + 23.3.0.23.09 42.7.3 UTF-8 UTF-8 - 3.6.4 - 1.1.17 + 3.6.5 + 1.1.18 0.10.2 2.0.12 - 4.8.3 + 4.8.4 7.6.4 - 4.8.3.1 - 6.0.11 + 4.8.4.0 + 6.0.18 2.2.21 3.0.2 2.16.2 From 28cdee4356c992271abe2bdb244ff8149fa01bd1 Mon Sep 17 00:00:00 2001 From: Mikko Tiihonen Date: Thu, 11 Apr 2024 12:25:51 +0300 Subject: [PATCH 2/5] Bump github action plugin versions --- .github/workflows/build.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0078fcfb1..22fdeb2a0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,9 +22,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -42,9 +42,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' @@ -56,15 +56,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: java, javascript config-file: ./.github/codeql-config.yaml @@ -76,7 +76,7 @@ jobs: name: 'SpotBugs Report' path: '**/spotbugsXml.xml' - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 integration-tests: if: always() @@ -90,9 +90,9 @@ jobs: DB_VERSION: ${{ matrix.java == 17 && 'old' || 'latest' }} steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -110,7 +110,7 @@ jobs: check_name: 'Integration Test Report for Java ${{ matrix.java }} and ${{ matrix.db }}' - name: Upload test files as artifact if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: 'integrationtest-results-java${{ matrix.java }}-${{ matrix.db }}' path: '**/target/surefire-reports/*.xml' From 40ac404fafe230ed3d986df3f6c417cfd35c21e5 Mon Sep 17 00:00:00 2001 From: Mikko Tiihonen Date: Thu, 11 Apr 2024 12:31:52 +0300 Subject: [PATCH 3/5] Run basic unit tests with java 22 --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 22fdeb2a0..7e5b281fa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: if: always() strategy: matrix: - java: [ '17', '21' ] + java: [ '17', '21', '22' ] runs-on: ubuntu-latest steps: - name: Check out @@ -100,9 +100,9 @@ jobs: - name: Set up database run: ./scripts/setup-db-${{ matrix.db }}.sh - name: Build - run: mvn -T1C --color=always -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true --am -pl nflow-tests install + run: mvn -T1C --no-transfer-progress --color=always -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true --am -pl nflow-tests install - name: Run the integration tests - run: mvn -T1C -Dsurefire.forkcount=1 --color=always -rf :nflow-tests surefire:test + run: mvn -T1C --no-transfer-progress -Dsurefire.forkcount=1 --color=always -rf :nflow-tests surefire:test - name: Publish JUnit test report uses: scacap/action-surefire-report@v1 if: always() From de706c5e9bf1b093d2870f6b127d8a9cfbe442de Mon Sep 17 00:00:00 2001 From: Mikko Tiihonen Date: Thu, 11 Apr 2024 12:33:12 +0300 Subject: [PATCH 4/5] Rollback again to older ojdbc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bbf269feb..0f03e8fc6 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ v20.12.1 10.5.0 1.3 - 23.3.0.23.09 + 23.2.0.0 42.7.3 UTF-8 UTF-8 From 1e86f14cbc2618a35441716384e27d939475f06c Mon Sep 17 00:00:00 2001 From: Mikko Tiihonen Date: Thu, 11 Apr 2024 14:23:21 +0300 Subject: [PATCH 5/5] Fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 253b805db..b8175725a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ - db2 jcc 11.5.9.0 - mssql-jdbc 12.6.1 - mysql-connector 8.3.0 - - ojdbc11 23.3.0.23.09 + - ojdbc11 23.2.0.0 - postgresql 42.7.3 - mariadb-java-client 3.3.3 - HikariCP 5.1.0