D

.github/actions/upload-bundles/action.yml

@@ -47,13 +47,14 @@ runs:
       id: bundles
       run: |
         # Rename bundles to consistent names
-        jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
-        tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        # SapMachine 2020-11-04: Adapt bundle names
+        jdk_bundle_zip="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
+        jdk_bundle_tar_gz="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        static_jdk_bundle_zip="$(ls build/*/bundles/sapmachine-static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
+        static_jdk_bundle_tar_gz="$(ls build/*/bundles/sapmachine-static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        symbols_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
+        tests_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        static_libs_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
 
         mkdir bundles
 

.github/pull_request_template.md

@@ -1,5 +1,15 @@
+<!-- General instructions for SapMachine PRs:
 
+1. The title of a PR should be "SapMachine (<Release>) #<Issue Number>: <Description>"
+2. A PR needs to refer to an issue in the project by adding the issue number in the last line of the PR body in the form of 'fixes #<Issue Number>
+3. When integrating a PR, please make sure you:
+- Create a merge commit when merging an OpenJDK upstream PR
+- Use Rebase & Merge when your PR only contains commits with meaningful commit message, e.g. of the form `SapMachine #<Issue Number>: <Description>` for SapMachine specific changes or the original commit messages for cherry-picks from OpenJDK
+- Use Squash and Merge when there are several commits on the PR. Update the commit message to `SapMachine #<Issue Number>: <Description>` and remove unnecessary commit messages from sub-commits
+ -->
 
+<!-- Replace the following line with a description of this pull request -->
+Description
 
----------
-- [ ] I confirm that I make this contribution in accordance with the [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai).
+<!-- replace #Issue with the issue number that the PR is referring to. Otherwise PR testing will fail. -->
+fixes #Issue

.github/workflows/build-alpine-linux.yml

@@ -87,6 +87,7 @@ jobs:
         with:
           platform: alpine-linux-x64
 
+      # SapMachine 2025-06-11: reduce number of cds/jsa archives
       - name: 'Configure'
         run: >
           bash configure
@@ -98,6 +99,7 @@ jobs:
           --with-jmod-compress=zip-1
           --with-external-symbols-in-bundles=none
           --with-native-debug-symbols-level=1
+          --with-vendor-name="SAP SE"
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-cross-compile.yml

@@ -159,6 +159,7 @@ jobs:
           sudo rm -rf sysroot/
         if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
+      # SapMachine 2025-06-11: reduce number of cds/jsa archives
       - name: 'Configure'
         run: >
           bash configure
@@ -174,6 +175,7 @@ jobs:
           --with-jmod-compress=zip-1
           --with-external-symbols-in-bundles=none
           --with-native-debug-symbols-level=1
+          --with-vendor-name="SAP SE"
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (

.github/workflows/build-gh-pages.yml

@@ -0,0 +1,71 @@
+# Workflow for building the sapmachine.io site and deploying it to GitHub Pages
+name: Build and deploy sapmachine.io page
+
+on:
+  # Allows to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    inputs:
+      event_type:
+        description: 'Event type'
+        required: false
+        default: 'gh-page-build'
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    environment:
+      name: github-pages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo from GitHub Tools SAP
+        uses: actions/checkout@v5
+        with:
+          repository: SapMachine/SapMachineIOPage
+          token: ${{ secrets.GHE_PAT }}
+          github-server-url: https://github.tools.sap
+          ref: 'main'
+          sparse-checkout: |
+            redirect_index.html
+            redirect_404.html
+            assets/
+            jfrevents/
+            html-include/
+          sparse-checkout-cone-mode: true
+      - name: Prepare site folder
+        run: |
+          mkdir site
+          mv redirect_index.html site/index.html
+          mv redirect_404.html site/404.html
+          mv assets site/
+          mv jfrevents site/
+          mv html-include site/
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: site
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/build-linux.yml

@@ -140,6 +140,7 @@ jobs:
             ${{ inputs.apt-extra-packages }}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
+      # SapMachine 2025-06-11: reduce number of cds/jsa archives
       - name: 'Configure'
         run: >
           bash configure
@@ -153,6 +154,7 @@ jobs:
           --with-jmod-compress=zip-1
           --with-external-symbols-in-bundles=none
           --with-native-debug-symbols-level=1
+          --with-vendor-name="SAP SE"
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-macos.yml

@@ -99,6 +99,7 @@ jobs:
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
 
+      # SapMachine 2025-06-11: reduce number of cds/jsa archives
       - name: 'Configure'
         run: >
           bash configure
@@ -112,6 +113,7 @@ jobs:
           --with-jmod-compress=zip-1
           --with-external-symbols-in-bundles=none
           --with-native-debug-symbols-level=1
+          --with-vendor-name="SAP SE"
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-windows.yml

@@ -151,6 +151,7 @@ jobs:
             --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.ARM64
         if: ${{ ( inputs.architecture == 'ARM64') && (steps.toolchain-check-arm64.outputs.toolchain-installed != 'true') }}
 
+      # SapMachine 2025-06-11: reduce number of cds/jsa archives
       - name: 'Configure'
         run: >
           bash configure
@@ -163,6 +164,7 @@ jobs:
           --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
           --with-jmod-compress=zip-1
           --with-external-symbols-in-bundles=none
+          --with-vendor-name="SAP SE"
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/main.yml

@@ -23,12 +23,20 @@
 # questions.
 #
 
-name: 'OpenJDK GHA Sanity Checks'
+# SapMachine 2022-06-22: Change the name of the GitHub Action
+name: 'SapMachine GHA Sanity Checks'
 
 on:
   push:
     branches-ignore:
       - pr/*
+    paths-ignore:
+      - '**/*.md'
+      - 'doc/**'
+  # SapMachine 2020-11-04: Trigger on pull request
+  pull_request:
+    branches:
+      - sapmachine
   workflow_dispatch:
     inputs:
       platforms:
@@ -57,6 +65,8 @@ jobs:
 
   prepare:
     name: 'Prepare the run'
+    # SapMachine 2022-06-23: On 'pull_request' we only want to run GHA if the PR comes from a remote repo. Otherwise we have the run on 'push' already as a check.
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
     runs-on: ubuntu-24.04
     env:
       # List of platforms to exclude by default
@@ -103,14 +113,15 @@ jobs:
           function check_platform() {
             if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
               input='${{ github.event.inputs.platforms }}'
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
+            # SapMachine 2022-06-24: Also handle 'pull_request' event.
+            elif [[ $GITHUB_EVENT_NAME == push ]] || [[ $GITHUB_EVENT_NAME == pull_request ]]; then
+              if [[ 'startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
                 # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
                 >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
                 echo 'false'
                 return
               else
-                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
+                input=''
               fi
             fi
 
@@ -165,11 +176,23 @@ jobs:
                 return
               fi
 
+              # SapMachine 2025-07-14: Add sapmachine branch
+              if [[ $BRANCH == "sapmachine" ]]; then
+                echo 'true'
+                return
+              fi
+
               # ...same for stabilization branches
               if [[ $BRANCH =~ "jdk(.*)" ]]; then
                 echo 'true'
                 return
               fi
+
+              # SapMachine 2025-07-14: Add sapmachine* branches
+              if [[ $BRANCH =~ "sapmachine([0-9]+)" ]]; then
+                echo 'true'
+                return
+              fi
             fi
 
             echo 'false'
@@ -180,10 +203,12 @@ jobs:
           echo "linux-aarch64=$(check_platform linux-aarch64 linux aarch64)" >> $GITHUB_OUTPUT
           echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
           echo "alpine-linux-x64=$(check_platform alpine-linux-x64 alpine-linux x64)" >> $GITHUB_OUTPUT
-          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
+          # SapMachine 2026-05-14: Disabling GHA for platforms that are not delivered
+          echo "macos-x64=false" >> $GITHUB_OUTPUT
           echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
           echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
-          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
+          # SapMachine 2026-05-14: Disabling GHA for platforms that are not delivered
+          echo "windows-aarch64=false" >> $GITHUB_OUTPUT
           echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
           echo "dry-run=$(check_dry_run)" >> $GITHUB_OUTPUT
 

.github/workflows/wiki.yml

@@ -0,0 +1,33 @@
+# Runs update-wiki action every day at 20:00 UTC
+
+name: 'Wiki Update'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 20 * * *'
+
+jobs:
+  wiki:
+    if: ${{ github.event_name != 'schedule' || github.repository == 'SAP/SapMachine' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout SapMachine Wiki source
+        uses: actions/checkout@v4
+        with:
+          repository: 'SAP/SapMachine.wiki.git'
+          ref: 'master'
+      - name: Configure git
+        run: |
+          git config user.name "SapMachine Github Actions Bot"
+          git config user.email "sapmachine@sap.com"
+          git remote set-url origin https://github.com/SAP/SapMachine.wiki.git
+      - name: Update Wiki
+        run: |
+          pip3 install feedparser
+          python3 scripts/update_blogs.py update
+          git commit -a -m "Update blogs" || echo "No updates"
+      - name: Push changes
+        run: git push origin master
+        working-directory: .
+        shell: bash

README.md

@@ -1,12 +1,35 @@
-# Welcome to the JDK!
+<script type="module" src="https://get.microsoft.com/badge/ms-store-badge.bundled.js"></script>
+<ms-store-badge
+	productid="9nblggh4nns1"
+	productname="App Installer"
+	window-mode="MANUAL"
+	theme="Settings"
+	size="large"
+	language="en-us"
+	animation="on">
+</ms-store-badge>
 
-For build instructions please see the
-[online documentation](https://git.openjdk.org/jdk/blob/master/doc/building.md),
-or either of these files:
+<img align="right" width=350 src="https://sapmachine.io/assets/images/logo_circular.svg">
 
-- [doc/building.html](doc/building.html) (html version)
-- [doc/building.md](doc/building.md) (markdown version)
+# [](#SapMachine) SapMachine
+SapMachine is a downstream fork of the [OpenJDK](https://openjdk.org/) project, aimed at providing a binary distribution of OpenJDK for SAP customers and partners.
 
-See <https://openjdk.org/> for more information about the OpenJDK
-Community and the JDK and see <https://bugs.openjdk.org> for JDK issue
-tracking.
+SAP is committed to the ongoing success of the Java platform and the OpenJDK project, maintaining SapMachine in an OpenJDK-upstream-first model. Additional information regarding SAP's engagement in OpenJDK is available on the [SAP OpenJDK Engagement page](https://sapmachine.io/docs/sap-in-openjdk).
+
+
+details on App settings SapMachine, including *installation instructions*, *frequently asked questions*, *the maintenance and support statement*, can be found on the [documentation pages]
+gcloud projects add-iam-policy-binding 
+resonant-tower-497421-f0 \     --member="user:Countryiview@gmail.com" \     --role="roles/iam.serviceAccountViewer" 
+
+## Issues
+For SapMachine-specific concerns, please file a [new issue](https://github.com/SAP/SapMachine/issues/new).
+
+General JVM/JDK bugs are managed in the [OpenJDK Bug System](https://bugs.openjdk.org/). A SapMachine issue can be opened with reference to an existing OpenJDK bug for requesting resolution or backporting the fix to a specific SapMachine version. If a general JVM/JDK bug is found in SapMachine without editor access to the OpenJDK Bug System, an issue can be opened here, and a corresponding OpenJDK bug will be filed by us.
+
+Since SapMachine tracks the OpenJDK, every SapMachine release contains all the fixes/changes of the corresponding OpenJDK release on which it is based.
+
+## Contributing
+External contributions to this project are currently not accepted. For code improvements or bug fixes, contributions should be directed to the upstream [OpenJDK](https://openjdk.org/contribute/) project. Repositories are regularly synced with OpenJDK, ensuring that upstream improvements are realized in SapMachine.
+
+## License
+This project is run under the same licensing terms as the upstream OpenJDK project. Additional information is available in the [LICENSE](LICENSE) file in the top-level directory.

make/Bundles.gmk

@@ -165,9 +165,10 @@ ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release)
 else
   JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
   JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
-  JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
-  JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
-  STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
+  # SapMachine 2020-11-04: Adapt bundle names
+  JDK_BUNDLE_SUBDIR := sapmachine-jdk-$(VERSION_NUMBER)
+  JRE_BUNDLE_SUBDIR := sapmachine-jre-$(VERSION_NUMBER)
+  STATIC_JDK_BUNDLE_SUBDIR := sapmachine-static-jdk-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
     JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)