From bb022ad0cbbcbba74383f5c09550f21f1f547f8a Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Mon, 17 Mar 2025 10:14:58 +0100
Subject: [PATCH 1/4] Use SPDX identifier for license name

https://maven.apache.org/pom.html#Licenses
> Using an SPDX identifier as the license name is recommended

Meanwhile
https://maven.apache.org/xsd/maven-4.0.0.xsd
> The full legal name of the license

Can you maybe make up your mind?
---
 pom.xml                      | 2 +-
 template-placeholder/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc8c2819..f41e09d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
 	<licenses>
 		<license>
-			<name>Apache License, Version 2.0</name>
+			<name>Apache-2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 		</license>
diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 8bac89bb..5544d7d5 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -35,7 +35,7 @@
 
 	<licenses>
 		<license>
-			<name>Apache License, Version 2.0</name>
+			<name>Apache-2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 		</license>

From da9442e969b44f01462120fd1557b37b25baa271 Mon Sep 17 00:00:00 2001
From: XDEV Renovate Bot <renovate@xdev-software.de>
Date: Thu, 20 Mar 2025 16:03:11 +0000
Subject: [PATCH 2/4] Update dependency com.mycila:license-maven-plugin to v5

---
 template-placeholder/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml
index 5544d7d5..db200048 100644
--- a/template-placeholder/pom.xml
+++ b/template-placeholder/pom.xml
@@ -103,7 +103,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.6</version>
+				<version>5.0.0</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>

From 2e7b1b6655563f8f81bdf02ce2c602c3a9be3946 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 21 Mar 2025 12:17:08 +0100
Subject: [PATCH 3/4] sonarcloud was renamed to sonarqubecloud

---
 .github/workflows/update-from-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index 3ad8e88d..d9dbba57 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -200,7 +200,7 @@ jobs:
           GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
         run: |
           not_failed_conclusion="skipped|neutral|success"
-          not_relevant_app_slug="dependabot|github-pages|sonarcloud"
+          not_relevant_app_slug="dependabot|github-pages|sonarqubecloud"
 
           echo "Waiting for checks to start..."
           sleep 40s

From 888b4ce0a3b28dcb11fdfec03d8912520d641c03 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 21 Mar 2025 12:39:41 +0100
Subject: [PATCH 4/4] Fix branch deletion being not detected

---
 .github/workflows/update-from-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index d9dbba57..24af3f35 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -210,7 +210,7 @@ jobs:
 
             echo "Checking if update-branch-merged exists"
             git fetch
-            if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
+            if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
               echo "Branch still exists; Continuing..."
             else
               echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"