Use openjdk 11.

Author: kannanjgithub

buildscripts/kokoro/unix.sh

@@ -34,7 +34,7 @@ cat <<EOF >> gradle.properties
 org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=1024m
 EOF
 
-ARCH="$ARCH" buildscripts/make_dependencies.sh
+#ARCH="$ARCH" buildscripts/make_dependencies.sh
 
 # Set properties via flags, do not pollute gradle.properties
 GRADLE_FLAGS="${GRADLE_FLAGS:-}"

buildscripts/make_dependencies.bat

@@ -1,7 +1,7 @@
 echo on
 @rem set PROTOBUF_VER=21.7
 choco install -y gradle git curl pkgconfiglite
-choco install -y openjdk --version=21.0
+choco install -y openjdk --version=11.0.27
 set JAVA_HOME="c:\Program Files\OpenJDK\jdk-21"
 set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-21\bin"
 set PROTOBUF_VER=22.5

buildscripts/make_dependencies.sh

@@ -30,6 +30,16 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then
   echo "Not building protobuf. Already built"
 # TODO(ejona): swap to `brew install --devel protobuf` once it is up-to-date
 else
+  if [[ ! -d "cmake-${CMAKE_VERSION}" ]]; then
+    curl -Ls "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz" | tar xz
+  fi
+  # the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first 
+  rm -rf "$DOWNLOAD_DIR/cmake-${CMAKE_VERSION}/bin"
+  cd "$DOWNLOAD_DIR/cmake-${CMAKE_VERSION}"
+  ./bootstrap
+  make
+  make install
+  ln -s /usr/local/bin/cmake /usr/bin/cmake
   cd "$DOWNLOAD_DIR"
   if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
     curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz