Skip to content

S
spring-boot-admin
Commit d1fc2fca by Johannes Edmeier
Options

Make starter names compliant with spring initializer

In order to make the starters compliant to the spring boot naming rules I added a codecentric-* prefix to the server and the client starters. All samples are now using our starters and the docs were alignes with these changes. In order to not suprise existing users I've added a relocation to our old module
parent e89c991d
Showing with 91 additions and 57 deletions
codecentric-spring-boot-admin-starter-client/pom.xml 0 → 100644
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-client</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
codecentric-spring-boot-admin-starter-client/src/main/resources/META-INF/spring.provides 0 → 100644
provides: spring-boot-admin-client
\ No newline at end of file
spring-boot-admin-starter-server/pom.xml → codecentric-spring-boot-admin-starter-server/pom.xml
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-boot-admin-starter-server</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-build</artifactId>
......
pom.xml
......@@ -54,8 +54,9 @@
<module>spring-boot-admin-dependencies</module>
<module>spring-boot-admin-docs</module>
<module>spring-boot-admin-build</module>
<module>spring-boot-admin-starter-server</module>
<module>spring-boot-admin-starter-client</module>
<module>codecentric-spring-boot-admin-starter-server</module>
<module>codecentric-spring-boot-admin-starter-client</module>
<module>spring-boot-admin-samples</module>
</modules>
<organization>
......
spring-boot-admin-dependencies/pom.xml
......@@ -54,7 +54,12 @@
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
......
spring-boot-admin-docs/src/main/asciidoc/getting-started.adoc
......@@ -4,23 +4,20 @@
[[set-up-admin-server]]
=== Setting up Spring Boot Admin Server ===
First you need to setup your server. To do this just setup a simple boot project (using http://start.spring.io for example).
First you need to setup your server. To do this just setup a simple boot project (using http://start.spring.io).
. Add Spring Boot Admin Server and the UI to your dependencies:
. Add Spring Boot Admin Server starter to your dependencies:
+
[source,xml,subs="verbatim,attributes"]
.pom.xml
----
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
<version>{project-version}</version>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<version>{project-version}</version>
</dependency>
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
<version>{project-version}</version>
</dependency>
</dependencies>
----
. Pull in the Spring Boot Admin Server configuration via adding `@EnableAdminServer` to your configuration:
......@@ -47,7 +44,7 @@ See also the https://github.com/codecentric/spring-boot-admin/tree/master/spring
To register your application at the SBA Server you can either include the SBA Client or use http://projects.spring.io/spring-cloud/spring-cloud.html[Spring Cloud Discovery] (e.g. Eureka, Consul, ...). There is also a <<spring-cloud-discovery-static-config,simple option using a static configuration on the SBA Server side>>.
[[register-clients-via-spring-boot-admin]]
==== spring-boot-admin-starter-client ====
==== Spring Boot Admin Client ====
Each application that wants to register has to include the Spring Boot Admin Client.
......@@ -58,7 +55,7 @@ Each application that wants to register has to include the Spring Boot Admin Cli
----
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
<version>{project-version}</version>
</dependency>
----
......
spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml
......@@ -11,11 +11,7 @@
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
......
spring-boot-admin-samples/spring-boot-admin-sample-eureka/pom.xml
......@@ -11,11 +11,7 @@
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<!-- tag::dependency-eureka[] -->
<dependency>
......
spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml
......@@ -11,15 +11,11 @@
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
</dependency>
<!-- tag::dependency-hazelcast[] -->
<dependency>
......
spring-boot-admin-samples/spring-boot-admin-sample-war/pom.xml
......@@ -18,15 +18,11 @@
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
</dependency>
</dependencies>
<build>
......
spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml
......@@ -11,11 +11,7 @@
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
......
spring-boot-admin-samples/spring-boot-admin-sample/pom.xml
......@@ -11,25 +11,21 @@
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId>
<artifactId>spring-boot-admin-server-ui-login</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui-login</artifactId>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
......
spring-boot-admin-samples/spring-boot-admin-sample/src/test/resources/application.yml 0 → 100644
spring:
boot:
admin:
client:
enabled: false
\ No newline at end of file
spring-boot-admin-starter-client/pom.xml
......@@ -9,10 +9,37 @@
<version>${revision}</version>
<relativePath>../spring-boot-admin-build</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-client</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<!-- Tidy up all POMs before they are published -->
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<parent>expand</parent>
<distributionManagement>keep</distributionManagement>
<repositories>remove</repositories>
</pomElements>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<relocation>
<artifactId>codecentric-spring-boot-admin-starter-client</artifactId>
</relocation>
</distributionManagement>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment