Skip to content

Commit 735db79

Browse files
ityouknowityouknow
committed
update version to 2.1.0
1 parent b854368 commit 735db79

File tree

37 files changed

+243
-6992
lines changed

37 files changed

+243
-6992
lines changed

‎spring-boot-actuator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.9.RELEASE</version>
17+
<version>2.1.0.RELEASE</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

‎spring-boot-actuator/src/main/resources/application.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
info.app.name=spring-boot-actuator
2+
info.app.version= 1.0.0
3+
info.app.test=test
4+
5+
management.endpoints.web.exposure.include=*
6+
management.endpoint.health.show-details=always
7+
#management.endpoints.web.base-path=/manage
8+
9+
management.endpoint.shutdown.enabled=true

‎spring-boot-actuator/src/main/resources/application.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎spring-boot-admin-simple/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.springframework.boot</groupId>
2121
<artifactId>spring-boot-starter-parent</artifactId>
22-
<version>1.5.9.RELEASE</version>
22+
<version>2.1.0.RELEASE</version>
2323
<relativePath/> <!-- lookup parent from repository -->
2424
</parent>
2525

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
<dependency>
1515
<groupId>de.codecentric</groupId>
1616
<artifactId>spring-boot-admin-starter-client</artifactId>
17-
<version>1.5.6</version>
17+
<version>2.1.0</version>
18+
</dependency>
19+
<dependency>
20+
<groupId>org.springframework.boot</groupId>
21+
<artifactId>spring-boot-starter-web</artifactId>
1822
</dependency>
1923
</dependencies>
2024

‎spring-boot-jpa-thymeleaf-curd/spring-boot-jpa-thymeleaf-curd.iml renamed to ‎spring-boot-admin-simple/spring-boot-admin-client/spring-boot-admin-client.iml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,34 @@
1010
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1111
<content url="file://$MODULE_DIR$">
1212
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
13+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
1314
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
1415
<excludeFolder url="file://$MODULE_DIR$/target" />
1516
</content>
1617
<orderEntry type="inheritedJdk" />
1718
<orderEntry type="sourceFolder" forTests="false" />
19+
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.1.0" level="project" />
20+
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.1.0" level="project" />
21+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.0.RELEASE" level="project" />
22+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.0.RELEASE" level="project" />
23+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.0.RELEASE" level="project" />
24+
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.0" level="project" />
25+
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
26+
<orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
27+
<orderEntry type="library" name="Maven: org.jolokia:jolokia-core:1.6.0" level="project" />
28+
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
29+
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
1830
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
1931
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
32+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
33+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
2034
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.0.RELEASE" level="project" />
2135
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
2236
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
2337
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.1" level="project" />
2438
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.1" level="project" />
2539
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
2640
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
27-
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
28-
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
2941
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
3042
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.0.RELEASE" level="project" />
3143
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
@@ -48,38 +60,27 @@
4860
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
4961
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
5062
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
51-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.0.RELEASE" level="project" />
52-
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" level="project" />
53-
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
54-
<orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
55-
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
63+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE" level="project" />
64+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.0.RELEASE" level="project" />
65+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.0.RELEASE" level="project" />
66+
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
67+
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
68+
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
69+
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
5670
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
57-
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.1.RELEASE" level="project" />
58-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.0.RELEASE" level="project" />
59-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.0.RELEASE" level="project" />
60-
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
61-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.0.RELEASE" level="project" />
62-
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
63-
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.2.RELEASE" level="project" />
64-
<orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
65-
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
66-
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
67-
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
68-
<orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
69-
<orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
70-
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
71-
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
72-
<orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
73-
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
74-
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
75-
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.2.RELEASE" level="project" />
76-
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
77-
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.2.RELEASE" level="project" />
78-
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
79-
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.2.RELEASE" level="project" />
80-
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
81-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.0.RELEASE" level="project" />
82-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
83-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
71+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
72+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
73+
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.0" level="project" />
74+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.3" level="project" />
75+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.3" level="project" />
76+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
77+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
78+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
79+
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
80+
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
81+
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
82+
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
83+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.2.RELEASE" level="project" />
84+
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
8485
</component>
8586
</module>

‎spring-boot-admin-simple/spring-boot-admin-client/src/main/resources/application.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
server.port=8001
22

3-
spring.boot.admin.url=http://localhost:8000
4-
management.security.enabled=false
3+
spring.application.name=Admin Client
4+
spring.boot.admin.client.url=http://localhost:8000
5+
management.endpoints.web.exposure.include=*

‎spring-boot-admin-simple/spring-boot-admin-client/target/classes/application.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
server.port=8001
2+
3+
spring.application.name=Admin Client
4+
spring.boot.admin.client.url=http://localhost:8000
5+
management.endpoints.web.exposure.include=*

‎spring-boot-admin-simple/spring-boot-admin-client/target/classes/com/neo/AdminClientApplication.class

706 Bytes
Binary file not shown.

‎spring-boot-admin-simple/spring-boot-admin-client/target/test-classes/com/neo/AdminClientApplicationTests.class

625 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)