Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-boot-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-boot-admin
Commits
92d46d36
Commit
92d46d36
authored
Jun 16, 2015
by
Johannes Edmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
spring-boot 1.3.0.M1 & push version to 1.3.0
Remove unecessary dependencies
parent
d5c62af0
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
49 additions
and
48 deletions
+49
-48
pom.xml
pom.xml
+31
-26
pom.xml
spring-boot-admin-samples/pom.xml
+1
-1
pom.xml
...-admin-samples/spring-boot-admin-sample-discovery/pom.xml
+1
-1
pom.xml
...-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml
+1
-1
pom.xml
...g-boot-admin-samples/spring-boot-admin-sample-war/pom.xml
+2
-2
pom.xml
spring-boot-admin-samples/spring-boot-admin-sample/pom.xml
+1
-1
package.json
spring-boot-admin-server-ui/package.json
+1
-1
pom.xml
spring-boot-admin-server-ui/pom.xml
+1
-1
pom.xml
spring-boot-admin-server/pom.xml
+1
-1
AdminServerWebConfiguration.java
...entric/boot/admin/config/AdminServerWebConfiguration.java
+8
-12
pom.xml
spring-boot-admin-starter-client/pom.xml
+1
-1
No files found.
pom.xml
View file @
92d46d36
...
@@ -5,12 +5,11 @@
...
@@ -5,12 +5,11 @@
<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.7.RELEASE
</version>
<version>
1.3.0.M1
</version>
<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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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,13 +18,11 @@
...
@@ -19,13 +18,11 @@
<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.7.RELEASE
</spring-boot.version>
<spring-boot.version>
1.3.0.M1
</spring-boot.version>
<hazelcast.version>
3.3.3
</hazelcast.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>
<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.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>
</properties>
<modules>
<modules>
<module>
spring-boot-admin-server
</module>
<module>
spring-boot-admin-server
</module>
...
@@ -205,8 +202,10 @@
...
@@ -205,8 +202,10 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-
web
</artifactId>
<artifactId>
spring-boot-starter-
parent
</artifactId>
<version>
${spring-boot.version}
</version>
<version>
${spring-boot.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
...
@@ -215,23 +214,6 @@
...
@@ -215,23 +214,6 @@
<type>
pom
</type>
<type>
pom
</type>
<scope>
import
</scope>
<scope>
import
</scope>
</dependency>
</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>
</dependencies>
</dependencyManagement>
</dependencyManagement>
<repositories>
<repositories>
...
@@ -242,5 +224,28 @@
...
@@ -242,5 +224,28 @@
</snapshots>
</snapshots>
<url>
http://repo.spring.io/release
</url>
<url>
http://repo.spring.io/release
</url>
</repository>
</repository>
<repository>
<id>
spring-milestone
</id>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
<url>
http://repo.spring.io/milestone
</url>
</repository>
</repositories>
</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>
</project>
spring-boot-admin-samples/pom.xml
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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
View file @
92d46d36
...
@@ -3,12 +3,12 @@
...
@@ -3,12 +3,12 @@
<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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<relativePath>
..
</relativePath>
</parent>
</parent>
<dependencies>
<dependencies>
...
...
spring-boot-admin-samples/spring-boot-admin-sample/pom.xml
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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
View file @
92d46d36
{
{
"name"
:
"spring-boot-admin-server-ui"
,
"name"
:
"spring-boot-admin-server-ui"
,
"version"
:
"1.
2.4
"
,
"version"
:
"1.
3.0
"
,
"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
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-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
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<relativePath>
..
</relativePath>
</parent>
</parent>
<artifactId>
spring-boot-admin-server
</artifactId>
<artifactId>
spring-boot-admin-server
</artifactId>
...
...
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/config/AdminServerWebConfiguration.java
View file @
92d46d36
...
@@ -53,8 +53,8 @@ import de.codecentric.boot.admin.registry.store.ApplicationStore;
...
@@ -53,8 +53,8 @@ import de.codecentric.boot.admin.registry.store.ApplicationStore;
@Import
({
RevereseZuulProxyConfiguration
.
class
,
MailNotifierConfiguration
.
class
,
@Import
({
RevereseZuulProxyConfiguration
.
class
,
MailNotifierConfiguration
.
class
,
HazelcastStoreConfiguration
.
class
,
SimpleStoreConfig
.
class
,
HazelcastStoreConfiguration
.
class
,
SimpleStoreConfig
.
class
,
DiscoveryClientConfiguration
.
class
})
DiscoveryClientConfiguration
.
class
})
public
class
AdminServerWebConfiguration
extends
WebMvcConfigurerAdapter
implements
ApplicationContextAware
{
public
class
AdminServerWebConfiguration
extends
WebMvcConfigurerAdapter
implements
ApplicationContextAware
{
private
ApplicationContext
applicationContext
;
private
ApplicationContext
applicationContext
;
...
@@ -66,8 +66,8 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
...
@@ -66,8 +66,8 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Override
@Override
public
void
extendMessageConverters
(
List
<
HttpMessageConverter
<?>>
converters
)
{
public
void
extendMessageConverters
(
List
<
HttpMessageConverter
<?>>
converters
)
{
if
(!
hasConverter
(
converters
,
MappingJackson2HttpMessageConverter
.
class
))
{
if
(!
hasConverter
(
converters
,
MappingJackson2HttpMessageConverter
.
class
))
{
ObjectMapper
objectMapper
=
Jackson2ObjectMapperBuilder
.
json
()
.
applicationContext
(
this
.
applicationContext
)
ObjectMapper
objectMapper
=
Jackson2ObjectMapperBuilder
.
json
()
.
build
();
.
applicationContext
(
this
.
applicationContext
).
build
();
converters
.
add
(
new
MappingJackson2HttpMessageConverter
(
objectMapper
));
converters
.
add
(
new
MappingJackson2HttpMessageConverter
(
objectMapper
));
}
}
}
}
...
@@ -131,16 +131,14 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
...
@@ -131,16 +131,14 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
final
StatusUpdater
updater
)
{
final
StatusUpdater
updater
)
{
return
new
ApplicationListener
<
ClientApplicationRegisteredEvent
>()
{
return
new
ApplicationListener
<
ClientApplicationRegisteredEvent
>()
{
@Override
@Override
public
void
onApplicationEvent
(
public
void
onApplicationEvent
(
ClientApplicationRegisteredEvent
event
)
{
ClientApplicationRegisteredEvent
event
)
{
updater
.
updateStatus
(
event
.
getApplication
());
updater
.
updateStatus
(
event
.
getApplication
());
}
}
};
};
}
}
@Bean
@Bean
public
ScheduledTaskRegistrar
updateTaskRegistrar
(
public
ScheduledTaskRegistrar
updateTaskRegistrar
(
final
StatusUpdater
updater
,
final
StatusUpdater
updater
,
@Value
(
"${spring.boot.admin.monitor.period:10000}"
)
long
monitorPeriod
)
{
@Value
(
"${spring.boot.admin.monitor.period:10000}"
)
long
monitorPeriod
)
{
ScheduledTaskRegistrar
registrar
=
new
ScheduledTaskRegistrar
();
ScheduledTaskRegistrar
registrar
=
new
ScheduledTaskRegistrar
();
Runnable
registratorTask
=
new
Runnable
()
{
Runnable
registratorTask
=
new
Runnable
()
{
...
@@ -156,8 +154,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
...
@@ -156,8 +154,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
public
ApplicationEventJournal
applicationEventJournal
(
public
ApplicationEventJournal
applicationEventJournal
(
JournaledEventStore
store
)
{
JournaledEventStore
store
)
{
return
new
ApplicationEventJournal
(
store
);
return
new
ApplicationEventJournal
(
store
);
}
}
...
@@ -169,8 +166,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
...
@@ -169,8 +166,7 @@ public class AdminServerWebConfiguration extends WebMvcConfigurerAdapter impleme
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
public
JournalController
journalController
(
public
JournalController
journalController
(
ApplicationEventJournal
eventJournal
)
{
ApplicationEventJournal
eventJournal
)
{
return
new
JournalController
(
eventJournal
);
return
new
JournalController
(
eventJournal
);
}
}
...
...
spring-boot-admin-starter-client/pom.xml
View file @
92d46d36
...
@@ -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.
2.4
-SNAPSHOT
</version>
<version>
1.
3.0
-SNAPSHOT
</version>
<relativePath>
..
</relativePath>
<relativePath>
..
</relativePath>
</parent>
</parent>
<artifactId>
spring-boot-admin-starter-client
</artifactId>
<artifactId>
spring-boot-admin-starter-client
</artifactId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment