Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ build --define absl=1
# Fix the python version
build --@rules_python//python/config_settings:python_version=3.12

# Fix the Java version
build --java_language_version=21 # Version of the source files
build --java_runtime_version=remotejdk_21 # Hermetic JRE

###############################################################################
# Per plaform options
###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/amd64_macos_bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
runs-on: macos-15-intel
steps:
- uses: actions/checkout@v6
- name: Set Java to OpenJDK 17 (Temurin)
- name: Set Java to OpenJDK 21 (Temurin)
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Check mvn
run: mvn --version
- name: Setup Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/amd64_windows_bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Check java
run: java -version
- name: Check mvn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/arm64_macos_bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
runs-on: macos-latest # macos arm64 based runner
steps:
- uses: actions/checkout@v6
- name: Set Java to OpenJDK 17 (Temurin)
- name: Set Java to OpenJDK 21 (Temurin)
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Check mvn
run: mvn --version
- name: Setup Python
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
env:
PYTHON_VERSION: '3.12'
JAVA_DISTRIBUTION: 'temurin'
JAVA_VERSION: '17'
JAVA_VERSION: '21'

jobs:
###############################################################################
Expand All @@ -33,10 +33,6 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v6
- uses: actions/setup-java@v5
with:
distribution: ${{env.JAVA_DISTRIBUTION}}
java-version: ${{env.JAVA_VERSION}}
- uses: actions/setup-python@v6
with:
python-version: ${{env.PYTHON_VERSION}}
Expand Down
4 changes: 2 additions & 2 deletions bazel/docker/fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ COPY . .

FROM devel AS build
RUN bazel version
RUN bazel build --java_runtime_version=remotejdk_21 --config=ci //ortools/... //examples/...
RUN bazel build --config=ci //ortools/... //examples/...

FROM build AS test
RUN bazel test --java_runtime_version=remotejdk_21 --config=ci //ortools/... //examples/...
RUN bazel test --config=ci //ortools/... //examples/...
2 changes: 1 addition & 1 deletion bazel/docker/opensuse/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-

# Install Java JDK and Maven
RUN zypper refresh \
&& zypper install -y java-17-openjdk-devel maven \
&& zypper install -y java-21-openjdk-devel maven \
&& zypper clean -a
ENV PATH=/usr/share/maven/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion bazel/docker/rockylinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-

# Install Java
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

Expand Down
4 changes: 2 additions & 2 deletions cmake/docker/alpine/java.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ortools/cmake:alpine_swig AS env

ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
RUN apk add --no-cache openjdk8 maven
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
RUN apk add --no-cache openjdk21 maven

FROM env AS devel
WORKDIR /home/project
Expand Down
2 changes: 1 addition & 1 deletion cmake/docker/opensuse/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ortools/cmake:opensuse_swig AS env

# Install Java JDK and Maven
RUN zypper refresh \
&& zypper install -y java-17-openjdk-devel maven \
&& zypper install -y java-21-openjdk-devel maven \
&& zypper clean -a
ENV PATH=/usr/share/maven/bin:$PATH

Expand Down
6 changes: 3 additions & 3 deletions cmake/docker/rockylinux/java.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ortools/cmake:rockylinux_swig AS env

RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf
RUN alternatives --set java /usr/lib/jvm/java-11-openjdk-11.*.x86_64/bin/java
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
RUN alternatives --set java /usr/lib/jvm/java-21-openjdk-21.*.x86_64/bin/java
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

FROM env AS devel
WORKDIR /home/project
Expand Down
2 changes: 1 addition & 1 deletion cmake/java.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ endif()
list(APPEND CMAKE_SWIG_FLAGS "-DOR_DLL=")

# Find Java and JNI
find_package(Java 1.8 COMPONENTS Development REQUIRED)
find_package(Java 21 COMPONENTS Development REQUIRED)
find_package(JNI REQUIRED)

# Find maven
Expand Down
4 changes: 2 additions & 2 deletions cmake/samples/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ help:
@echo -e "\t${BOLD}<lang>${RESET}: Language to build"
@echo -e "\t\t${BOLD}cpp${RESET} C++"
@echo -e "\t\t${BOLD}dotnet${RESET} .Net 8.0 wrappers"
@echo -e "\t\t${BOLD}java${RESET} Java (JDK 8.0) wrappers"
@echo -e "\t\t${BOLD}java${RESET} Java (JDK 21) wrappers"
@echo -e "\t\t${BOLD}python${RESET} Python 3.9+ wrappers"
@echo
@echo -e "\te.g. 'make sh_amd64_ubuntu-22.04_cpp_build'"
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/images/almalinux-9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN dotnet --info

# Install Java 8 SDK
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf

