Merge branch 'master' into master

2019-11-19 17:39:43 +08:00
parent de093d73c6 a301cf5c6c
commit c4bf7775a2
103 changed files with 4748 additions and 98 deletions
@@ -115,8 +115,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>${jdk-version}</source>
+					<target>${jdk-version}</target>
 					<encoding>${project-sourceEncoding}</encoding>
 				</configuration>
 			</plugin>