Skip to content
This repository was archived by the owner on Jun 29, 2018. It is now read-only.

Commit 4699ad5

Browse files
joshistejoshiste
committed
Update to sprinig-boot 1.2.7 and prepare release
1 parent d1b2a76 commit 4699ad5

2 files changed

Lines changed: 105 additions & 103 deletions

File tree

  • spring-boot-admin-samples/spring-boot-admin-sample-war
  • spring-boot-admin-starter-client

‎spring-boot-admin-samples/spring-boot-admin-sample-war/pom.xml‎

Lines changed: 55 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,56 @@
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-
<groupId>de.codecentric</groupId>
5-
<artifactId>spring-boot-admin-sample-war</artifactId>
6-
<version>1.3.0-SNAPSHOT</version>
7-
<packaging>war</packaging>
8-
<parent>
9-
<groupId>de.codecentric</groupId>
10-
<artifactId>spring-boot-admin-samples</artifactId>
11-
<version>1.3.0-SNAPSHOT</version>
12-
<relativePath>..</relativePath>
13-
</parent>
14-
<dependencies>
15-
<dependency>
16-
<groupId>org.springframework.boot</groupId>
17-
<artifactId>spring-boot-starter-tomcat</artifactId>
18-
<scope>provided</scope>
19-
</dependency>
20-
<dependency>
21-
<groupId>de.codecentric</groupId>
22-
<artifactId>spring-boot-admin-server</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>de.codecentric</groupId>
26-
<artifactId>spring-boot-admin-server-ui</artifactId>
27-
</dependency>
28-
<!-- FIX for missing dependency -->
29-
<dependency>
30-
<groupId>com.googlecode.json-simple</groupId>
31-
<artifactId>json-simple</artifactId>
32-
<version>1.1.1</version>
33-
</dependency>
34-
</dependencies>
35-
<build>
36-
<finalName>${project.artifactId}</finalName>
37-
<plugins>
38-
<plugin>
39-
<groupId>org.springframework.boot</groupId>
40-
<artifactId>spring-boot-maven-plugin</artifactId>
41-
<executions>
42-
<execution>
43-
<goals>
44-
<goal>repackage</goal>
45-
</goals>
46-
</execution>
47-
</executions>
48-
<configuration>
49-
<addResources>false</addResources>
50-
</configuration>
51-
</plugin>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-eclipse-plugin</artifactId>
55-
<configuration>
56-
<wtpversion>2.0</wtpversion>
57-
<jeeversion>6.0</jeeversion>
58-
</configuration>
59-
</plugin>
60-
</plugins>
61-
</build>
1+
<?xml version="1.0"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>de.codecentric</groupId>
5+
<artifactId>spring-boot-admin-sample-war</artifactId>
6+
<version>1.3.0-SNAPSHOT</version>
7+
<packaging>war</packaging>
8+
<parent>
9+
<groupId>de.codecentric</groupId>
10+
<artifactId>spring-boot-admin-samples</artifactId>
11+
<version>1.3.0-SNAPSHOT</version>
12+
<relativePath>..</relativePath>
13+
</parent>
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-starter-tomcat</artifactId>
18+
<scope>provided</scope>
19+
</dependency>
20+
<dependency>
21+
<groupId>de.codecentric</groupId>
22+
<artifactId>spring-boot-admin-server</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>de.codecentric</groupId>
26+
<artifactId>spring-boot-admin-server-ui</artifactId>
27+
</dependency>
28+
</dependencies>
29+
<build>
30+
<finalName>${project.artifactId}</finalName>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-maven-plugin</artifactId>
35+
<executions>
36+
<execution>
37+
<goals>
38+
<goal>repackage</goal>
39+
</goals>
40+
</execution>
41+
</executions>
42+
<configuration>
43+
<addResources>false</addResources>
44+
</configuration>
45+
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-eclipse-plugin</artifactId>
49+
<configuration>
50+
<wtpversion>2.0</wtpversion>
51+
<jeeversion>6.0</jeeversion>
52+
</configuration>
53+
</plugin>
54+
</plugins>
55+
</build>
6256
</project>

‎spring-boot-admin-starter-client/pom.xml‎

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,51 @@
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-
<parent>
5-
<groupId>de.codecentric</groupId>
6-
<artifactId>spring-boot-admin</artifactId>
7-
<version>1.3.0-SNAPSHOT</version>
8-
<relativePath>..</relativePath>
9-
</parent>
10-
<artifactId>spring-boot-admin-starter-client</artifactId>
11-
<dependencies>
12-
<dependency>
13-
<groupId>org.springframework.boot</groupId>
14-
<artifactId>spring-boot-starter</artifactId>
15-
</dependency>
16-
<dependency>
17-
<groupId>org.springframework.boot</groupId>
18-
<artifactId>spring-boot-starter-actuator</artifactId>
19-
</dependency>
20-
<dependency>
21-
<groupId>org.springframework.boot</groupId>
22-
<artifactId>spring-boot-starter-web</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>org.springframework</groupId>
26-
<artifactId>spring-web</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-configuration-processor</artifactId>
31-
<optional>true</optional>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.jolokia</groupId>
35-
<artifactId>jolokia-core</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-test</artifactId>
40-
<scope>test</scope>
41-
</dependency>
42-
</dependencies>
1+
<?xml version="1.0"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>de.codecentric</groupId>
6+
<artifactId>spring-boot-admin</artifactId>
7+
<version>1.3.0-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
9+
</parent>
10+
<artifactId>spring-boot-admin-starter-client</artifactId>
11+
<dependencies>
12+
<dependency>
13+
<groupId>org.springframework.boot</groupId>
14+
<artifactId>spring-boot-starter</artifactId>
15+
</dependency>
16+
<dependency>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-actuator</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter-web</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.springframework</groupId>
26+
<artifactId>spring-web</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-configuration-processor</artifactId>
31+
<optional>true</optional>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.jolokia</groupId>
35+
<artifactId>jolokia-core</artifactId>
36+
</dependency>
37+
<dependency>
38+
<!-- Make json-simple non-optional.
39+
It is marked optional in boot-dependencies, but required by jolokia-core.
40+
Without this fix it would be missing when used war-packaging. -->
41+
<groupId>com.googlecode.json-simple</groupId>
42+
<artifactId>json-simple</artifactId>
43+
<optional>false</optional>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-test</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
</dependencies>
4351
</project>

0 commit comments

Comments
 (0)