Skip to content

Commit 09395f9

Browse files
committed
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.
1 parent cb6e30c commit 09395f9

File tree

12 files changed

+4
-11
lines changed
  • spring-boot-integration-tests
  • spring-boot-samples

12 files changed

+4
-11
lines changed

spring-boot-integration-tests/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</organization>
1919
<properties>
2020
<main.basedir>${basedir}/..</main.basedir>
21+
<java.version>1.8</java.version>
2122
</properties>
2223
<modules>
2324
<module>spring-boot-gradle-tests</module>

spring-boot-samples/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
@@ -18,6 +19,7 @@
1819
</organization>
1920
<properties>
2021
<main.basedir>${basedir}/..</main.basedir>
22+
<java.version>1.8</java.version>
2123
</properties>
2224
<modules>
2325
<module>spring-boot-sample-actuator</module>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
</organization>
1919
<properties>
2020
<main.basedir>${basedir}/../..</main.basedir>
21-
<java.version>1.7</java.version>
2221
</properties>
2322
<dependencies>
2423
<dependency>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<url>http://www.spring.io</url>
1818
</organization>
1919
<properties>
20-
<java.version>1.7</java.version>
2120
<main.basedir>${basedir}/../..</main.basedir>
2221
</properties>
2322
<dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
</organization>
1919
<properties>
2020
<main.basedir>${basedir}/../..</main.basedir>
21-
<java.version>1.7</java.version>
2221
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
2322
</properties>
2423
<dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<properties>
2020
<main.basedir>${basedir}/../..</main.basedir>
2121
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
22-
<java.version>1.7</java.version>
2322
</properties>
2423
<dependencies>
2524
<dependency>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<main.basedir>${basedir}/../..</main.basedir>
2121
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
2222
<tomcat.version>7.0.59</tomcat.version>
23-
<java.version>1.7</java.version>
2423
</properties>
2524
<dependencies>
2625
<dependency>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
</organization>
1919
<properties>
2020
<main.basedir>${basedir}/../..</main.basedir>
21-
<java.version>1.7</java.version>
2221
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
2322
</properties>
2423
<dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<url>http://www.spring.io</url>
1818
</organization>
1919
<properties>
20-
<java.version>1.7</java.version>
2120
<main.basedir>${basedir}/../..</main.basedir>
2221
</properties>
2322
<dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
20-
<java.version>1.7</java.version>
2120
</properties>
2221
<dependencies>
2322
<dependency>

0 commit comments

Comments
 (0)