Merge branch 'release/1.0.1'

Author: zambrovski

.github/workflows/development.yml

@@ -1,5 +1,8 @@
 name: Development branches
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -21,10 +24,10 @@ jobs:
         run: echo ${{ github.ref }}
 
       # Setup JDK and Maven
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version-file: .java-version
           distribution: zulu
           cache: maven
 

.github/workflows/master.yml

@@ -1,5 +1,8 @@
 name: Produces and releases artifacts
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -17,10 +20,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version-file: .java-version
           cache: maven
           distribution: zulu
-          server-id: ossrh
+          server-id: central
           server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
           server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
 
@@ -41,10 +44,11 @@ jobs:
 
       # Publish release
       - name: Deploy a new release version to Maven Central
-        run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}" -ntp
+        run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}"
         env:
           OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
 
 #      - name: Upload coverage information
 #        uses: codecov/codecov-action@v2

.github/workflows/release-notes.yml

@@ -1,8 +1,12 @@
-# Trigger the workflow on milestone events
+name: Milestone Closure
+
+permissions:
+  contents: write
+
 on:
   milestone:
     types: [closed]
-name: Milestone Closure
+
 jobs:
   create-release-notes:
     runs-on: ubuntu-latest

README.md

@@ -7,6 +7,20 @@ A collection of Spring-Boot supporting tools.
 [![sponsored](https://img.shields.io/badge/sponsoredBy-Holisticon-RED.svg)](https://holisticon.de/)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.spring/spring-conditions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.spring/spring-conditions)
 
+## Import
+
+Import the BOM into your Maven project.
+
+```xml 
+<dependency>
+  <groupId>io.toolisticon.spring</groupId>
+  <artifactId>spring-boot-bom</artifactId>
+  <version>1.0.1</version>
+  <scope>import</scope>
+  <type>pom</type>
+</dependency>
+```
+
 ## Spring-Boot Conditions
 
 Provides useful Spring-Boot conditions.
@@ -21,8 +35,59 @@ Provides useful Spring-Boot conditions.
 
 <dependency>
   <groupId>io.toolisticon.spring</groupId>
-  <artifactId>spring-conditions</artifactId>
-  <version>1.0.0</version>
+  <artifactId>spring-boot-conditions</artifactId>
 </dependency>
+```
 
+## YAML property source factory
+
+Allows to define default properties as part of the starter using supplied YAML file.
+
+### Usage
+
+```xml
+<dependency>
+  <groupId>io.toolisticon.spring</groupId>
+  <artifactId>spring-boot-properties</artifactId>
+</dependency>
 ```
+
+Define properties
+
+```kotlin
+@ConfigurationProperties("myprops")
+data class MyProperties(
+  val foo: String,
+  val zee: Int,
+  val baz: Boolean
+)
+
+```
+
+Define configuration:
+
+```kotlin
+
+@EnableConfigurationProperties(MyProperties::class)
+@PropertySource(
+  name = "myDefaultProperties",
+  value = ["classpath:/application-my-default.yaml"],
+  factory = YamlPropertySourceFactory::class
+)
+class MyConfiguration 
+
+```
+
+Put a `application-my-default.yaml` into `src/main/resources`:
+
+```yaml
+myprops:
+  foo: "bar"
+  zee: 42
+  baz: true
+```
+
+
+# License
+
+This library is published under the Apache 2.0 license.

bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.spring</groupId>
     <artifactId>spring-boot-support</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
   <artifactId>spring-boot-support-bom</artifactId>
@@ -19,6 +19,11 @@
         <artifactId>spring-boot-conditions</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>spring-boot-properties</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

pom.xml

@@ -5,20 +5,21 @@
   <parent>
     <groupId>io.toolisticon.maven.parent</groupId>
     <artifactId>maven-parent-kotlin-base</artifactId>
-    <version>2025.2.1</version>
+    <version>2025.7.2</version>
     <relativePath/>
   </parent>
 
   <groupId>io.toolisticon.spring</groupId>
   <artifactId>spring-boot-support</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <name>Spring-Boot Support Root</name>
   <description>Spring-Boot useful support tools and classses.</description>
   <url>https://github.com/toolisticon/spring-boot-support/</url>
   <packaging>pom</packaging>
 
   <modules>
     <module>spring-boot-conditions</module>
+    <module>spring-boot-properties</module>
     <module>bom</module>
   </modules>
 
@@ -27,7 +28,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.4.3</version>
+        <version>3.5.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -77,6 +78,13 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
+        <configuration>
+          <compilerPlugins>
+            <plugin>spring</plugin>
+            <plugin>no-arg</plugin>
+            <plugin>all-open</plugin>
+          </compilerPlugins>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -103,17 +111,6 @@
     <tag>HEAD</tag>
   </scm>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
   <developers>
     <developer>
       <id>jangalinski</id>

spring-boot-conditions/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.spring</groupId>
     <artifactId>spring-boot-support</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
   <artifactId>spring-boot-conditions</artifactId>
@@ -28,5 +28,16 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

spring-boot-conditions/src/test/java/.gitkeep

@@ -0,0 +1,39 @@
+package io.toolisticon.spring.condition
+
+import com.sun.tools.javac.util.AbstractDiagnosticFormatter
+import io.toolisticon.spring.condition.fixture.MyComponent
+import io.toolisticon.spring.condition.fixture.MyTestConfiguration
+import io.toolisticon.spring.condition.fixture.SimpleConfiguration
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.boot.context.annotation.UserConfigurations
+import org.springframework.boot.test.context.runner.ApplicationContextRunner
+
+class ConditionalOnMissingQualifiedBeanTest {
+
+  private val contextRunner = ApplicationContextRunner()
+
+  @Test
+  fun `should load qualified default bean`() {
+    contextRunner
+      .withConfiguration(UserConfigurations.of(MyTestConfiguration::class.java))
+      .run {
+        assertThat(it.getBean(MyComponent::class.java)).isNotNull
+        val component: MyComponent = it.getBean(MyComponent::class.java)
+        assertThat(component.qualifier).isEqualTo("qualifier1")
+      }
+  }
+
+  @Test
+  fun `should load user qualified bean`() {
+    contextRunner
+      .withConfiguration(UserConfigurations.of(SimpleConfiguration::class.java))
+      .withConfiguration(UserConfigurations.of(MyTestConfiguration::class.java))
+      .run {
+        assertThat(it.getBean(MyComponent::class.java)).isNotNull
+        val component: MyComponent = it.getBean(MyComponent::class.java)
+        assertThat(component.qualifier).isEqualTo("qualifier2")
+      }
+    }
+
+}