Merge branch 'main' into bug6113

Author: axeluhl

.github/workflows/merge-main-into-docker-25.yml

@@ -17,13 +17,22 @@ jobs:
         with:
           ref: docker-25
           fetch-depth: 0  # fetch the whole thing to make sure the histories merge
+          token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
+      - name: Determine merge commit
+        id: merge-source
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "sha=$(git rev-parse origin/main)" >> "$GITHUB_OUTPUT"
+            echo "label=main (latest)" >> "$GITHUB_OUTPUT"
+          else
+            echo "sha=${{ github.event.workflow_run.head_sha }}" >> "$GITHUB_OUTPUT"
+            echo "label=main (${{ github.event.workflow_run.head_sha }})" >> "$GITHUB_OUTPUT"
+          fi
       - name: Merge main into docker-25
-        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0
-        env:
-          GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
-        with:
-          type: now
-          from_branch: main
-          target_branch: docker-25
-          message: Auto-merging main into docker-25 after successful release build
-          github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          echo "Merging ${{ steps.merge-source.outputs.sha }} into docker-25..."
+          git merge ${{ steps.merge-source.outputs.sha }} \
+            -m "Auto-merging ${{ steps.merge-source.outputs.label }} into docker-25 after successful release build"
+          git push origin docker-25

.github/workflows/release.yml

@@ -97,11 +97,11 @@ jobs:
           log-accepted-android-sdk-licenses: 'false'
           cmdline-tools-version: 9123335  # This corresponds to human-friendly version number 8.0
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d #v1.12.0
+        uses: supercharge/mongodb-github-action@315db7fe45ac2880b7758f1933e6e5d59afd5e94 #v1.12.1
         with:
           mongodb-version: 7.0
       - name: Start RabbitMQ
-        uses: namoshek/rabbitmq-github-action@58b841360ede0e19fc5e4929fc2477ecc09193d8 # v1.1.0
+        uses: Namoshek/rabbitmq-github-action@80a182e44c7f60bc3417a8689d6a24fe9d08b27b #v1.2.0
         with:
           version: '3.8.9'
           ports: '5672:5672'
@@ -112,6 +112,8 @@ jobs:
           AWS_S3_TEST_S3ACCESSKEY: ${{ secrets.AWS_S3_TEST_S3ACCESSKEY }}
           GEONAMES_ORG_USERNAMES: ${{ secrets.GEONAMES_ORG_USERNAMES }}
           GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }}
+          POLAR_DATA_BASE_URL: ${{ secrets.POLAR_DATA_BASE_URL }}
+          POLAR_DATA_BEARER_TOKEN: ${{ secrets.POLAR_DATA_BEARER_TOKEN }}
           APP_PARAMETERS: "-Daws.region=eu-west-1"
           JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
           JAVA17_HOME: ${{env.JAVA_HOME_17_X64}}

AGENTS.md

@@ -0,0 +1,7 @@
+We want all local variables, fields, and parameters to be declared "final" as far as possible.
+
+We want all literals used as parameters (true, false, numeric literals, Optional.empty() and null) to be prefixed with a comment telling the parameter name.
+
+We want a single exit point in any method only, so no multiple "return" statements.
+
+Avoid unnecessary empty lines. If you feel like you need to separate code within a single method into "sections", consider using double-slash comments to explain what the next section is.

Gemfile.lock

@@ -43,7 +43,7 @@ GEM
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)

Home.md

@@ -59,6 +59,7 @@ SAP is at the center of today’s technology revolution, developing innovations
 * Amazon
   * [[Amazon EC2|wiki/info/landscape/amazon-ec2]]
   * [[Upgrading ARCHIVE server|wiki/info/landscape/archive-server-upgrade]]
+  * [[Upgrading MongoDB Nodes|wiki/info/landscape/mongo-cluster-upgrade]]
   * [[EC2 Backup Strategy|wiki/info/landscape/amazon-ec2-backup-strategy]]
   * [[Creating an EC2 image from scratch|wiki/info/landscape/creating-ec2-image-from-scratch]]
   * [[Upgrading an EC2 image|wiki/info/landscape/upgrading-ec2-image]]

README.md

@@ -1,3 +1,7 @@
+<p align="center">
+  <img src="azimuth_logo.png" alt="Sailing Analytics">
+</p>
+
 # Sailing Analytics
 
 ## About this Project
@@ -20,23 +24,23 @@ More background information is available in the project's Wiki which is currentl
 
 ## Quick Start with Docker Compose
 
