Skip to content

Update Bundled OpenJDK to latest #6139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2025
Merged

Update Bundled OpenJDK to latest #6139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96ef7bd
Update Bundled OpenJDK to latest
srv-gh-o11y-gdi Apr 17, 2025
cc226c5
Merge branch 'main' into create-pull-request/update-openjdk
jinja2 Apr 17, 2025
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
2 changes: 1 addition & 1 deletion cmd/otelcol/Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ARG JMX_METRIC_GATHERER_RELEASE
RUN New-Item -Path "C:\\" -Name "opt" -ItemType "directory"
RUN Invoke-WebRequest -Uri "https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${env:JMX_METRIC_GATHERER_RELEASE}/opentelemetry-jmx-metrics.jar" -Outfile "c:\opt\opentelemetry-java-contrib-jmx-metrics.jar"

ARG JDK_VERSION="11.0.26_4"
ARG JDK_VERSION="11.0.27_6"
ARG OPENJDK_BASE_URL="https://github.com/adoptium/temurin11-binaries/releases/download"
ENV JAVA_HOME="C:\java\jre"
ENV JAVA_PATH="$JAVA_HOME\bin"
Expand Down
2 changes: 1 addition & 1 deletion packaging/bundle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

ARG ARCH=amd64
ARG JDK_VERSION=11.0.26_4
ARG JDK_VERSION=11.0.27_6
ARG MAVEN_VERSION=3.6.0
ARG PYTHON_VERSION=3.13.2
ARG PIP_VERSION=24.2
Expand Down
Loading