Merge remote-tracking branch 'github/main'

.github/workflows/sync-upstream-eclipse.yml

@@ -0,0 +1,51 @@
+# Periodically merges the upstream Eclipse repo's main branch into our
+# downstream eclipse-main branch and opens (or reuses) a PR from eclipse-main
+# into main. The merge/push step uses GITHUB_TOKEN (so github-actions[bot] is
+# the last pusher), and the PR is opened by the eclipse-sailing-analytics-bot
+# user via ECLIPSE_BOT_PAT. Because neither identity is the human reviewer,
+# the "approval from someone other than the last pusher" branch protection
+# rule on main is satisfied by a maintainer's own approval.
+name: Merge upstream eclipse-sailing-analytics/sailing-analytics main into eclipse-main
+on:
+  schedule:
+    - cron: "37 5 * * *"   # daily at 05:37 UTC
+  workflow_dispatch: {}
+jobs:
+  merge-upstream-main:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout eclipse-main
+        uses: actions/checkout@v4
+        with:
+          ref: eclipse-main
+          fetch-depth: 0  # full history so the merge has a real base
+      - name: Configure git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Fetch upstream
+        run: |
+          git remote add upstream https://github.com/eclipse-sailing-analytics/sailing-analytics.git
+          git fetch upstream main
+      - name: Merge upstream/main into eclipse-main
+        run: |
+          git merge --no-ff upstream/main -m "Auto-merge upstream eclipse-sailing-analytics/sailing-analytics main into eclipse-main"
+      - name: Push eclipse-main
+        run: git push origin eclipse-main
+      - name: Open PR eclipse-main -> main (as eclipse-sailing-analytics-bot)
+        env:
+          GH_TOKEN: ${{ secrets.ECLIPSE_BOT_PAT }}
+        run: |
+          existing=$(gh pr list --repo "$GITHUB_REPOSITORY" --head eclipse-main --base main --state open --json number --jq '.[0].number')
+          if [ -n "$existing" ]; then
+            echo "PR #$existing already open for eclipse-main -> main; skipping."
+            exit 0
+          fi
+          gh pr create \
+            --repo "$GITHUB_REPOSITORY" \
+            --base main \
+            --head eclipse-main \
+            --title "Merge upstream eclipse-sailing-analytics/sailing-analytics main into main" \
+            --body "Automated PR opened by the daily sync workflow. The eclipse-main branch has been updated with the latest changes from upstream eclipse-sailing-analytics/sailing-analytics main. Use 'Create a merge commit' when merging (do not squash or rebase) so any '-s ours' merges on eclipse-main are respected."

README.md

@@ -26,7 +26,7 @@ More background information is available in the project's Wiki which is currentl
 
 To run the latest release build (currently available for linux/amd64 and linux/arm64 architectures), try this:
 ```
-    wget "https://github.com/eclipse-sailing-analytics/sailing-analytics/raw/refs/heads/main/docker/docker-compose.yml"
+    wget "https://github.com/SAP/sailing-analytics/raw/refs/heads/main/docker/docker-compose.yml"
     docker-compose up
 ```
 Based on the ``docker/docker-compose.yml`` definition you should end up with three running Docker containers:
@@ -38,7 +38,7 @@ Try a request to [``http://127.0.0.1:8888/index.html``](http://127.0.0.1:8888/in
 
 To use Java 25, use the ``docker-compose-25.yml`` file instead:
 ```
-    wget "https://github.com/eclipse-sailing-analytics/sailing-analytics/raw/refs/heads/main/docker/docker-compose-25.yml"
+    wget "https://github.com/SAP/sailing-analytics/raw/refs/heads/main/docker/docker-compose-25.yml"
     docker-compose -f docker-compose-25.yml up
 ```
 
@@ -77,7 +77,7 @@ See [here](https://www.sapsailing.com/gwt/Home.html#/imprint/:) for a list of co
 
 ## Building and Running
 
-Builds usually run on [GitHub Actions](https://github.com/eclipse-sailing-analytics/sailing-analytics/actions/workflows/release.yml) upon every push. A few repository secrets ensure that the build process has the permissions it needs. Pushes to the ``main``, ``docker-25`` and ``releases/*`` branches also publish a [release](https://github.com/eclipse-sailing-analytics/sailing-analytics/releases) after a successful build.
+Builds usually run on [GitHub Actions](https://github.com/SAP/sailing-analytics/actions/workflows/release.yml) upon every push. A few repository secrets ensure that the build process has the permissions it needs. Pushes to the ``main``, ``docker-25`` and ``releases/*`` branches also publish a [release](https://github.com/SAP/sailing-analytics/releases) after a successful build.
 
 There are two options for building, detailed below; for both, you need to fulfill a few prerequisites.
 
@@ -215,7 +215,7 @@ Run the ``buildAndUpdateProduct.sh`` without any arguments to see the sub-comman
 
 You need to have Java 8 installed. Get one from, e.g., [here](https://tools.eu1.hana.ondemand.com/#cloud). Either ensure that this JVM's ``java`` executable in on the ``PATH`` or set ``JAVA_HOME`` appropriately.
 
-At [https://github.com/eclipse-sailing-analytics/sailing-analytics/releases](https://github.com/eclipse-sailing-analytics/sailing-analytics/releases) you find official product builds. To fetch and install one of them, make an empty directory, change into it and run the ``refreshInstance.sh`` command, e.g., like this:
+At [https://github.com/SAP/sailing-analytics/releases](https://github.com/SAP/sailing-analytics/releases) you find official product builds. To fetch and install one of them, make an empty directory, change into it and run the ``refreshInstance.sh`` command, e.g., like this:
 ```
     mkdir sailinganalytics
     cd sailinganalytics