Update petclinic to 2.0.0 snapshots

karibe · Jan 10, 2018 · c0884f4 · c0884f4
1 parent de476f8
commit c0884f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/alt/pom.xml b/alt/pom.xml
@@ -35,14 +35,14 @@
 								<artifactItem>
 									<groupId>org.springframework.boot</groupId>
 									<artifactId>spring-boot-devtools</artifactId>
-									<version>1.4.6.RELEASE</version>
+									<version>1.5.9.RELEASE</version>
 									<outputDirectory>${project.basedir}/target</outputDirectory>
 									<destFileName>spring-boot-devtools.jar</destFileName>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.springframework.boot</groupId>
 									<artifactId>spring-boot-devtools</artifactId>
-									<version>1.5.6.RELEASE</version>
+									<version>2.0.0.BUILD-SNAPSHOT</version>
 									<outputDirectory>${project.basedir}/target</outputDirectory>
 									<destFileName>spring-boot-devtools-latest.jar</destFileName>
 								</artifactItem>

diff --git a/benchmarks/src/main/java/com/example/PetclinicLatestBenchmark.java b/benchmarks/src/main/java/com/example/PetclinicLatestBenchmark.java
@@ -127,7 +127,7 @@ public ExplodedDevtoolsState() {
 										.startsWith("spring-boot-devtools-latest"))
 						.count() == 0) {
 					copy("target/demo/BOOT-INF/lib",
-							"../alt/target/spring-boot-devtools.jar");
+							"../alt/target/spring-boot-devtools-latest.jar");
 				}
 			}
 			catch (IOException e) {

diff --git a/petclinic-latest/pom.xml b/petclinic-latest/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<name>petclinic latest</name>
@@ -30,12 +30,10 @@
 		<webjars-jquery.version>2.2.4</webjars-jquery.version>
 		<wro4j.version>1.8.0</wro4j.version>
 
-		<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
-
 		<start-class>org.springframework.samples.petclinic.PetClinicApplication</start-class>
 
 		<thin-layout.version>1.0.9.RELEASE</thin-layout.version>
-		<spring-boot-plugin.version>1.5.9.RELEASE</spring-boot-plugin.version>
+		<spring-boot-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-boot-plugin.version>
 
 	</properties>
 
@@ -66,12 +64,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>nz.net.ultraq.thymeleaf</groupId>
-					<artifactId>thymeleaf-layout-dialect</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/petclinic-latest/src/main/resources/application.properties b/petclinic-latest/src/main/resources/application.properties
@@ -13,7 +13,9 @@ spring.jpa.hibernate.ddl-auto=none
 spring.messages.basename=messages/messages
 
 # Actuator / Management
-management.contextPath=/manage
+management.endpoints.web.base-path=/manage
+# Spring Boot 1.5 makes actuator secure by default
+management.endpoints.web.enabled=true
 
 # Logging
 # logging.level.org.springframework.context.annotation=TRACE

diff --git a/petclinic/pom.xml b/petclinic/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.6.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<name>petclinic</name>
@@ -31,12 +31,11 @@
 
 		<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
 
-		<spring-data-releasetrain.version>Ingalls-RELEASE</spring-data-releasetrain.version>
 		<start-class>org.springframework.samples.petclinic.PetClinicApplication</start-class>
 
-		<thin-layout.version>1.0.6.RELEASE</thin-layout.version>
-		<spring-boot-plugin.version>1.5.4.RELEASE</spring-boot-plugin.version>
-		<spring-boot.version>1.4.6.RELEASE</spring-boot.version>
+		<thin-layout.version>1.0.9.RELEASE</thin-layout.version>
+		<spring-boot-plugin.version>1.5.9.RELEASE</spring-boot-plugin.version>
+		<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
 
 	</properties>
 

diff --git a/static/src/main/resources/META-INF/thin-snapshot.properties b/static/src/main/resources/META-INF/thin-snapshot.properties
@@ -1 +1,2 @@
 spring-boot.version=2.0.0.BUILD-SNAPSHOT
+spring-cloud.version=Finchley.BUILD-SNAPSHOT
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		spring-boot.version=2.0.0.BUILD-SNAPSHOT
		spring-cloud.version=Finchley.BUILD-SNAPSHOT