-If you have built or obtained the ``ghcr.io/sap/sailing-analytics:latest`` multi-platform image (currently available for linux/amd64 and linux/arm64 architectures), try this:
+To run the latest release build (currently available for linux/amd64 and linux/arm64 architectures), try this:
 ```
-    cd docker
+    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:
 - a MongoDB server, listening on default port 27017
 - a RabbitMQ server, listening on default port
 - a Sailing Analytics server, listening for HTTP requests on port 8888 and for telnet connections to the OSGi console on port 14888
 
-Try a request to [``http://127.0.0.1:8888/index.html``](http://127.0.0.1:8888/index.html) or [``http://127.0.0.1:8888/gwt/status``](http://127.0.0.1:8888/gwt/status) to see if things worked.
+Try a request to [``http://127.0.0.1:8888/index.html``](http://127.0.0.1:8888/index.html) or [``http://127.0.0.1:8888/gwt/status``](http://127.0.0.1:8888/gwt/status) to see if things worked. The default login to your local administration console at [``http://127.0.0.1:8888/gwt/AdminConsole.html``](http://127.0.0.1:8888/gwt/AdminConsole.html) uses the user name ``admin`` with password ``admin``.
 
-To use Java 24, use the ``docker-compose-24.yml`` file instead:
+To use Java 25, use the ``docker-compose-25.yml`` file instead:
 
 ```
-    cd docker
-    docker-compose -f docker-compose-24.yml up
+    wget "https://github.com/SAP/sailing-analytics/raw/refs/heads/main/docker/docker-compose-25.yml"
+    docker-compose -f docker-compose-25.yml up
 ```
 
 ## Requirements
@@ -74,7 +78,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/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-24`` and ``releases/*`` branches also publish a [release](https://github.com/SAP/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.
 
@@ -164,13 +168,13 @@ Then, manually trigger the ``release`` workflow with default options. You find t
 
 Release builds will trigger the ``create-docker-image`` workflow which will produce a Docker image of your release and publish it as a "ghcr" package in your repository. Note that package names are computed from the repository name by converting the latter to all lowercase characters. If you want to use your packages in the docker-compose configurations from the ``docker/`` folder, make sure to adjust the package name so it points to your own fork's package registry.
 
-If you want automatic validation of your changes to the ``main`` branch also for newer Java versions, you can use the ``merge-main-into-docker-24`` workflow. It requires another secret:
+If you want automatic validation of your changes to the ``main`` branch also for newer Java versions, you can use the ``merge-main-into-docker-25`` workflow. It requires another secret:
 
 ```
 REPO_TOKEN_FOR_MERGE_AND_PUSH: {a-GitHub-token-enabled-for-push}
 ```
 
-The workflow will launch automatically after a release has been performed for the ``main`` branch and will try to merge the latest ``main`` branch into ``docker-24`` and pushing the merge result if the merge was successful. This will then trigger a build for the ``docker-24`` branch which, if successul, will in turn produce a release and a docker image for use with Java 24.
+The workflow will launch automatically after a release has been performed for the ``main`` branch and will try to merge the latest ``main`` branch into ``docker-25`` and pushing the merge result if the merge was successful. This will then trigger a build for the ``docker-25`` branch which, if successul, will in turn produce a release and a docker image for use with Java 24.
 
 ### Run a build locally
 

azimuth_logo.png

@@ -28,7 +28,7 @@ resources:
       # For available versions, please have a look here (use the tag, not the release name):
       # https://github.tools.sap/SAPMobile/sap-mobile-pipeline/releases
       # ----------
-      ref: 'refs/tags/3.13.3'
+      #ref: 'refs/tags/3.13.3'
 
 #################################################################
 ######################### Pipeline Start ########################
@@ -53,3 +53,4 @@ extends:
     # to determine which app is to be built/released/signed
     # Default: Race Manager App
     momaAssemblyId: 189
+    naasReleaseEnabled: true

azure-pipelines/main.yml

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

configuration/.settings/org.eclipse.core.resources.prefs

@@ -671,7 +671,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
         PATH=$PATH:$ANDROID_HOME/platform-tools
         SDK_MANAGER="$ANDROID_HOME/cmdline-tools/8.0/bin/sdkmanager"
         if [ \! -x "$SDK_MANAGER" ]; then
-            SDK_MANAGER="$ANDROID_HOME/tools/bin/sdkmanager.bat"
+            SDK_MANAGER="$ANDROID_HOME/tools/bin/sdkmanager"
         fi
         echo "SDK_MANAGER=${SDK_MANAGER}"
         echo "cmdline-tools:"