Skip to content

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

Update to sprinig-boot 1.2.7 and prepare release

parent d1b2a76e
Showing with 25 additions and 23 deletions
pom.xml
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.5.RELEASE</version> <version>1.2.7.RELEASE</version>
<relativePath /> <!-- lookup parent from repository --> <relativePath /> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId> <artifactId>spring-boot-admin</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Boot Admin</name> <name>Spring Boot Admin</name>
<description>Spring Boot Admin</description> <description>Spring Boot Admin</description>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<main.basedir>${basedir}</main.basedir> <main.basedir>${basedir}</main.basedir>
<passphrase>${gpg.passphrase}</passphrase> <passphrase>${gpg.passphrase}</passphrase>
<spring-boot.version>1.2.5.RELEASE</spring-boot.version> <spring-boot.version>1.2.7.RELEASE</spring-boot.version>
<hazelcast.version>3.3.3</hazelcast.version> <hazelcast.version>3.3.3</hazelcast.version>
<commons-lang3.version>3.3.2</commons-lang3.version> <commons-lang3.version>3.3.2</commons-lang3.version>
<spring-cloud.version>Angel.SR3</spring-cloud.version> <spring-cloud.version>Angel.SR3</spring-cloud.version>
......
spring-boot-admin-samples/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId> <artifactId>spring-boot-admin</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
......
spring-boot-admin-samples/spring-boot-admin-sample-discovery/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId> <artifactId>spring-boot-admin-samples</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-sample-discovery</artifactId> <artifactId>spring-boot-admin-sample-discovery</artifactId>
......
spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId> <artifactId>spring-boot-admin-samples</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-sample-hazelcast</artifactId> <artifactId>spring-boot-admin-sample-hazelcast</artifactId>
......
spring-boot-admin-samples/spring-boot-admin-sample-war/pom.xml
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <?xml version="1.0"?>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-sample-war</artifactId> <artifactId>spring-boot-admin-sample-war</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId> <artifactId>spring-boot-admin-samples</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<dependencies> <dependencies>
...@@ -25,12 +25,6 @@ ...@@ -25,12 +25,6 @@
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-server-ui</artifactId> <artifactId>spring-boot-admin-server-ui</artifactId>
</dependency> </dependency>
<!-- FIX for missing dependency -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
......
spring-boot-admin-samples/spring-boot-admin-sample/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId> <artifactId>spring-boot-admin-samples</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-sample</artifactId> <artifactId>spring-boot-admin-sample</artifactId>
......
spring-boot-admin-server-ui/package.json
{ {
"name": "spring-boot-admin-server-ui", "name": "spring-boot-admin-server-ui",
"version": "1.3.0", "version": "1.2.4",
"scripts": { "scripts": {
"postinstall": "./node_modules/protractor/bin/webdriver-manager update", "postinstall": "./node_modules/protractor/bin/webdriver-manager update",
"pretest": "./node_modules/protractor/bin/webdriver-manager start &", "pretest": "./node_modules/protractor/bin/webdriver-manager start &",
......
spring-boot-admin-server-ui/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId> <artifactId>spring-boot-admin</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-server-ui</artifactId> <artifactId>spring-boot-admin-server-ui</artifactId>
......
spring-boot-admin-server/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId> <artifactId>spring-boot-admin</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-server</artifactId> <artifactId>spring-boot-admin-server</artifactId>
......
spring-boot-admin-starter-client/pom.xml
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <?xml version="1.0"?>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId> <artifactId>spring-boot-admin</artifactId>
<version>1.3.0-SNAPSHOT</version> <version>1.2.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-boot-admin-starter-client</artifactId> <artifactId>spring-boot-admin-starter-client</artifactId>
...@@ -35,6 +35,14 @@ ...@@ -35,6 +35,14 @@
<artifactId>jolokia-core</artifactId> <artifactId>jolokia-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<!-- Make json-simple non-optional.
It is marked optional in boot-dependencies, but required by jolokia-core.
Without this fix it would be missing when used war-packaging. -->
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
......
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