Merge branch 'master' into fix-timestamp-with-zone-handling

.editorconfig

@@ -42,6 +42,7 @@ ij_any_spaces_around_relational_operators = true
 ij_any_spaces_around_shift_operators = true
 ij_continuation_indent_size = 4
 ij_java_align_multiline_parameters = false
+ij_java_binary_operation_sign_on_next_line = true
 ij_java_if_brace_force = always
 ij_java_indent_case_from_switch = false
 ij_java_line_comment_add_space = true

.github/release-drafter.yml

@@ -0,0 +1,72 @@
+# See https://github.com/release-drafter/release-drafter#configuration-options
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'REL$RESOLVED_VERSION'
+# Filter previous releases to consider only those with the target matching the current branch
+filter-by-commitish: true
+tag-prefix: REL
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '📝 Documentation'
+    labels:
+      - 'documentation'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+  - title: '⬆️ Dependencies'
+    collapse-after: 8
+    labels:
+      - 'dependencies'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES
+# See https://github.com/release-drafter/release-drafter#autolabeler
+# This is more like a reference, since auto-labelling PRs seems to require too much privileges
+autolabeler:
+  - label: 'dependencies'
+    files:
+      - 'gradle-wrapper.properties'
+    title:
+      - '/^fix\(deps\)/i'
+      - '/^chore:\s*bump/i'
+  - label: 'chore'
+    files:
+      - '*gradle*'
+    branch:
+      - '/docs{0,1}\/.+/'
+    title:
+      - '/^chore/i'
+  - label: 'documentation'
+    files:
+      - '*.md'
+      - 'docs/**'
+  - label: 'bug'
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/^fix/i'
+  - label: 'enhancement'
+    branch:
+      - '/feature\/.+/'
+    title:
+      - '/^feat/i'

.github/workflows/buildcache.yml

@@ -32,9 +32,9 @@ jobs:
       - id: set-matrix
         run: |
           if [[ -n "${S3_BUILD_CACHE_ACCESS_KEY_ID:-}" ]] && [[ -n "${S3_BUILD_CACHE_SECRET_KEY:-}" ]]; then
-            echo "::set-output name=secrets_available::true"
+            echo "secrets_available=true" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=secrets_available::false"
+            echo "secrets_available=false" >> $GITHUB_OUTPUT
           fi
 
   seed-build-cache:
@@ -48,18 +48,23 @@ jobs:
     name: '${{ matrix.os }}, ${{ matrix.jdk }} seed build cache'
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Set up JDK ${{ matrix.jdk }}'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
+          distribution: liberica
+      - name: Skip javadoc with Java 11
+        if: ${{ matrix.jdk == '11' }}
+        run: |
+          echo "skipJavadoc=-PskipJavadoc" >> $GITHUB_ENV
       - uses: burrunan/gradle-cache-action@v1
         name: Build pgjdbc
         env:
           S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
           S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         with:
           job-id: jdk${{ matrix.jdk }}
-          arguments: build -x test --scan -i
+          arguments: build -x test --scan -i ${{ env.skipJavadoc }}

.github/workflows/debezium.yml

@@ -16,11 +16,11 @@ jobs:
       ACTIONS_STEP_DEBUG: true
       ACTIONS_RUNNER_DEBUG: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11

.github/workflows/fedora-copr-build.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Check out proper version of sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Submit the build
         env:

.github/workflows/main.yml

@@ -12,7 +12,7 @@ on:
       - '.travis/**'
   pull_request:
     branches:
-      - '*'
+      - '**'
     paths-ignore:
       - 'docs/**'
       - '**/*.md'
@@ -41,32 +41,32 @@ jobs:
       ACTIONS_STEP_DEBUG: true
       ACTIONS_RUNNER_DEBUG: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: 'Set up JDK 8'
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: zulu
-        java-version: 8
+        java-version: 17
     - uses: burrunan/gradle-cache-action@v1
       name: Verify code style
       env:
         S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
         S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
       with:
-        job-id: jdk8
+        job-id: jdk17
         arguments: autostyleCheck checkstyleAll jandex
 
   linux-checkerframework:
     name: 'CheckerFramework'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11
