Skip to content

Commit 5115437

Browse files
zambrovskizambrovski
committed
Merge branch 'release/1.0.0'
2 parents f529bdc + a1b7a50 commit 5115437

File tree

14 files changed

+83
-36
lines changed

14 files changed

+83
-36
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Please use one of the following templates:
22

3-
https://github.com/toolisticon/spring-conditions/issues/new/choose
3+
https://github.com/toolisticon/spring-boot-support/issues/new/choose

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ updates:
44
directory: "/"
55
schedule:
66
interval: daily
7-
open-pull-requests-limit: 10
7+
open-pull-requests-limit: 19
88
labels:
99
- "Type: dependencies"

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175

176176
END OF TERMS AND CONDITIONS
177177

178-
Copyright 2021 Holisticon AG
178+
Copyright 2025 Holisticon AG
179179

180180
Licensed under the Apache License, Version 2.0 (the "License");
181181
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
# spring-conditions
1+
# Spring-Boot Support
22

3-
Provides useful Spring-Boot conditions.
3+
A collection of Spring-Boot supporting tools.
44

55
[![incubating](https://img.shields.io/badge/lifecycle-INCUBATING-orange.svg)](https://github.com/holisticon#open-source-lifecycle)
66
[![Build Status](https://github.com/toolisticon/spring-conditions/workflows/Development%20branches/badge.svg)](https://github.com/toolisticon/spring-conditions/actions)
77
[![sponsored](https://img.shields.io/badge/sponsoredBy-Holisticon-RED.svg)](https://holisticon.de/)
88
[![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)
99

10-
## Supported conditions
10+
## Spring-Boot Conditions
11+
12+
Provides useful Spring-Boot conditions.
13+
14+
### Supported conditions
1115

1216
- `@ConditionalOnMissingQualifiedBean`
1317

14-
## Usage
18+
### Usage
1519

1620
```xml
1721

‎bom/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>io.toolisticon.spring</groupId>
7+
<artifactId>spring-boot-support</artifactId>
8+
<version>1.0.0</version>
9+
</parent>
10+
11+
<artifactId>spring-boot-support-bom</artifactId>
12+
<name>Spring-Boot Support BOM</name>
13+
<description>Bill of material for Spring-Boot Support.</description>
14+
15+
<dependencyManagement>
16+
<dependencies>
17+
<dependency>
18+
<groupId>${project.groupId}</groupId>
19+
<artifactId>spring-boot-conditions</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
</dependencies>
23+
</dependencyManagement>
24+
</project>

‎pom.xml‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
</parent>
1111

1212
<groupId>io.toolisticon.spring</groupId>
13-
<artifactId>spring-conditions</artifactId>
13+
<artifactId>spring-boot-support</artifactId>
1414
<version>1.0.0</version>
15-
<name>${project.artifactId}</name>
16-
<description>spring-conditions</description>
17-
<url>https://github.com/toolisticon/spring-conditions/</url>
15+
<name>Spring-Boot Support Root</name>
16+
<description>Spring-Boot useful support tools and classses.</description>
17+
<url>https://github.com/toolisticon/spring-boot-support/</url>
18+
<packaging>pom</packaging>
19+
20+
<modules>
21+
<module>spring-boot-conditions</module>
22+
<module>bom</module>
23+
</modules>
1824

1925
<dependencyManagement>
2026
<dependencies>
@@ -29,33 +35,13 @@
2935
</dependencyManagement>
3036

3137
<dependencies>
32-
<!-- SPRING -->
33-
<dependency>
34-
<groupId>org.springframework</groupId>
35-
<artifactId>spring-context</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-autoconfigure</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.slf4j</groupId>
43-
<artifactId>slf4j-api</artifactId>
44-
</dependency>
45-
4638
<!-- KOTLIN -->
4739
<dependency>
4840
<groupId>org.jetbrains.kotlin</groupId>
4941
<artifactId>kotlin-stdlib-jdk8</artifactId>
5042
</dependency>
5143

5244
<!-- TEST -->
53-
<dependency>
54-
<groupId>org.mockito.kotlin</groupId>
55-
<artifactId>mockito-kotlin</artifactId>
56-
<version>5.4.0</version>
57-
<scope>test</scope>
58-
</dependency>
5945
<dependency>
6046
<groupId>org.junit.jupiter</groupId>
6147
<artifactId>junit-jupiter</artifactId>
@@ -73,8 +59,9 @@
7359
<scope>test</scope>
7460
</dependency>
7561
<dependency>
76-
<groupId>org.jetbrains.kotlin</groupId>
77-
<artifactId>kotlin-test-junit5</artifactId>
62+
<groupId>org.mockito.kotlin</groupId>
63+
<artifactId>mockito-kotlin</artifactId>
64+
<version>5.4.0</version>
7865
<scope>test</scope>
7966
</dependency>
8067
</dependencies>
@@ -110,9 +97,9 @@
11097
</licenses>
11198

11299
<scm>
113-
<connection>scm:git:[email protected]:toolisticon/spring-conditions.git</connection>
114-
<url>scm:git:[email protected]:toolisticon/spring-conditions.git</url>
115-
<developerConnection>scm:git:[email protected]:toolisticon/spring-conditions.git</developerConnection>
100+
<connection>scm:git:[email protected]:toolisticon/spring-boot-support.git</connection>
101+
<url>scm:git:[email protected]:toolisticon/spring-boot-support.git</url>
102+
<developerConnection>scm:git:[email protected]:toolisticon/spring-boot-support.git</developerConnection>
116103
<tag>HEAD</tag>
117104
</scm>
118105

‎spring-boot-conditions/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>io.toolisticon.spring</groupId>
7+
<artifactId>spring-boot-support</artifactId>
8+
<version>1.0.0</version>
9+
</parent>
10+
11+
<artifactId>spring-boot-conditions</artifactId>
12+
<name>Spring-Boot Conditions</name>
13+
<description>Set of useful Spring Boot conditions</description>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework</groupId>
18+
<artifactId>spring-context</artifactId>
19+
<scope>provided</scope>
20+
</dependency>
21+
<dependency>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-autoconfigure</artifactId>
24+
<scope>provided</scope>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.slf4j</groupId>
28+
<artifactId>slf4j-api</artifactId>
29+
<scope>provided</scope>
30+
</dependency>
31+
</dependencies>
32+
</project>

‎src/main/kotlin/AbstractQualifiedBeanCondition.kt‎ renamed to ‎spring-boot-conditions/src/main/kotlin/AbstractQualifiedBeanCondition.kt‎

File renamed without changes.

‎src/main/kotlin/ConditionalOnMissingQualifiedBean.kt‎ renamed to ‎spring-boot-conditions/src/main/kotlin/ConditionalOnMissingQualifiedBean.kt‎

File renamed without changes.

‎src/main/kotlin/OnMissingQualifiedBeanCondition.kt‎ renamed to ‎spring-boot-conditions/src/main/kotlin/OnMissingQualifiedBeanCondition.kt‎

File renamed without changes.

0 commit comments

Comments
 (0)