root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Add animal sniffer for Java 6 and jdk1.8 to actuator 

The build now requires java 8 (although no language features are yet
in use). Bamboo has been updated.

Fixes gh-716
This commit is contained in:
Dave Syer 2015-03-30 10:39:41 +01:00
parent fbe9774890
commit c9c1e8b517
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-actuator/pom.xml
View File

@ -16,6 +16,7 @@
<url>http://www.spring.io</url> <url>http://www.spring.io</url>
</organization> </organization>
<properties> <properties>
<java.version>1.8</java.version>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
</properties> </properties>
<dependencies> <dependencies>
@ -200,4 +201,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

2
spring-boot-cli/src/it/java/org/springframework/boot/cli/CommandLineIT.java
View File

@ -42,7 +42,7 @@ public class CommandLineIT {
InterruptedException { InterruptedException {
Invocation cli = this.cli.invoke("hint"); Invocation cli = this.cli.invoke("hint");
assertThat(cli.await(), equalTo(0)); assertThat(cli.await(), equalTo(0));
assertThat(cli.getErrorOutput().length(), equalTo(0)); assertThat("Unexpected error: \n" + cli.getErrorOutput(), cli.getErrorOutput().length(), equalTo(0));
assertThat(cli.getStandardOutputLines().size(), equalTo(10)); assertThat(cli.getStandardOutputLines().size(), equalTo(10));
} }

27
spring-boot-dependencies/pom.xml
View File

@ -1671,6 +1671,33 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.5</version> <version>2.5</version>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.14</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java16</artifactId>
<version>1.0</version>
</signature>
</configuration>
<executions>
<execution>
<id>enforce-java-6</id>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<annotations>
<annotation>org.springframework.lang.UsesJava8</annotation>
<annotation>org.springframework.lang.UsesJava7</annotation>
</annotations>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>