mirror of
https://github.com/apache/struts.git
synced 2026-08-07 23:57:03 +00:00
Merge pull request #312 from aleksandr-m/feature/java8
Switch to Java 8
This commit is contained in:
@@ -2,7 +2,6 @@ language: java
|
||||
sudo: false
|
||||
|
||||
jdk:
|
||||
- openjdk7
|
||||
- oraclejdk9
|
||||
- oraclejdk11
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -9,7 +9,7 @@ pipeline {
|
||||
disableConcurrentBuilds()
|
||||
}
|
||||
tools {
|
||||
jdk 'JDK 1.7 (latest)'
|
||||
jdk 'JDK 1.8 (latest)'
|
||||
maven 'Maven 3 (latest)'
|
||||
}
|
||||
triggers {
|
||||
|
||||
@@ -96,6 +96,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<java.version>1.8</java.version>
|
||||
|
||||
<spring.platformVersion>4.3.20.RELEASE</spring.platformVersion>
|
||||
<ognl.version>3.2.10</ognl.version>
|
||||
@@ -396,8 +397,8 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
Reference in New Issue
Block a user