Skip to content

Commit d84889b

Browse files
committed
Revert "Compile samples and integration tests with Java 8"
This reverts commit 09395f9.
1 parent 4c26b0c commit d84889b

File tree

12 files changed

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

12 files changed

+11
-4
lines changed

spring-boot-integration-tests/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.8</java.version>
2221
</properties>
2322
<modules>
2423
<module>spring-boot-gradle-tests</module>

spring-boot-samples/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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"
3-
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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43
<modelVersion>4.0.0</modelVersion>
54
<parent>
65
<groupId>org.springframework.boot</groupId>
@@ -19,7 +18,6 @@
1918
</organization>
2019
<properties>
2120
<main.basedir>${basedir}/..</main.basedir>
22-
<java.version>1.8</java.version>
2321
</properties>
2422
<modules>
2523
<module>spring-boot-sample-actuator</module>

spring-boot-samples/spring-boot-sample-jersey/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.7</java.version>
2122
</properties>
2223
<dependencies>
2324
<dependency>

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

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

spring-boot-samples/spring-boot-sample-servlet/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.7</java.version>
2122
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
2223
</properties>
2324
<dependencies>

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
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>
2324
</properties>
2425
<dependencies>
2526
<dependency>

spring-boot-samples/spring-boot-sample-web-jsp/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.7</java.version>
2122
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
2223
</properties>
2324
<dependencies>

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
20+
<java.version>1.7</java.version>
2021
</properties>
2122
<dependencies>
2223
<dependency>

0 commit comments

Comments
 (0)