feat(build): upgrade to Java 21 and enhance DBeaver plugin handling

Author: sphildreth

.github/workflows/release.yml

@@ -22,11 +22,32 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Set up Java 17
+      - name: Set up Java 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '17'
+          java-version: '21'
+
+      - name: Download DBeaver plugins (for compile)
+        shell: bash
+        run: |
+          set -euo pipefail
+          repo_root="$PWD"
+          dbeaver_dir="$repo_root/.dbeaver"
+          mkdir -p "$dbeaver_dir"
+
+          curl -fsSL -o "$dbeaver_dir/dbeaver.zip" \
+            https://dbeaver.io/files/dbeaver-ce-latest-win32.win32.x86_64.zip
+
+          python - "$dbeaver_dir/dbeaver.zip" "$dbeaver_dir" <<'PY'
+          import sys, zipfile
+          zip_path, dest = sys.argv[1], sys.argv[2]
+          with zipfile.ZipFile(zip_path) as z:
+              z.extractall(dest)
+          PY
+
+          test -d "$dbeaver_dir/dbeaver/plugins"
+          echo "DBEAVER_PLUGIN_DIR=$dbeaver_dir/dbeaver/plugins" >> "$GITHUB_ENV"
 
       - name: Set up Nim
         uses: jiro4989/setup-nim-action@v2
@@ -82,7 +103,7 @@ jobs:
         run: |
           set -euo pipefail
           cd bindings/java
-          ./gradlew --no-daemon :driver:jar :dbeaver-extension:jar -PnativeLibDir="$GITHUB_WORKSPACE/build"
+          ./gradlew --no-daemon :driver:jar :dbeaver-extension:jar -PnativeLibDir="$GITHUB_WORKSPACE/build" -PdbeaverPluginDir="$DBEAVER_PLUGIN_DIR"
 
           mkdir -p "$GITHUB_WORKSPACE/dbeaver-dist/dbeaver/plugins"
           # Name the bundle jar in the conventional DBeaver/OSGi style.

bindings/java/dbeaver-extension/build.gradle

@@ -19,19 +19,21 @@ dependencies {
     implementation project(':driver')
 
     // DBeaver OSGi bundles – compile-only (provided at runtime by the DBeaver platform).
-    def pluginDir = new File('/usr/lib/dbeaver/plugins')
-    if (pluginDir.exists()) {
-        def jars = pluginDir.listFiles().findAll { f ->
-            f.name.endsWith('.jar') && (
-                f.name.startsWith('org.jkiss.dbeaver.model_') ||
-                f.name.startsWith('org.jkiss.dbeaver.model.jdbc_') ||
-                f.name.startsWith('org.jkiss.dbeaver.model.sql_') ||
-                f.name.startsWith('org.jkiss.dbeaver.ext.generic_') ||
-                f.name.startsWith('org.jkiss.utils_')
-            )
-        }
-        compileOnly files(jars)
+    def dbeaverPluginDirProp = project.findProperty('dbeaverPluginDir')
+    def dbeaverPluginDirEnv = System.getenv('DBEAVER_PLUGIN_DIR')
+
+    def candidateDirs = []
+    if (dbeaverPluginDirProp != null) candidateDirs << new File(dbeaverPluginDirProp.toString())
+    if (dbeaverPluginDirEnv != null) candidateDirs << new File(dbeaverPluginDirEnv)
+    candidateDirs << new File('/usr/lib/dbeaver/plugins')
+    candidateDirs << new File('/usr/share/dbeaver/plugins')
+
+    def pluginDir = candidateDirs.find { it.exists() && it.isDirectory() }
+    if (pluginDir == null) {
+        throw new GradleException("DBeaver plugin directory not found. Set -PdbeaverPluginDir=... (or DBEAVER_PLUGIN_DIR) to a folder containing DBeaver's *.jar bundles.")
     }
+
+    compileOnly fileTree(pluginDir) { include '*.jar' }
 }
 
 jar {