Merge pull request #1902 from GoogleContainerTools/rework_build_2

rework java build

Author: loosebazooka

MODULE.bazel.lock

@@ -4,7 +4,8 @@ def jre_ver(version):
       Debian packages versions are of the form:
          openjdk-11-jre*: 11.0.1+13-2~bpo9+1
     """
-    if version.startswith("11.") or version.startswith("17."):
-        return version.split("+")[0]
+    if version.startswith("11.") or version.startswith("17.") or version.startswith("21.") or version.startswith("25."):
+        v = version.split("+")[0].split(".")
+        return v[0] + "." + v[1] + "." + v[2]
 
     fail("unrecognized openjdk package version: " + version)

java/BUILD

@@ -1,19 +1,23 @@
 schemaVersion: "2.0.0"
 commandTests:
   - name: java
-    command: "/usr/lib/jvm/temurin25_jre_amd64/bin/java"
+    command: "/usr/lib/jvm/temurin-25-jre-amd64/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "25"']
+    expectedError: ['openjdk version "25.0.1"']
   - name: java-symlink
     command: "/usr/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "25"']
+    expectedError: ['openjdk version "25.0.1"']
 fileExistenceTests:
   - name: certs
     path: "/etc/ssl/certs/java/cacerts"
     shouldExist: true
   - name: certs
-    path: "/usr/lib/jvm/temurin25_jre_amd64/lib/security/cacerts"
+    path: "/etc/ssl/certs/adoptium/cacerts"
+    permissions: 'Lrwxrwxrwx'
+    shouldExist: true
+  - name: certs
+    path: "/usr/lib/jvm/temurin-25-jre-amd64/lib/security/cacerts"
     permissions: 'Lrwxrwxrwx'
     shouldExist: true
   - name: no-busybox
@@ -23,17 +27,17 @@ fileExistenceTests:
     path: "/bin/sh"
     shouldExist: false
   - name: no-javac
-    path: "/usr/lib/jvm/temurin25_jre_amd64/bin/javac"
+    path: "/usr/lib/jvm/temurin-25-jre-amd64/bin/javac"
     shouldExist: false
   - name: jexec-executable
-    path: "/usr/lib/jvm/temurin25_jre_amd64/lib/jexec"
+    path: "/usr/lib/jvm/temurin-25-jre-amd64/lib/jexec"
     shouldExist: true
     isExecutableBy: "any"
   - name: jspawnhelper-executable
-    path: "/usr/lib/jvm/temurin25_jre_amd64/lib/jspawnhelper"
+    path: "/usr/lib/jvm/temurin-25-jre-amd64/lib/jspawnhelper"
     shouldExist: true
     isExecutableBy: "any"
 metadataTest:
   envVars:
     - key: 'JAVA_VERSION'
-      value: '25'
+      value: '25.0.1'

java/java.bzl

@@ -1,23 +1,27 @@
 schemaVersion: "2.0.0"
 commandTests:
   - name: java
-    command: "/usr/lib/jvm/temurin25_jdk_amd64/bin/java"
+    command: "/usr/lib/jvm/temurin-25-jdk-amd64/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "25"']
+    expectedError: ['openjdk version "25.0.1"']
   - name: java-symlink
     command: "/usr/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "25"']
+    expectedError: ['openjdk version "25.0.1"']
   - name: javac
-    command: "/usr/lib/jvm/temurin25_jdk_amd64/bin/javac"
+    command: "/usr/lib/jvm/temurin-25-jdk-amd64/bin/javac"
     args: ["-version"]
     expectedOutput: ['javac 25']
 fileExistenceTests:
   - name: certs
     path: "/etc/ssl/certs/java/cacerts"
     shouldExist: true
   - name: certs
-    path: "/usr/lib/jvm/temurin25_jdk_amd64/lib/security/cacerts"
+    path: "/etc/ssl/certs/adoptium/cacerts"
+    permissions: 'Lrwxrwxrwx'
+    shouldExist: true
+  - name: certs
+    path: "/usr/lib/jvm/temurin-25-jdk-amd64/lib/security/cacerts"
     permissions: 'Lrwxrwxrwx'
     shouldExist: true
   - name: busybox
@@ -29,4 +33,4 @@ fileExistenceTests:
 metadataTest:
   envVars:
     - key: 'JAVA_VERSION'
-      value: '25'
+      value: '25.0.1'

java/jre_ver.bzl

@@ -28,6 +28,7 @@ function cmd_lock() {
     # temporarily hardcode right now (query doesn't work after bzl mod)
     local repos=$(cat <<EOL
 trixie
+trixie_java
 bookworm
 bookworm_java
 bookworm_python
@@ -135,15 +136,13 @@ function cmd_lint () {
     buildifier -mode=fix $(find . -name 'BUILD*' -o -name 'WORKSPACE*' -o -name '*.bzl' -type f)
 }
 
+# deprecate with debian12
 function cmd_update_java_archives () {
     source knife.d/update_java_archives.sh
     old_version=$(get_java_version 21)
     generate_java_archives 21 > private/repos/java_temurin/java_21.MODULE.bazel
     new_version=$(get_java_version 21)
     update_test_versions_java21 $old_version $new_version
-
-    # java 17 set up
-    generate_java_archives 17 > private/repos/java_temurin/java_17.MODULE.bazel
 }
 
 function cmd_update_node_archives () {