Expand Down
4 changes: 2 additions & 2 deletions tools/docker/images/alpine-edge.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN apk add --no-cache dotnet8-sdk
RUN dotnet --info

# Install Java
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
RUN apk add --no-cache openjdk8 maven
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
RUN apk add --no-cache openjdk-21-jdk maven

# Install Python
RUN apk add --no-cache python3-dev py3-pip py3-wheel \
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/images/fedora-40.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN dotnet --info

# Install Java
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/images/fedora-41.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN dotnet --info

# Install Java
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

Expand Down
4 changes: 2 additions & 2 deletions tools/docker/images/opensuse-leap.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info

# Install Java (openjdk-8)
RUN zypper install -y java-1_8_0-openjdk java-1_8_0-openjdk-devel maven \
# Install Java (openjdk-21)
RUN zypper install -y java-21-openjdk java-21-openjdk-devel maven \
&& zypper clean -a

# Install Python
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/images/rockylinux-9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN dotnet --info

# Install Java 8 SDK
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf

Expand Down
6 changes: 3 additions & 3 deletions tools/docker/images/ubuntu-20.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ RUN apt-get update -qq \
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info

# Install Java (openjdk-11)
# Install Java (openjdk-21-jdk)
RUN apt-get update -qq \
&& apt-get install -yq default-jdk maven \
&& apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

# Install Python
RUN apt-get update -qq \
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/images/ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ RUN apt-get update -qq \
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info

# Install Java (openjdk-11)
# Install Java (openjdk-21-jdk)
RUN apt-get update -qq \
&& apt-get install -yq default-jdk maven \
&& apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

# Install Python
RUN apt-get update -qq \
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/images/ubuntu-24.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ RUN apt-get update -qq \
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info

# Install Java (openjdk-11)
# Install Java (openjdk-21-jdk)
RUN apt-get update -qq \
&& apt-get install -yq default-jdk maven \
&& apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

# Install Python
RUN apt-get update -qq \
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/images/ubuntu-24.10.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ RUN apt-get update -qq \
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info

# Install Java (openjdk-11)
# Install Java (openjdk-21-jdk)
RUN apt-get update -qq \
&& apt-get install -yq default-jdk maven \
&& apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

# Install Python
RUN apt-get update -qq \
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/test/almalinux-9/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN dnf -y update \

# Install Java 8 SDK
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf
#ENV JAVA_HOME=/usr/lib/jvm/java
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/test/alpine-edge/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENTRYPOINT ["/bin/sh", "-c"]
CMD ["/bin/sh"]

# Install Java
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
RUN apk add --no-cache openjdk8 maven
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
RUN apk add --no-cache openjdk-21-jdk maven

WORKDIR /root
ADD or-tools_amd64_alpine-edge_java_v*.tar.gz .
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/test/fedora-40/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN dnf -y update \

# Java Install
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/test/fedora-41/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN dnf -y update \

# Java Install
RUN dnf -y update \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/test/opensuse-leap/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENTRYPOINT ["/usr/bin/bash", "-c"]
CMD ["/usr/bin/bash"]

# Java install (openjdk-8)
RUN zypper install -y java-1_8_0-openjdk java-1_8_0-openjdk-devel maven \
RUN zypper install -y java-21-openjdk java-21-openjdk-devel maven \
&& zypper clean -a

WORKDIR /root
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/test/rockylinux-9/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN dnf -y update \

# Install Java 8 SDK
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf
#ENV JAVA_HOME=/usr/lib/jvm/java
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/test/ubuntu-20.04/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ FROM ubuntu:20.04

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq \
&& apt-get install -yq build-essential zlib1g-dev default-jdk maven \
&& apt-get install -yq build-essential zlib1g-dev openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

#ENV TZ=America/Los_Angeles
#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
Expand Down
5 changes: 2 additions & 3 deletions tools/docker/test/ubuntu-22.04/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ RUN apt-get update -qq \

# Java/Maven Install
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
default-jdk maven \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

WORKDIR /root
ADD or-tools_amd64_ubuntu-22.04_java_v*.tar.gz .
Expand Down
5 changes: 2 additions & 3 deletions tools/docker/test/ubuntu-24.04/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ RUN apt-get update -qq \

# Java/Maven Install
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
default-jdk maven \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

WORKDIR /root
ADD or-tools_amd64_ubuntu-24.04_java_v*.tar.gz .
Expand Down
5 changes: 2 additions & 3 deletions tools/docker/test/ubuntu-24.10/java.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ RUN apt-get update -qq \

# Java/Maven Install
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
default-jdk maven \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq openjdk-21-jdk maven \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

WORKDIR /root
ADD or-tools_amd64_ubuntu-24.10_java_v*.tar.gz .
Expand Down
Loading
Loading