Skip to content

Commit 09095ca

Browse files
freelansamfreelansam
authored
JAVA-11420: Dissolve spring-boot-1 and spring-boot-2 inside (eugenp#12122)
spring-boot-modules
1 parent 2d9fea5 commit 09095ca

56 files changed

Lines changed: 85 additions & 1203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎spring-4/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ This module contains articles about Spring 4
77
- [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
88
- [Spring JSON-P with Jackson](https://www.baeldung.com/spring-jackson-jsonp)
99
- [What’s New in Spring 4.3?](https://www.baeldung.com/whats-new-in-spring-4-3)
10+
- [Spring Boot Actuator](https://www.baeldung.com/spring-boot-actuators)

‎spring-4/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
</exclusion>
3232
</exclusions>
3333
</dependency>
34+
<dependency>
35+
<groupId>org.springframework.boot</groupId>
36+
<artifactId>spring-boot-starter-actuator</artifactId>
37+
</dependency>
3438
<dependency>
3539
<groupId>com.h2database</groupId>
3640
<artifactId>h2</artifactId>

spring-boot-modules/spring-boot-1/src/main/java/com/baeldung/actuator/CustomEndpoint.java renamed to spring-4/src/main/java/com/baeldung/actuator/CustomEndpoint.java

File renamed without changes.

spring-boot-modules/spring-boot-1/src/main/java/com/baeldung/actuator/HealthCheck.java renamed to spring-4/src/main/java/com/baeldung/actuator/HealthCheck.java

File renamed without changes.

spring-boot-modules/spring-boot-1/src/main/java/com/baeldung/actuator/LoginServiceImpl.java renamed to spring-4/src/main/java/com/baeldung/actuator/LoginServiceImpl.java

File renamed without changes.

spring-boot-modules/spring-boot-1/src/main/java/com/baeldung/actuator/SpringBoot.java renamed to spring-4/src/main/java/com/baeldung/actuator/SpringBoot.java

File renamed without changes.

‎spring-4/src/main/resources/application.properties‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,24 @@ feature.new.foo=Y
33
last.active.after=2018-03-14T00:00:00Z
44
first.active.after=2999-03-15T00:00:00Z
55
logging.level.org.flips=info
6+
7+
#actuator properties
8+
### server port
9+
server.port=8080
10+
#port used to expose actuator
11+
management.port=8081
12+
#CIDR allowed to hit actuator
13+
management.address=127.0.0.1
14+
# Actuator Configuration
15+
# customize /beans endpoint
16+
endpoints.beans.id=springbeans
17+
endpoints.beans.sensitive=false
18+
endpoints.beans.enabled=true
19+
# for the Spring Boot version 1.5.0 and above, we have to disable security to expose the health endpoint fully for unauthorized access.
20+
# see: https://docs.spring.io/spring-boot/docs/1.5.x/reference/html/production-ready-monitoring.html
21+
management.security.enabled=false
22+
endpoints.health.sensitive=false
23+
# customize /info endpoint
24+
info.app.name=Spring Sample Application
25+
info.app.description=This is my first spring boot application
26+
info.app.version=1.0.0

spring-boot-modules/spring-boot-1/src/test/java/com/baeldung/actuator/CustomEndpointIntegrationTest.java renamed to spring-4/src/test/java/com/baeldung/actuator/CustomEndpointIntegrationTest.java

File renamed without changes.

spring-boot-modules/spring-boot-1/src/test/java/com/baeldung/actuator/HealthCheckIntegrationTest.java renamed to spring-4/src/test/java/com/baeldung/actuator/HealthCheckIntegrationTest.java

File renamed without changes.

spring-boot-modules/spring-boot-1/src/test/java/com/baeldung/actuator/HealthCheckUnitTest.java renamed to spring-4/src/test/java/com/baeldung/actuator/HealthCheckUnitTest.java

File renamed without changes.

0 commit comments

Comments
 (0)