Browse Source

Compile samples and integration tests with Java 8

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.
pull/4212/head
Phillip Webb 10 years ago
parent
commit
09395f956a
  1. 1
      spring-boot-integration-tests/pom.xml
  2. 4
      spring-boot-samples/pom.xml
  3. 1
      spring-boot-samples/spring-boot-sample-jersey/pom.xml
  4. 1
      spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
  5. 1
      spring-boot-samples/spring-boot-sample-servlet/pom.xml
  6. 1
      spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
  7. 1
      spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
  8. 1
      spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
  9. 1
      spring-boot-samples/spring-boot-sample-web-static/pom.xml
  10. 1
      spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
  11. 1
      spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
  12. 1
      spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml

1
spring-boot-integration-tests/pom.xml

@ -18,6 +18,7 @@ @@ -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>

4
spring-boot-samples/pom.xml

@ -1,5 +1,6 @@ @@ -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>
@ -18,6 +19,7 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-jersey/pom.xml

@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>

1
spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml

@ -17,7 +17,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-servlet/pom.xml

@ -18,7 +18,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml

@ -19,7 +19,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml

@ -20,7 +20,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml

@ -18,7 +18,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-web-static/pom.xml

@ -17,7 +17,6 @@ @@ -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>

1
spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>

1
spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>

1
spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<java.version>1.7</java.version>
</properties>
<dependencies>
<dependency>

Loading…
Cancel
Save