From e945a12a6e882b8979bedcf6a5a8ec096fc76dd6 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Sat, 24 Jan 2026 00:13:36 +0100
Subject: [PATCH] Switch to main branch and use Java25 as build image; also use
 Java25b as base docker image.

---
 .drone.yml        | 40 ++++++++++++++++++++--------------------
 docker/Dockerfile |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a282745..17a564c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,39 +3,39 @@ type: docker
 name: default
 steps:
   - name: build
-    image: maven:3.9-eclipse-temurin-21
+    image: maven:3.9-eclipse-temurin-25
     commands:
       - mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
     when:
       ref:
         include:
-          - refs/head/master
+          - refs/head/main
           - refs/head/feature/**
           - refs/tags/**
   - name: test
-    image: maven:3.9-eclipse-temurin-21
+    image: maven:3.9-eclipse-temurin-25
     commands:
       - mvn test -B
     when:
       branch:
         include:
-          - master
+          - main
           - feature/*
-  - name: deploy
-    image: maven:3.9-eclipse-temurin-21
-    environment:
-      REPO_TOKEN:
-        from_secret: repo-token
-      REPO_TOKEN_OSSRH:
-        from_secret: repo-token-ossrh
-    commands:
-      - mvn -s maven-settings.xml deploy -DskipTests=true
-    when:
-      branch:
-        - master
-      event:
-        exclude:
-          - pull_request
+#  - name: deploy
+#    image: maven:3.9-eclipse-temurin-25
+#    environment:
+#      REPO_TOKEN:
+#        from_secret: repo-token
+#      REPO_TOKEN_OSSRH:
+#        from_secret: repo-token-ossrh
+#    commands:
+#      - mvn -s maven-settings.xml deploy -DskipTests=true
+#    when:
+#      branch:
+#        - main
+#      event:
+#        exclude:
+#          - pull_request
   - name: build_docker_image
     image: plugins/docker
     settings:
@@ -49,7 +49,7 @@ steps:
       dockerfile: docker/Dockerfile
     when:
       branch:
-        - master
+        - main
       event:
         exclude:
           - pull_request
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 74a2661..0c6ac00 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:25-jre-alpine
 
 COPY target/maze-server-*.jar /app/
-RUN rm /app/*-sources.jar
+RUN rm /app/*-sources.jar /app/*-javadoc.jar
 RUN mv /app/*.jar /app/app.jar
 
 CMD java \