Skip to content

S
spring-boot-admin
Commit 92d46d36 by Johannes Edmeier
Options

spring-boot 1.3.0.M1 & push version to 1.3.0

Remove unecessary dependencies
parent d5c62af0
Showing with 49 additions and 48 deletions
pom.xml
......@@ -5,12 +5,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.7.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
<version>1.3.0.M1</version>
</parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Boot Admin</name>
<description>Spring Boot Admin</description>
......@@ -19,13 +18,11 @@
<java.version>1.7</java.version>
<main.basedir>${basedir}</main.basedir>
<passphrase>${gpg.passphrase}</passphrase>
<spring-boot.version>1.2.7.RELEASE</spring-boot.version>
<hazelcast.version>3.3.3</hazelcast.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
<spring-boot.version>1.3.0.M1</spring-boot.version>
<spring-cloud.version>Angel.SR3</spring-cloud.version>
<build-plugin.jacoco.version>0.7.3.201502191951</build-plugin.jacoco.version>
<build-plugin.jacoco.version>0.7.5.201505241946</build-plugin.jacoco.version>
<build-plugin.coveralls.version>3.0.1</build-plugin.coveralls.version>
<build-plugin.gpg.version>1.5</build-plugin.gpg.version>
<build-plugin.gpg.version>1.6</build-plugin.gpg.version>
</properties>
<modules>
<module>spring-boot-admin-server</module>
......@@ -205,8 +202,10 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
......@@ -215,23 +214,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-spring</artifactId>
<version>${hazelcast.version}</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
......@@ -242,5 +224,28 @@
</snapshots>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>spring-milestone</id>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://repo.spring.io/milestone</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-release</id>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://repo.spring.io/release</url>
</pluginRepository>
<pluginRepository>
<id>spring-milestone</id>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://repo.spring.io/milestone</url>
</pluginRepository>
</pluginRepositories>
</project>
spring-boot-admin-samples/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>de.codecentric</groupId>
......
spring-boot-admin-samples/spring-boot-admin-sample-discovery/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-sample-discovery</artifactId>
......
spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-sample-hazelcast</artifactId>
......
spring-boot-admin-samples/spring-boot-admin-sample-war/pom.xml
......@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-sample-war</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>war</packaging>
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
......
spring-boot-admin-samples/spring-boot-admin-sample/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-samples</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-sample</artifactId>
......
spring-boot-admin-server-ui/package.json
{
"name": "spring-boot-admin-server-ui",
"version": "1.2.4",
"version": "1.3.0",
"scripts": {
"postinstall": "./node_modules/protractor/bin/webdriver-manager update",
"pretest": "./node_modules/protractor/bin/webdriver-manager start &",
......
spring-boot-admin-server-ui/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-server-ui</artifactId>
......
spring-boot-admin-server/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-server</artifactId>
......
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/config/AdminServerWebConfiguration.java
......@@ -53,8 +53,8 @@ import de.codecentric.boot.admin.registry.store.ApplicationStore;
@Import({ RevereseZuulProxyConfiguration.class, MailNotifierConfiguration.class,
HazelcastStoreConfiguration.class, SimpleStoreConfig.class,
DiscoveryClientConfiguration.class })
public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware {
public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter implements
ApplicationContextAware {
private ApplicationContext applicationContext;
......@@ -66,8 +66,8 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Override
public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
if (!hasConverter(converters, MappingJackson2HttpMessageConverter.class)) {
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().applicationContext(this.applicationContext)
.build();
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
.applicationContext(this.applicationContext).build();
converters.add(new MappingJackson2HttpMessageConverter(objectMapper));
}
}
......@@ -131,16 +131,14 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
final StatusUpdater updater) {
return new ApplicationListener<ClientApplicationRegisteredEvent>() {
@Override
public void onApplicationEvent(
ClientApplicationRegisteredEvent event) {
public void onApplicationEvent(ClientApplicationRegisteredEvent event) {
updater.updateStatus(event.getApplication());
}
};
}
@Bean
public ScheduledTaskRegistrar updateTaskRegistrar(
final StatusUpdater updater,
public ScheduledTaskRegistrar updateTaskRegistrar(final StatusUpdater updater,
@Value("${spring.boot.admin.monitor.period:10000}") long monitorPeriod) {
ScheduledTaskRegistrar registrar = new ScheduledTaskRegistrar();
Runnable registratorTask = new Runnable() {
......@@ -156,8 +154,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Bean
@ConditionalOnMissingBean
public ApplicationEventJournal applicationEventJournal(
JournaledEventStore store) {
public ApplicationEventJournal applicationEventJournal(JournaledEventStore store) {
return new ApplicationEventJournal(store);
}
......@@ -169,8 +166,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Bean
@ConditionalOnMissingBean
public JournalController journalController(
ApplicationEventJournal eventJournal) {
public JournalController journalController(ApplicationEventJournal eventJournal) {
return new JournalController(eventJournal);
}
......
spring-boot-admin-starter-client/pom.xml
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-boot-admin-starter-client</artifactId>
......
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