From 398896935c3e05c2d97cfb4c6a926410e0a38213 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Fri, 27 Mar 2026 20:22:29 +1300
Subject: [PATCH 01/13] feat: merge dependencies block in gradle

---
 .../rewrite/AddConfigurationRecipe.java       |  14 ++
 .../rewrite/DependencyMergeUtil.java          | 142 ++++++++++++++++++
 .../rewrite/AddConfigurationRecipeTests.java  |  55 +++++++
 3 files changed, 211 insertions(+)
 create mode 100644 src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java

diff --git a/src/main/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipe.java b/src/main/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipe.java
index a3f82268..28882428 100644
--- a/src/main/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipe.java
+++ b/src/main/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipe.java
@@ -127,6 +127,16 @@ private boolean addOrReplace(List<Statement> targetStatements, Statement configS
 		for (int i = 0; i < targetStatements.size(); i++) {
 			Statement targetStmt = targetStatements.get(i);
 			if (matches(targetStmt, configStmt)) {
+				// Special case: merge dependencies{} blocks instead of replacing
+				if (isDependenciesBlock(targetStmt)) {
+					Statement merged = DependencyMergeUtil.mergeDependenciesBlock(targetStmt, configStmt, targetCu,
+							configCu);
+					if (merged != null) {
+						targetStatements.set(i, merged);
+						return true;
+					}
+					return false;
+				}
 				// avoid modifying if the trimmed outputs are strictly identical
 				org.openrewrite.Cursor targetCursor = new org.openrewrite.Cursor(
 						new org.openrewrite.Cursor(null, targetCu), targetStmt);
@@ -142,6 +152,10 @@ private boolean addOrReplace(List<Statement> targetStatements, Statement configS
 		return true;
 	}
 
+	private boolean isDependenciesBlock(Statement stmt) {
+		return stmt instanceof J.MethodInvocation m && "dependencies".equals(m.getSimpleName());
+	}
+
 	private boolean matches(Statement targetStmt, Statement configStmt) {
 		// handle project.ext.set -> we want to override only properties with the same
 		// name
diff --git a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
new file mode 100644
index 00000000..b90d2434
--- /dev/null
+++ b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.canonical.devpackspring.rewrite;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import org.openrewrite.Cursor;
+import org.openrewrite.SourceFile;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.Statement;
+
+public abstract class DependencyMergeUtil {
+
+	public static Statement mergeDependenciesBlock(Statement targetStmt, Statement configStmt, SourceFile targetCu,
+			SourceFile configCu) {
+		J.MethodInvocation targetMethod = (J.MethodInvocation) targetStmt;
+		J.MethodInvocation configMethod = (J.MethodInvocation) configStmt;
+
+		List<Statement> targetDeps = getDependenciesStatements(targetMethod);
+		List<Statement> configDeps = getDependenciesStatements(configMethod);
+		if (targetDeps == null) {
+			return configStmt;
+		}
+		if (configDeps == null) {
+			return null; // nothing to merge, skip it
+		}
+
+		HashSet<String> deps = new HashSet<String>();
+		HashMap<String, Statement> target = new HashMap<String, Statement>();
+		HashMap<String, Statement> source = new HashMap<String, Statement>();
+		targetDeps.forEach(x -> updateDependencies(x, deps, target));
+		configDeps.forEach(x -> updateDependencies(x, deps, source));
+
+		List<Statement> mergedDeps = new ArrayList<Statement>();
+		var sortedList = new ArrayList<String>(deps);
+		Collections.sort(sortedList);
+		for (var key : sortedList) {
+			Statement stm = source.get(key);
+			if (stm != null) {
+				if (!mergedDeps.isEmpty()) {
+					stm = stm.withPrefix(mergedDeps.getLast().getPrefix());
+				}
+				mergedDeps.add(stm);
+				continue;
+			}
+			stm = target.get(key);
+			if (stm != null) {
+				if (!mergedDeps.isEmpty()) {
+					stm = stm.withPrefix(mergedDeps.getLast().getPrefix());
+				}
+				mergedDeps.add(stm);
+			}
+		}
+		Statement rebuilt = rebuildDependenciesStatements(targetMethod, mergedDeps);
+		if (rebuilt == null) {
+			return null;
+		}
+		Cursor rc = new Cursor(new Cursor(null, targetCu), rebuilt);
+		String newResult = rebuilt.printTrimmed(rc).trim();
+		Cursor cc = new Cursor(new Cursor(null, configCu), targetStmt);
+		String oldResult = targetStmt.printTrimmed(cc).trim();
+		if (oldResult.equals(newResult)) {
+			return null;
+		}
+		return rebuilt;
+	}
+
+	private static void updateDependencies(Statement stm, HashSet<String> deps, HashMap<String, Statement> depMap) {
+		var key = getDependencyKey(stm);
+		if (key == null) {
+			throw new RuntimeException("Unexpected element in depends block " + stm.toString());
+		}
+		deps.add(key);
+		depMap.put(key, stm);
+	}
+
+	private static List<Statement> getDependenciesStatements(J.MethodInvocation m) {
+		if (m.getArguments().size() == 1) {
+			org.openrewrite.java.tree.Expression arg = m.getArguments().get(0);
+			if (arg instanceof J.Lambda lambda && lambda.getBody() instanceof J.Block block) {
+				return block.getStatements().stream().map(stmt -> {
+					if (stmt instanceof J.Return ret) {
+						return (Statement) ret.getExpression();
+					}
+					return stmt;
+				}).toList();
+			}
+		}
+		return null;
+	}
+
+	private static Statement rebuildDependenciesStatements(J.MethodInvocation m, List<Statement> newStatements) {
+		if (m.getArguments().size() == 1) {
+			org.openrewrite.java.tree.Expression arg = m.getArguments().getFirst();
+			if (arg instanceof J.Lambda lambda && lambda.getBody() instanceof J.Block block) {
+				J.Block newBlock = block.withStatements(newStatements);
+				J.Lambda newLambda = lambda.withBody(newBlock);
+				return m.withArguments(List.of(newLambda));
+			}
+		}
+		return null;
+	}
+
+	private static String getDependencyKey(Statement stmt) {
+		if (!(stmt instanceof J.MethodInvocation m)) {
+			return null;
+		}
+		String scope = m.getSimpleName();
+		if (m.getArguments().isEmpty()) {
+			return null;
+		}
+		String coord = m.getArguments().getFirst().toString();
+		// Strip the version segment: "group:artifact:version" -> "group:artifact"
+		String[] parts = coord.split(":");
+		if (parts.length >= 2) {
+			return scope + ":" + parts[0] + ":" + parts[1];
+		}
+		if (parts.length == 1) {
+			return scope + ":" + coord;
+		}
+		throw new RuntimeException("Unexpected statement " + stmt);
+	}
+
+}
diff --git a/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java b/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
index 38620b0c..3f13b30e 100644
--- a/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
+++ b/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
@@ -330,4 +330,59 @@ void testKotlinConfigurationAppendProperty() {
 				"""));
 	}
 
+	@Test
+	void testGroovyDependenciesMerge() {
+		String config = """
+				dependencies {
+				    implementation 'org.springframework.boot:spring-boot-starter:3.5.0'
+				    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+				}
+				""";
+		G.CompilationUnit cu = parseGroovyConfig(config);
+		rewriteRun(spec -> spec.recipe(new AddConfigurationRecipe(cu, false)), Assertions.buildGradle("""
+				dependencies {
+				    implementation 'org.springframework.boot:spring-boot-starter:3.3.0'
+				    runtimeOnly 'org.postgresql:postgresql:42.7.0'
+				}
+				""", """
+				dependencies {
+				    implementation 'org.springframework.boot:spring-boot-starter:3.5.0'
+				    runtimeOnly 'org.postgresql:postgresql:42.7.0'
+				    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+				}
+				"""));
+		rewriteRun(spec -> spec.recipe(new AddConfigurationRecipe(cu, false)), Assertions.buildGradle("""
+				dependencies {
+				}
+				""", """
+				dependencies {
+				    implementation 'org.springframework.boot:spring-boot-starter:3.5.0'
+				    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+				}
+				"""));
+	}
+
+	@Test
+	void testKotlinDependenciesMerge() {
+		String config = """
+				dependencies {
+				    implementation("org.springframework.boot:spring-boot-starter:3.5.0")
+				    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
+				}
+				""";
+		K.CompilationUnit cu = parseKotlinConfig(config);
+		rewriteRun(spec -> spec.recipe(new AddConfigurationRecipe(cu, true)), Assertions.buildGradleKts("""
+				dependencies {
+				    implementation("org.springframework.boot:spring-boot-starter:3.3.0")
+				    runtimeOnly("org.postgresql:postgresql:42.7.0")
+				}
+				""", """
+				dependencies {
+				    implementation("org.springframework.boot:spring-boot-starter:3.5.0")
+				    runtimeOnly("org.postgresql:postgresql:42.7.0")
+				    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
+				}
+				"""));
+	}
+
 }

From 2cada5451f3a0a70a4b91ede2bec91dd5015aa77 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:32:34 +1300
Subject: [PATCH 02/13] fix: handle empty dependencies blocks

---
 .../rewrite/DependencyMergeUtil.java          |  8 ++++-
 .../rewrite/AddConfigurationRecipeTests.java  | 33 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
index b90d2434..0a44c489 100644
--- a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
+++ b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
@@ -111,7 +111,13 @@ private static Statement rebuildDependenciesStatements(J.MethodInvocation m, Lis
 		if (m.getArguments().size() == 1) {
 			org.openrewrite.java.tree.Expression arg = m.getArguments().getFirst();
 			if (arg instanceof J.Lambda lambda && lambda.getBody() instanceof J.Block block) {
-				J.Block newBlock = block.withStatements(newStatements);
+				J.Block newBlock = block.withStatements(newStatements.stream().map(stmt -> {
+					String ws = stmt.getPrefix().getWhitespace();
+					if (!ws.contains("\n")) {
+						stmt = stmt.withPrefix(stmt.getPrefix().withWhitespace("\n" + ws));
+					}
+					return stmt;
+				}).toList());
 				J.Lambda newLambda = lambda.withBody(newBlock);
 				return m.withArguments(List.of(newLambda));
 			}
diff --git a/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java b/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
index 3f13b30e..ff22c6b5 100644
--- a/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
+++ b/src/test/java/com/canonical/devpackspring/rewrite/AddConfigurationRecipeTests.java
@@ -362,6 +362,39 @@ void testGroovyDependenciesMerge() {
 				"""));
 	}
 
+	@Test
+	void testGroovyDependenciesMergeNewLines() {
+		String config = """
+				dependencies {
+				    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+				}
+				""";
+		G.CompilationUnit cu = parseGroovyConfig(config);
+		rewriteRun(spec -> spec.recipe(new AddConfigurationRecipe(cu, false)), Assertions.buildGradle("""
+				dependencies { implementation 'org.springframework.boot:spring-boot-starter:3.3.0' }
+				""", """
+				dependencies {
+				implementation 'org.springframework.boot:spring-boot-starter:3.3.0'
+				testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0' }
+				"""));
+	}
+
+	@Test
+	void testKotlinDependenciesMergeNewLines() {
+		String config = """
+				dependencies {
+				    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
+				}
+				""";
+		K.CompilationUnit cu = parseKotlinConfig(config);
+		rewriteRun(spec -> spec.recipe(new AddConfigurationRecipe(cu, true)), Assertions.buildGradleKts("""
+				dependencies { implementation("org.springframework.boot:spring-boot-starter:3.3.0") }
+				""", """
+				dependencies {
+				 implementation("org.springframework.boot:spring-boot-starter:3.3.0")
+				 testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") }"""));
+	}
+
 	@Test
 	void testKotlinDependenciesMerge() {
 		String config = """

From 4493e8ab720846d6eae2f158e3c9306ba935993a Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:34:11 +1300
Subject: [PATCH 03/13] chore: Java 25 style fixes

---
 .../devpackspring/rewrite/DependencyMergeUtil.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
index 0a44c489..b843e22d 100644
--- a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
+++ b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
@@ -43,14 +43,14 @@ public static Statement mergeDependenciesBlock(Statement targetStmt, Statement c
 			return null; // nothing to merge, skip it
 		}
 
-		HashSet<String> deps = new HashSet<String>();
-		HashMap<String, Statement> target = new HashMap<String, Statement>();
-		HashMap<String, Statement> source = new HashMap<String, Statement>();
+		HashSet<String> deps = new HashSet<>();
+		HashMap<String, Statement> target = new HashMap<>();
+		HashMap<String, Statement> source = new HashMap<>();
 		targetDeps.forEach(x -> updateDependencies(x, deps, target));
 		configDeps.forEach(x -> updateDependencies(x, deps, source));
 
-		List<Statement> mergedDeps = new ArrayList<Statement>();
-		var sortedList = new ArrayList<String>(deps);
+		List<Statement> mergedDeps = new ArrayList<>();
+		var sortedList = new ArrayList<>(deps);
 		Collections.sort(sortedList);
 		for (var key : sortedList) {
 			Statement stm = source.get(key);
@@ -94,7 +94,7 @@ private static void updateDependencies(Statement stm, HashSet<String> deps, Hash
 
 	private static List<Statement> getDependenciesStatements(J.MethodInvocation m) {
 		if (m.getArguments().size() == 1) {
-			org.openrewrite.java.tree.Expression arg = m.getArguments().get(0);
+			org.openrewrite.java.tree.Expression arg = m.getArguments().getFirst();
 			if (arg instanceof J.Lambda lambda && lambda.getBody() instanceof J.Block block) {
 				return block.getStatements().stream().map(stmt -> {
 					if (stmt instanceof J.Return ret) {

From e57f07153333d5afb4fea71645bb898dfd1ae188 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:35:09 +1300
Subject: [PATCH 04/13] chore: log template parsing errors

---
 .../rewrite/visitors/KotlinAddPluginVisitor.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/canonical/devpackspring/rewrite/visitors/KotlinAddPluginVisitor.java b/src/main/java/com/canonical/devpackspring/rewrite/visitors/KotlinAddPluginVisitor.java
index a42582ad..b74ff709 100644
--- a/src/main/java/com/canonical/devpackspring/rewrite/visitors/KotlinAddPluginVisitor.java
+++ b/src/main/java/com/canonical/devpackspring/rewrite/visitors/KotlinAddPluginVisitor.java
@@ -20,6 +20,8 @@
 import java.util.List;
 
 import com.canonical.devpackspring.rewrite.StatementUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.NonNull;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.InMemoryExecutionContext;
@@ -31,9 +33,12 @@
 import org.openrewrite.kotlin.KotlinIsoVisitor;
 import org.openrewrite.kotlin.KotlinParser;
 import org.openrewrite.kotlin.tree.K;
+import org.openrewrite.tree.ParseError;
 
 public class KotlinAddPluginVisitor extends KotlinIsoVisitor<ExecutionContext> {
 
+	private static final Log LOG = LogFactory.getLog(KotlinAddPluginVisitor.class);
+
 	private final String pluginTemplateKotlin = "plugins {\n\tid(\"%s\") version \"%s\"\n}\n";
 
 	private final String builtInTemplateKotlin = "plugins {\n\tid(\"%s\")\n}\n";
@@ -56,7 +61,10 @@ public KotlinAddPluginVisitor(String pluginName, String pluginVersion) {
 					Paths.get("/tmp"), context)
 			.findFirst()
 			.orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle Kotlin"));
-
+		if (templateSource instanceof ParseError error) {
+			LOG.error("Unable to parse: " + pluginDefinition);
+			throw new RuntimeException("Parser Error:" + error.printAll());
+		}
 		List<Statement> statements = ((K.CompilationUnit) templateSource).getStatements();
 		J.Block block = (J.Block) statements.get(0);
 		K.MethodInvocation stm = (K.MethodInvocation) block.getStatements().get(0);

From 49ddf1b16d2a9e434b8603f345b6954c5dda73a3 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:35:26 +1300
Subject: [PATCH 05/13] test:  add default plugin tests

---
 .../rewrite/AddGradlePluginRecipeTests.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/com/canonical/devpackspring/rewrite/AddGradlePluginRecipeTests.java b/src/test/java/com/canonical/devpackspring/rewrite/AddGradlePluginRecipeTests.java
index cc04e7fd..37a09980 100644
--- a/src/test/java/com/canonical/devpackspring/rewrite/AddGradlePluginRecipeTests.java
+++ b/src/test/java/com/canonical/devpackspring/rewrite/AddGradlePluginRecipeTests.java
@@ -158,4 +158,23 @@ void testKotlinAppendPlugin() {
 						"""));
 	}
 
