Skip to content

Commit

Permalink
Compile samples and integration tests with Java 8
Browse files Browse the repository at this point in the history 
Update the samples and integration tests to use Java 8. There's no
specific reason to keep them on Java 6 and it helps keep Eclipse happy
if we upgrade.
  • Loading branch information
@philwebb
philwebb committed Oct 8, 2015
1 parent cb6e30c commit 09395f9
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 11 deletions.
1 change: 1 addition & 0 deletions spring-boot-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
</organization>
<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version>
</properties>
<modules>
<module>spring-boot-gradle-tests</module>
Expand Down
4 changes: 3 additions & 1 deletion spring-boot-samples/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
Expand All @@ -18,6 +19,7 @@
</organization>
<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version>
</properties>
<modules>
<module>spring-boot-sample-actuator</module>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-jersey/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<url>http://www.spring.io</url>
</organization>
<properties>
<java.version>1.7</java.version>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
</properties>
<dependencies>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<main.basedir>${basedir}/../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
<tomcat.version>7.0.59</tomcat.version>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
</properties>
<dependencies>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-web-static/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<url>http://www.spring.io</url>
</organization>
<properties>
<java.version>1.7</java.version>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>
Expand Down

0 comments on commit 09395f9

Please sign in to comment.