@@ -84,14 +84,14 @@ jobs:
     name: 'Source distribution (JDK 11)'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: Start PostgreSQL
         working-directory: docker/postgres-server
         run: docker-compose up -d && docker-compose logs
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11
@@ -116,9 +116,9 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     env:
-      MATRIX_JOBS: 7
+      MATRIX_JOBS: 5
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - id: set-matrix
@@ -137,7 +137,7 @@ jobs:
       ACTIONS_RUNNER_DEBUG: true
       TZ: ${{ matrix.tz }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: Start PostgreSQL PGV=${{ matrix.pg_version }} TZ=${{ matrix.server_tz }} XA=${{ matrix.xa }} SSL=${{ matrix.ssl }} SCRAM=${{ matrix.scram }} CREATE_REPLICAS=${{ matrix.replication }}
@@ -158,11 +158,11 @@ jobs:
         docker-compose up -d
         docker-compose logs
     - name: 'Get test node ARCH'
-      run: echo "::set-output name=arch_name::$(uname -i)"
+      run: echo "arch_name=$(uname -i)" >> $GITHUB_OUTPUT
       id: get_arch_name
     - name: Set up Java ${{ matrix.java_version }}, ${{ matrix.java_distribution }}
       if: ${{ steps.get_arch_name.outputs.arch_name != 'aarch64' }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: ${{ matrix.java_distribution }}
@@ -189,19 +189,20 @@ jobs:
       env:
         S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
         S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
-        _JAVA_OPTIONS: ${{ matrix.testExtraJvmArgs }}
+        _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
       with:
         read-only: ${{ matrix.os == 'self-hosted' }}
         job-id: jdk${{ matrix.java_version }}
-        arguments: --scan --no-parallel --no-daemon jandex test
+        arguments: --scan --no-parallel --no-daemon jandex test ${{ matrix.extraGradleArgs }}
         properties: |
           includeTestTags=${{ matrix.includeTestTags }}
+          testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}
 
     - name: 'Install krb5 for GSS tests'
       if: ${{ matrix.gss == 'yes' }}
       run: |
         sudo apt -y update
-        sudo apt -y install krb5-kdc krb5-admin-server libkrb5-dev postgresql-12
+        sudo apt -y install krb5-kdc krb5-admin-server libkrb5-dev postgresql
     - name: 'Update hosts for GSS tests'
       if: ${{ matrix.gss == 'yes' }}
       run: |

.github/workflows/matrix.js

@@ -1,6 +1,8 @@
 // The script generates a random subset of valid jdk, os, timezone, and other axes.
 // You can preview the results by running "node matrix.js"
 // See https://github.com/vlsi/github-actions-random-matrix
+let fs = require('fs');
+let os = require('os');
 let {MatrixBuilder} = require('./matrix_builder');
 const matrix = new MatrixBuilder();
 
@@ -238,7 +240,18 @@ if (include.length === 0) {
 }
 include.sort((a, b) => a.name.localeCompare(b.name, undefined, {numeric: true}));
 include.forEach(v => {
+    let gradleArgs = [];
+    if (v.java_version == 11) {
+        // JavaDoc 11 can't parse package annotations: https://bugs.openjdk.org/browse/JDK-8222091
+        gradleArgs.push('-PskipJavadoc')
+    }
+    v.extraGradleArgs = gradleArgs.join(' ');
+});
+include.forEach(v => {
+  // Arguments passed to all the JVMs via _JAVA_OPTIONS
   let jvmArgs = [];
+  // Extra JVM arguments passed to test execution
+  let testJvmArgs = [];
   v.replication = v.replication.value;
   v.slow_tests = v.slow_tests.value;
   v.xa = v.xa.value;
@@ -268,7 +281,10 @@ include.forEach(v => {
       v.deploy_to_maven_local = true
   }
   if (v.hash.value === 'same') {
-    jvmArgs.push('-XX:+UnlockExperimentalVMOptions', '-XX:hashCode=2');
+    // "same hashcode" causes issue for javac, and kotlinc,
+    // so we pass it to test execution only
+    // See https://github.com/pgjdbc/pgjdbc/pull/2821#issuecomment-1436013284
+    testJvmArgs.push('-XX:+UnlockExperimentalVMOptions', '-XX:hashCode=2');
   }
   // Gradle does not work in tr_TR locale, so pass locale to test only: https://github.com/gradle/gradle/issues/17361
   jvmArgs.push(`-Duser.country=${v.locale.country}`);
@@ -297,9 +313,16 @@ include.forEach(v => {
       jvmArgs.push('-XX:+StressCCP');
     }
   }
-  v.testExtraJvmArgs = jvmArgs.join(' ');
+  v.extraJvmArgs = jvmArgs.join(' ');
+  v.testExtraJvmArgs = testJvmArgs.join(' ::: ');
   delete v.hash;
 });
 
 console.log(include);
-console.log('::set-output name=matrix::' + JSON.stringify({include}));
+
+let filePath = process.env['GITHUB_OUTPUT'] || '';
+if (filePath) {
+    fs.appendFileSync(filePath, `matrix<<MATRIX_BODY${os.EOL}${JSON.stringify({include})}${os.EOL}MATRIX_BODY${os.EOL}`, {
+        encoding: 'utf8'
+    });
+}

.github/workflows/nightlysnapshot.yml

@@ -23,9 +23,9 @@ jobs:
       - id: set-matrix
         run: |
           if [[ -n "${NEXUS_USERNAME:-}" ]] && [[ -n "${NEXUS_PASSWORD:-}" ]]; then
-            echo "::set-output name=secrets_available::true"
+            echo "secrets_available=true" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=secrets_available::false"
+            echo "secrets_available=false" >> $GITHUB_OUTPUT
           fi
 
   snapshot:
@@ -37,11 +37,11 @@ jobs:
       ACTIONS_STEP_DEBUG: true
       ACTIONS_RUNNER_DEBUG: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Set up JDK 8'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 8