Update to Boot 2.0.0.M6 and fix build issues

cbcgorilla · Nov 29, 2017 · 9ce195f · 9ce195f
1 parent a3a0c95
commit 9ce195f
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,7 @@ nbbuild/
 dist/
 nbdist/
 .nb-gradle/
+
+### VSCode ###
+.vscode
+.sts4-cache/
diff --git a/alt/pom.xml b/alt/pom.xml
@@ -35,10 +35,17 @@
 								<artifactItem>
 									<groupId>org.springframework.boot</groupId>
 									<artifactId>spring-boot-devtools</artifactId>
-									<version>1.5.4.RELEASE</version>
+									<version>1.4.6.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>
+									<outputDirectory>${project.basedir}/target</outputDirectory>
+									<destFileName>spring-boot-devtools-latest.jar</destFileName>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>

diff --git a/benchmarks/src/main/java/com/example/PetclinicBenchmark.java b/benchmarks/src/main/java/com/example/PetclinicBenchmark.java
@@ -122,7 +122,7 @@ public ExplodedDevtoolsState() {
 				if (Files
 						.find(new File("target/demo/BOOT-INF/lib/").toPath(), 1,
 								(path, attrs) -> path.getFileName()
-										.startsWith("spring-boot-devtools"))
+										.startsWith("spring-boot-devtools.jar"))
 						.count() == 0) {
 					copy("target/demo/BOOT-INF/lib",
 							"../alt/target/spring-boot-devtools.jar");

diff --git a/benchmarks/src/main/java/com/example/PetclinicLatestBenchmark.java b/benchmarks/src/main/java/com/example/PetclinicLatestBenchmark.java
@@ -124,7 +124,7 @@ public ExplodedDevtoolsState() {
 				if (Files
 						.find(new File("target/demo/BOOT-INF/lib/").toPath(), 1,
 								(path, attrs) -> path.getFileName()
-										.startsWith("spring-boot-devtools"))
+										.startsWith("spring-boot-devtools-latest"))
 						.count() == 0) {
 					copy("target/demo/BOOT-INF/lib",
 							"../alt/target/spring-boot-devtools.jar");

diff --git a/benchmarks/src/main/java/com/example/SpringBootThinBenchmark.java b/benchmarks/src/main/java/com/example/SpringBootThinBenchmark.java
@@ -100,7 +100,7 @@ public void stop() throws Exception {
 
 		@Setup(Level.Trial)
 		public void compute() throws Exception {
-			Collection<String> properties = capture("--thin.compute");
+			Collection<String> properties = capture("--thin.classpath=properties");
 			FileUtils.writeLines(new File("target/thin.properties"), properties);
 		}
 
@@ -164,7 +164,7 @@ public void stop() throws Exception {
 
 		@Setup(Level.Trial)
 		public void compute() throws Exception {
-			Collection<String> properties = capture("--thin.compute");
+			Collection<String> properties = capture("--thin.classpath=properties");
 			FileUtils.writeLines(new File("target/thin.properties"), properties);
 		}
 

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -71,11 +71,18 @@
 		<profile>
 			<id>boot20x</id>
 			<properties>
-				<spring-boot.version>2.0.0.M1</spring-boot.version>
+				<spring-boot.version>2.0.0.M6</spring-boot.version>
 				<jar.classifier>20x</jar.classifier>
 			</properties>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>animal-sniffer-maven-plugin</artifactId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>

diff --git a/static/pom.xml b/static/pom.xml
@@ -16,10 +16,11 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<jmh.version>1.16</jmh.version>
-		<spring-boot.version>2.0.0.M3</spring-boot.version>
-		<spring-cloud.version>Finchley.M1</spring-cloud.version>
+		<aspectj.version>1.8.11</aspectj.version>
+		<spring-boot.version>2.0.0.M6</spring-boot.version>
+		<spring-cloud.version>Finchley.M4</spring-cloud.version>
 		<locator.version>1.0.0.RELEASE</locator.version>
-		<thin.version>1.0.6.RELEASE</thin.version>
+		<thin.version>1.0.7.RELEASE</thin.version>
 		<uberjar.name>benchmarks</uberjar.name>
 		<start-class>org.openjdk.jmh.Main</start-class>
 	</properties>
@@ -36,6 +37,16 @@
 				<artifactId>maven-settings-builder</artifactId>
 				<version>3.3.9</version>
 			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjrt</artifactId>
+				<version>${aspectj.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjweaver</artifactId>
+				<version>${aspectj.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
@@ -71,12 +82,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-zuul</artifactId>
+			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/static/src/main/resources/application.properties b/static/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 # logging.level.org.springframework=DEBUG
 # logging.level.com.example=DEBUG
-#management.security.enabled=false
+#management.security.enabled=false