+	@Test
+	void testKotlinAppendDefaultPlugin() {
+		rewriteRun(spec -> spec.recipe(new AddGradlePluginRecipe("checkstyle", null, true)),
+				Assertions.buildGradleKts("""
+						plugins {
+						    kotlin("jvm") version "1.9.22"
+						}
+						group = "com.example"
+						version = "1.0"
+						""", """
+						plugins {
+						    kotlin("jvm") version "1.9.22"
+						    id("checkstyle")
+						}
+						group = "com.example"
+						version = "1.0"
+						"""));
+	}
+
 }

From c67e6f62c9849cd097894f465c4b12015f9cf82a Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:35:44 +1300
Subject: [PATCH 06/13] test:  bump requested toolchain version in test

---
 test-data/projects/gradle-kotlin/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-data/projects/gradle-kotlin/build.gradle.kts b/test-data/projects/gradle-kotlin/build.gradle.kts
index c25b77fa..d4c10df0 100644
--- a/test-data/projects/gradle-kotlin/build.gradle.kts
+++ b/test-data/projects/gradle-kotlin/build.gradle.kts
@@ -9,7 +9,7 @@ version = "0.0.1-SNAPSHOT"
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
+		languageVersion = JavaLanguageVersion.of(21)
 	}
 }
 

From ede3e5d8a66af98c56e9ca71e2ce08ff7a880be7 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:36:17 +1300
Subject: [PATCH 07/13] fix: unpack kotlin compiler

kotlin compiler resources can not be found in the default bootJar.
---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 17235781..38530a4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -221,3 +221,7 @@ if (useAot) {
 	}
 
 }
+
+bootJar {
+	requiresUnpack '**/kotlin-compiler-embeddable-*.jar'
+}

From 166878ee282ab0ffd1eaed5ff46655522e347f70 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:36:46 +1300
Subject: [PATCH 08/13] chore: add devpack-for-spring configuration

---
 .devpack-for-spring/.gitignore                |   1 +
 .devpack-for-spring/plugin-configuration.yaml | 617 ++++++++++++++++++
 2 files changed, 618 insertions(+)
 create mode 100644 .devpack-for-spring/.gitignore
 create mode 100644 .devpack-for-spring/plugin-configuration.yaml

diff --git a/.devpack-for-spring/.gitignore b/.devpack-for-spring/.gitignore
new file mode 100644
index 00000000..9515f838
--- /dev/null
+++ b/.devpack-for-spring/.gitignore
@@ -0,0 +1 @@
+devpack-for-spring-cli
\ No newline at end of file
diff --git a/.devpack-for-spring/plugin-configuration.yaml b/.devpack-for-spring/plugin-configuration.yaml
new file mode 100644
index 00000000..4c62feee
--- /dev/null
+++ b/.devpack-for-spring/plugin-configuration.yaml
@@ -0,0 +1,617 @@
+format:
+  gradle:
+    id: io.spring.javaformat
+    version: 0.0.47
+    default-task: format
+    description: Format the source code
+    tasks:
+      format: format
+    repository: gradlePluginPortal()
+  maven:
+    id: io.spring.javaformat:spring-javaformat-maven-plugin
+    version: 0.0.47
+    default-task: format
+    description: Format the source code
+    tasks:
+      format: :apply
+dependencies:
+  gradle:
+    id: io.github.rockcrafters.rockcraft
+    version: 1.2.4
+    repository: gradlePluginPortal()
+    default-task: dependencies-export
+    description: |
+      Save project dependencies
+    tasks:
+      dependencies-export: dependencies-export
+  maven:
+    id: io.github.rockcrafters:rockcraft-maven-plugin
+    version: 1.2.4
+    default-task: dependencies-export
+    description: |
+      Save project dependencies
+    tasks:
+      dependencies-export: :create-build-rock
+rockcraft:
+  gradle:
+    id: io.github.rockcrafters.rockcraft
+    version: 1.2.4
+    repository: gradlePluginPortal()
+    default-task: build-rock
+    description: |
+      Plugin for rock image generation
+    tasks:
+      create-rock: create-rock
+      build-rock: build-rock
+      create-build-rock: create-build-rock
+      build-build-rock: build-build-rock
+      push-rock: push-rock
+      push-build-rock: push-build-rock
+  maven:
+    id: io.github.rockcrafters:rockcraft-maven-plugin
+    version: 1.2.4
+    default-task: build-rock
+    description: |
+      Plugin for rock image generation
+    tasks:
+      create-rock:
+        - install
+        - :create-rock
+      build-rock:
+        - install
+        - :create-rock
+        - :build-rock
+      create-build-rock:
+        - :create-build-rock
+      push-rock:
+        - install
+        - :create-rock
+        - :build-rock
+        - :push-rock
+      push-build-rock:
+        - install
+        - :create-build-rock
+        - :build-build-rock
+        - :push-build-rock
+checkstyleGoogle:
+  resources:
+    - path: .config/checkstyle/checkstyle.xml
+      content: |
+        <?xml version="1.0"?>
+        <!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+        
+        <!--
+        Checkstyle configuration that checks the Google coding conventions from Google Java Style
+        that can be found at https://google.github.io/styleguide/javaguide.html
+        
+        Checkstyle is very configurable. Be sure to read the documentation at
+        http://checkstyle.org (or in your downloaded distribution).
+        
+        To completely disable a check, just comment it out or delete it from the file.
+        To suppress certain violations please review suppression filters.
+
+        Authors: Max Vetrenko, Mauryan Kansara, Ruslan Diachenko, Roman Ivanov.
+        -->
+        
+        <module name="Checker">
+      
+        <property name="charset" value="UTF-8"/>
+      
+        <property name="severity" value="${org.checkstyle.google.severity}" default="warning"/>
+      
+        <property name="fileExtensions" value="java, properties, xml"/>
+        <!-- Excludes all 'module-info.java' files              -->
+        <!-- See https://checkstyle.org/filefilters/index.html -->
+        <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+        </module>
+      
+        <module name="SuppressWarningsFilter"/>
+      
+        <!-- https://checkstyle.org/filters/suppressionfilter.html -->
+        <module name="SuppressionFilter">
+        <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
+        default="checkstyle-suppressions.xml" />
+        <property name="optional" value="true"/>
+        </module>
+      
+        <!-- https://checkstyle.org/filters/suppresswithnearbytextfilter.html -->
+        <module name="SuppressWithNearbyTextFilter">
+        <property name="nearbyTextPattern"
+          value="CHECKSTYLE.SUPPRESS\: (\w+) for ([+-]\d+) lines"/>
+        <property name="checkPattern" value="$1"/>
+        <property name="lineRange" value="$2"/>
+        </module>
+      
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.org/checks/whitespace/index.html -->
+        <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+        </module>
+      
+        <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <property name="max" value="100"/>
+        <property name="ignorePattern"
+        value="^package.*|^import.*|href\s*=\s*&quot;[^&quot;]*&quot;|http://|https://|ftp://"/>
+        </module>
+        <!--  Suppression to prevent LineLength Check from flagging lines in Text-blocks -->
+        <module name="SuppressWithPlainTextCommentFilter">
+        <property name="checkFormat" value="LineLength"/>
+        <property name="offCommentFormat" value='^.*"""\s*$'/>
+        <property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
+        </module>
+        <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+        <module name="MatchXpath">
+        <property name="id" value="singleLineCommentStartWithSpace"/>
+        <property name="query"
+        value="//SINGLE_LINE_COMMENT[./COMMENT_CONTENT[not(starts-with(@text, ' '))
+        and not(starts-with(@text, '/'))
+        and not(@text = '\n') and not(ends-with(@text, '//\n'))]]"/>
+        <message key="matchxpath.match" value="''//'' must be followed by a whitespace."/>
+        </module>
+        <module name="IllegalTokenText">
+        <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL, TEXT_BLOCK_CONTENT"/>
+        <property name="format"
+        value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|20|22|27|5(C|c))|\\(0(10|11|12|14|15|40|42|47)|134)"/>
+        <property name="message"
+        value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+        <property name="allowEscapesForControlCharacters" value="true"/>
+        <property name="allowByTailComment" value="true"/>
+        <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap">
+        <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+        </module>
+        <module name="NeedBraces">
+        <property name="tokens"
+        value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+        </module>
+        <module name="LeftCurly">
+        <property name="id" value="LeftCurlyEol"/>
+        <property name="tokens"
+        value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
+        INTERFACE_DEF, LAMBDA, LITERAL_CATCH,
+        LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
+        LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
+        OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="LeftCurly">
+        <property name="id" value="LeftCurlyNl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens"
+        value="LITERAL_CASE, LITERAL_DEFAULT"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <!-- LITERAL_CASE, LITERAL_DEFAULT are reused in SWITCH_RULE  -->
+        <property name="id" value="LeftCurlyNl"/>
+        <property name="query" value="//SWITCH_RULE/SLIST"/>
+        </module>
+        <module name="RightCurly">
+        <property name="id" value="RightCurlySame"/>
+        <property name="tokens"
+        value="LITERAL_TRY, LITERAL_CATCH, LITERAL_IF, LITERAL_ELSE,
+        LITERAL_DO"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <property name="id" value="RightCurlySame"/>
+        <property name="query" value="//RCURLY[parent::SLIST[parent::LITERAL_CATCH
+        and not(parent::LITERAL_CATCH/following-sibling::*)]]"/>
+        </module>
+        <module name="RightCurly">
+        <property name="id" value="RightCurlyAlone"/>
+        <property name="option" value="alone"/>
+        <property name="tokens"
+        value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+        INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
+        COMPACT_CTOR_DEF, LITERAL_SWITCH, LITERAL_CASE, LITERAL_FINALLY,
+        LITERAL_CATCH"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <!-- suppression is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
+        <property name="id" value="RightCurlyAlone"/>
+        <property name="query" value="//RCURLY[parent::SLIST[count(./*)=1
+        and not(parent::LITERAL_CATCH)]
+        or (preceding-sibling::*[last()][self::LCURLY]
+        and not(parent::SLIST/parent::LITERAL_CATCH))
+        or (parent::SLIST/parent::LITERAL_CATCH
+        and parent::SLIST/parent::LITERAL_CATCH/following-sibling::*)]"/>
+        </module>
+        <module name="WhitespaceAfter">
+        <property name="tokens"
+        value="COMMA, SEMI, TYPECAST, ELLIPSIS, LITERAL_YIELD, LITERAL_CASE, ANNOTATIONS"/>
+        </module>
+        <module name="WhitespaceAround">
+        <property name="allowEmptyConstructors" value="true"/>
+        <property name="allowEmptyLambdas" value="true"/>
+        <property name="allowEmptyMethods" value="true"/>
+        <property name="allowEmptyTypes" value="true"/>
+        <property name="allowEmptyLoops" value="true"/>
+        <property name="allowEmptySwitchBlockStatements" value="true"/>
+        <property name="ignoreEnhancedForColon" value="false"/>
+        <property name="tokens"
+        value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
+        BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
+        LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
+        LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
+        LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
+        NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
+        SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT,
+        TYPE_EXTENSION_AND, LITERAL_WHEN"/>
+        <message key="ws.notFollowed"
+          value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
+                                 may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+        <message key="ws.notPreceded"
+          value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <property name="checks" value="WhitespaceAround"/>
+        <property name="query" value="//*[self::LITERAL_IF or self::LITERAL_ELSE or
+        self::STATIC_INIT]/SLIST[count(./*)=1]
+        | //*[self::STATIC_INIT or self::LITERAL_TRY or self::LITERAL_IF]
+        //*[self::RCURLY][parent::SLIST[count(./*)=1]]
+        | //SLIST[count(./*)=1][parent::LITERAL_TRY and
+        not(following-sibling::*)]
+        | //SLIST[count(./*)=1][parent::LITERAL_CATCH and
+        not(parent::LITERAL_CATCH/following-sibling::*)]"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+        <property name="format" value="\{[ ]+\}"/>
+        <property name="message" value="Empty blocks should have no spaces. Empty blocks
+        may only be represented as '{}' when not part of a
+        multi-block statement (4.1.3)"/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="JavadocLeadingAsteriskAlign"/>
+        <module name="JavadocMissingLeadingAsterisk"/>
+        <module name="JavadocContentLocation"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="TextBlockGoogleStyleFormatting"/>
+        <module name="EmptyLineSeparator">
+        <property name="tokens"
+        value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+        STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
+        COMPACT_CTOR_DEF"/>
+        <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        <property name="allowMultipleEmptyLines" value="false"/>
+        </module>
+        <module name="SeparatorWrap">
+        <property name="id" value="SeparatorWrapDot"/>
+        <property name="tokens" value="DOT"/>
+        <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+        <property name="id" value="SeparatorWrapComma"/>
+        <property name="tokens" value="COMMA"/>
+        <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+        <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
+        <property name="id" value="SeparatorWrapEllipsis"/>
+        <property name="tokens" value="ELLIPSIS"/>
+        <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+        <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
+        <property name="id" value="SeparatorWrapArrayDeclarator"/>
+        <property name="tokens" value="ARRAY_DECLARATOR"/>
+        <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+        <property name="id" value="SeparatorWrapMethodRef"/>
+        <property name="tokens" value="METHOD_REF"/>
+        <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+        <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+        <message key="name.invalidPattern"
+        value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+        <property name="format" value="^[A-Z][a-zA-Z0-9]*(?:[0-9](?:_[0-9]+)*)?$"/>
+        <property name="tokens" value="CLASS_DEF"/>
+        <message key="name.invalidPattern"
+        value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+        <property name="tokens" value="INTERFACE_DEF, ENUM_DEF,
+        ANNOTATION_DEF, RECORD_DEF"/>
+        <message key="name.invalidPattern"
+        value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+        <property name="format"
+        value="^(?![a-z]$)(?![a-z][A-Z])[a-z][a-zA-Z0-9]*(?:_[0-9]+)*$"/>
+        <message key="name.invalidPattern"
+        value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+        <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+        <message key="name.invalidPattern"
+        value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LambdaParameterName">
+        <property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
+        <message key="name.invalidPattern"
+        value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+        <property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
+        <message key="name.invalidPattern"
+        value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+        <property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
+        <message key="name.invalidPattern"
+        value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="PatternVariableName">
+        <property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
+        <message key="name.invalidPattern"
+        value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+        <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+        <message key="name.invalidPattern"
+        value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="RecordComponentName">
+        <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+        <message key="name.invalidPattern"
+        value="Record component name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="RecordTypeParameterName">
+        <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+        <message key="name.invalidPattern"
+        value="Record type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+        <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+        <message key="name.invalidPattern"
+        value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+        <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+        <message key="name.invalidPattern"
+        value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+        <message key="ws.followed"
+        value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+        <message key="ws.preceded"
+        value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+        <message key="ws.illegalFollow"
+        value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+        <message key="ws.notPreceded"
+        value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+        <property name="basicOffset" value="2"/>
+        <property name="braceAdjustment" value="2"/>
+        <property name="caseIndent" value="2"/>
+        <property name="throwsIndent" value="4"/>
+        <property name="lineWrappingIndentation" value="4"/>
+        <property name="arrayInitIndent" value="2"/>
+        </module>
+        
+        <module name="AbbreviationAsWordInName">
+        <property name="ignoreFinal" value="false"/>
+        <property name="allowedAbbreviationLength" value="0"/>
+        <property name="tokens"
+        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+        PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
+        RECORD_COMPONENT_DEF"/>
+        </module>
+        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="ConstructorsDeclarationGrouping"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+        <property name="sortImportsInGroupAlphabetically" value="true"/>
+        <property name="separateLineBetweenGroups" value="true"/>
+        <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+        </module>
+        <module name="MethodParamPad">
+        <property name="tokens"
+        value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, CTOR_CALL,
+        SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF, RECORD_PATTERN_DEF"/>
+        </module>
+        <module name="NoWhitespaceBefore">
+        <property name="tokens"
+        value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+        LABELED_STAT, METHOD_REF, ELLIPSIS"/>
+        <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <property name="checks" value="NoWhitespaceBefore"/>
+        <property name="query"
+        value="//ELLIPSIS[preceding-sibling::TYPE/ANNOTATIONS[ANNOTATION[LPAREN]
+        or not(following-sibling::*)]]"/>
+        </module>
+        <module name="ParenPad">
+        <property name="tokens"
+        value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
+        EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
+        LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
+        METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
+        RECORD_DEF, RECORD_PATTERN_DEF"/>
+        </module>
+        <module name="OperatorWrap">
+        <property name="option" value="NL"/>
+        <property name="tokens"
+        value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+        LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
+        TYPE_EXTENSION_AND "/>
+        </module>
+        <module name="AnnotationLocation">
+        <property name="id" value="AnnotationLocationMostCases"/>
+        <property name="tokens"
+        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
+        RECORD_DEF, COMPACT_CTOR_DEF, PACKAGE_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+        <property name="id" value="AnnotationLocationVariables"/>
+        <property name="tokens" value="VARIABLE_DEF"/>
+        <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="MissingOverrideOnRecordAccessor"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+        <property name="forbiddenSummaryFragments"
+        value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )|^[a-z]"/>
+        </module>
+        <module name="JavadocParagraph">
+        <property name="allowNewlineParagraph" value="false"/>
+        </module>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="AtclauseOrder">
+        <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+        <property name="target"
+        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+        <property name="accessModifiers" value="public"/>
+        <property name="allowMissingParamTags" value="true"/>
+        <property name="allowMissingReturnTag" value="true"/>
+        <property name="allowedAnnotations" value="Override, Test"/>
+        <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="MissingJavadocMethod">
+        <property name="scope" value="protected"/>
+        <property name="allowMissingPropertyJavadoc" value="true"/>
+        <property name="allowedAnnotations" value="Override, Test"/>
+        <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
+        COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <property name="checks" value="MissingJavadocMethod"/>
+        <property name="query" value="//*[self::METHOD_DEF or self::CTOR_DEF
+        or self::ANNOTATION_FIELD_DEF or self::COMPACT_CTOR_DEF]
+        [ancestor::*[self::INTERFACE_DEF or self::CLASS_DEF
+        or self::RECORD_DEF or self::ENUM_DEF]
+        [not(./MODIFIERS/LITERAL_PUBLIC)]]"/>
+        </module>
+        <module name="MissingJavadocType">
+        <property name="scope" value="protected"/>
+        <property name="tokens"
+        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+        RECORD_DEF, ANNOTATION_DEF"/>
+        <property name="excludeScope" value="nothing"/>
+        </module>
+        <module name="MethodName">
+        <property name="format"
+        value="^(?![a-z]$)(?![a-z][A-Z])[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*(?:_[0-9]+)*$"/>
+        <message key="name.invalidPattern"
+        value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+        <property name="checks" value="MethodName"/>
+        <property name="query" value="//METHOD_DEF[
+        ./MODIFIERS/ANNOTATION//IDENT[contains(@text, 'Test')]
+        ]/IDENT"/>
+        <property name="message" value="'[a-z][a-z0-9][a-zA-Z0-9]*(?:_[a-z][a-z0-9][a-zA-Z0-9]*)*'"/>
+        </module>
+        <module name="SingleLineJavadoc"/>
+        <module name="TodoComment">
+        <property name="format" value="^[ \t]*(?!TODO:)(?i:TODO)\b:?"/>
+        <message key="todo.match"
+        value="''TODO:'' must be written in all caps and followed by a colon."/>
+        </module>
+        <module name="EmptyCatchBlock">
+        <property name="commentFormat" value="\w+"/>
+        </module>
+        <module name="CommentsIndentation">
+        <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+        </module>
+        <!-- https://checkstyle.org/filters/suppressionxpathfilter.html -->
+        <module name="SuppressionXpathFilter">
+        <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
+        default="checkstyle-xpath-suppressions.xml" />
+        <property name="optional" value="true"/>
+        </module>
+        <module name="SuppressWarningsHolder" />
+        <module name="SuppressionCommentFilter"><property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)" /><property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)" />
+        <property name="checkFormat" value="$1" />
+        </module>
+        <module name="SuppressWithNearbyCommentFilter">
+          <property name="commentFormat" value="CHECKSTYLE.SUPPRESS\: ([\w\|]+)"/>
+        <!-- $1 refers to the first match group in the regex defined in commentFormat -->
+        <property name="checkFormat" value="$1"/>
+        <!-- The check is suppressed in the next line of code after the comment -->
+        <property name="influenceFormat" value="1"/>
+        </module>
+        </module>
+        </module>
+  gradle:
+    id: checkstyle
+    default-task: checkstyle
+    configuration:
+      gradleGroovy: |
+        checkstyle {
+           toolVersion = '13.3.0'
+           configDirectory = file("${rootProject.projectDir}/.config/checkstyle")
+        }
+        dependencies {
+            checkstyle 'com.puppycrawl.tools:checkstyle:13.3.0'
+        }
+      gradleKotlin: |
+        checkstyle {
+          toolVersion = "13.3.0"
+          configDirectory = file("${rootProject.projectDir}/.config/checkstyle")
+        }
+        dependencies {
+            checkstyle("com.puppycrawl.tools:checkstyle:13.3.0")
+        }
+    tasks:
+      checkstyle:
+        - checkStyleMain
+        - checkStyleTest
+      checkstyleMain:
+        - checkstyleMain
+      checkstyleTest:
+        - checkstyleTest
+  maven:
+    id: org.apache.maven.plugins:maven-checkstyle-plugin
+    version: 3.6.0
+    default-task: check
+    tasks:
+      check: checkstyle:check
+    configuration:
+      maven:
+        configuration: |
+          <configuration>
+            <configLocation>${project.basedir}/.config/checkstyle/checkstyle.xml</configLocation>
+          </configuration>
+        dependencies: |
+          <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>13.3.0</version>
+          </dependency>
+          </dependencies>
+        executions: |
+          <executions>
+          <execution>
+            <id>checkstyle</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+          </executions>

From 024a72f8f95c9ce4909fe46051d1fe49cc7f0b40 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 17:39:40 +1300
Subject: [PATCH 09/13] chore: update copyright year

Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>
---
 .../canonical/devpackspring/rewrite/DependencyMergeUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
index b843e22d..285da94f 100644
--- a/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
+++ b/src/main/java/com/canonical/devpackspring/rewrite/DependencyMergeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 the original author or authors.
+ * Copyright 2026 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 718ed10cf4e09369dd5afd1b50120dbb1b87253a Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 18:05:21 +1300
Subject: [PATCH 10/13] fix: reorder configuration file priority.

---
 .../canonical/devpackspring/ConfigUtil.java   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/canonical/devpackspring/ConfigUtil.java b/src/main/java/com/canonical/devpackspring/ConfigUtil.java
index edf983d8..7177637e 100644
--- a/src/main/java/com/canonical/devpackspring/ConfigUtil.java
+++ b/src/main/java/com/canonical/devpackspring/ConfigUtil.java
@@ -33,13 +33,33 @@ public abstract class ConfigUtil {
 	private static final Log LOG = LogFactory.getLog(ConfigUtil.class);
 
 	/**
-	 * Opens configuration file stream
+	 * Opens configuration file stream from:
+	 *  1. System Property
+	 *  2. Environment Variable
+	 *  3. Current directory .devpack-for-spring/conffile
+	 *  4. User home .config/devpack-for-spring/conffile
+	 *  5. Embedded resource /com/canonical/devpackspring/conffile
 	 * @param environment - environment variable specifying path to the file
 	 * @param fileName - configuration file name
 	 * @return configuration file InputStream
 	 * @throws FileNotFoundException - configuration file not found
 	 */
 	public static InputStream openConfigurationFile(String environment, String fileName) throws FileNotFoundException {
+
+		String pluginConfigurationFile = System.getProperty(environment);
+		if (pluginConfigurationFile == null) {
+			pluginConfigurationFile = System.getenv(environment);
+		}
+		if (pluginConfigurationFile != null) {
+			if (Files.exists(Path.of(pluginConfigurationFile))) {
+				LOG.info("Reading configuration from " + pluginConfigurationFile);
+				return new FileInputStream(pluginConfigurationFile);
+			}
+			else {
+				LOG.warn("Configuration file " + environment + "=" + pluginConfigurationFile + " does not exist.");
+			}
+		}
+
 		Path currentConfigPath = Path.of(System.getProperty("user.dir"))
 			.resolve(".devpack-for-spring")
 			.resolve(fileName);
@@ -57,19 +77,6 @@ public static InputStream openConfigurationFile(String environment, String fileN
 			return new FileInputStream(configPath.toFile());
 		}
 
-		String pluginConfigurationFile = System.getenv(environment);
-		if (pluginConfigurationFile == null) {
-			pluginConfigurationFile = System.getProperty(environment);
-		}
-		if (pluginConfigurationFile != null) {
-			if (Files.exists(Path.of(pluginConfigurationFile))) {
-				LOG.info("Reading configuration from " + pluginConfigurationFile);
-				return new FileInputStream(pluginConfigurationFile);
-			}
-			else {
-				LOG.warn("Configuration file " + environment + "=" + pluginConfigurationFile + " does not exist.");
-			}
-		}
 		LOG.info("Reading default configuration " + fileName);
 		return ConfigUtil.class.getResourceAsStream(String.format("/com/canonical/devpackspring/%s", fileName));
 	}

From df9b8d64661327aa7d2e86abecce158c73274c6a Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 18:11:43 +1300
Subject: [PATCH 11/13] chore: apply auto format

---
 .../java/com/canonical/devpackspring/ConfigUtil.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/canonical/devpackspring/ConfigUtil.java b/src/main/java/com/canonical/devpackspring/ConfigUtil.java
index 7177637e..034fdbcf 100644
--- a/src/main/java/com/canonical/devpackspring/ConfigUtil.java
+++ b/src/main/java/com/canonical/devpackspring/ConfigUtil.java
@@ -33,12 +33,10 @@ public abstract class ConfigUtil {
 	private static final Log LOG = LogFactory.getLog(ConfigUtil.class);
 
 	/**
-	 * Opens configuration file stream from:
-	 *  1. System Property
-	 *  2. Environment Variable
-	 *  3. Current directory .devpack-for-spring/conffile
-	 *  4. User home .config/devpack-for-spring/conffile
-	 *  5. Embedded resource /com/canonical/devpackspring/conffile
+	 * Opens configuration file stream from: 1. System Property 2. Environment Variable 3.
+	 * Current directory .devpack-for-spring/conffile 4. User home
+	 * .config/devpack-for-spring/conffile 5. Embedded resource
+	 * /com/canonical/devpackspring/conffile
 	 * @param environment - environment variable specifying path to the file
 	 * @param fileName - configuration file name
 	 * @return configuration file InputStream

From 688b27d1c8e05b3e866f7e37fe27ea4ddc3d7db5 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 19:11:27 +1300
Subject: [PATCH 12/13] chore: drop logging property, does not work for child
 process

---
 .github/workflows/pr-self-hosted.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/pr-self-hosted.yml b/.github/workflows/pr-self-hosted.yml
index 4341437e..9b45a302 100644
--- a/.github/workflows/pr-self-hosted.yml
+++ b/.github/workflows/pr-self-hosted.yml
@@ -28,7 +28,6 @@ jobs:
           rm -rf /home/runner/.local/state/rockcraft/log/*
           sudo snap install rockcraft --classic
       - run: |
-          export LOGGING_LEVEL_COM_CANONICAL_DEVPACKSPRING_PROCESSUTIL=DEBUG
           ./gradlew build -PexcludeTags=boot,maven-modification,maven-dependency --no-daemon --stacktrace
       - name: Store reports
         if: failure()

From 29baf6ca9a88179a805ba636100b2c576658cddb Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Sat, 28 Mar 2026 19:11:53 +1300
Subject: [PATCH 13/13] chore: use java 25 in Gradle/Kotlin test.

---
 test-data/projects/gradle-kotlin/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-data/projects/gradle-kotlin/build.gradle.kts b/test-data/projects/gradle-kotlin/build.gradle.kts
index d4c10df0..e28cbedd 100644
--- a/test-data/projects/gradle-kotlin/build.gradle.kts
+++ b/test-data/projects/gradle-kotlin/build.gradle.kts
@@ -9,7 +9,7 @@ version = "0.0.1-SNAPSHOT"
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(21)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }