浏览代码

Merge c70d4a8e15be62fe26bb147f52cc9c3985c5b39f into 0398a33fe29ba56aa3525b435a830d270322df8e

Kris De Volder 7 年前
父节点
当前提交
95a90d02bc
共有 4 个文件被更改,包括 29 次插入0 次删除
  1. 11
    0
      complete/build.gradle
  2. 4
    0
      complete/pom.xml
  3. 10
    0
      initial/build.gradle
  4. 4
    0
      initial/pom.xml

+ 11
- 0
complete/build.gradle 查看文件

17
     version =  '0.1.0'
17
     version =  '0.1.0'
18
 }
18
 }
19
 
19
 
20
+sourceCompatibility = 1.7
21
+targetCompatibility = 1.7
22
+
23
+eclipse {
24
+    //See https://issues.gradle.org/browse/GRADLE-3100 
25
+    classpath {
26
+         containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
27
+         containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7'
28
+    }
29
+}
30
+
20
 repositories {
31
 repositories {
21
     mavenCentral()
32
     mavenCentral()
22
 }
33
 }

+ 4
- 0
complete/pom.xml 查看文件

12
         <artifactId>spring-boot-starter-parent</artifactId>
12
         <artifactId>spring-boot-starter-parent</artifactId>
13
         <version>1.5.3.RELEASE</version>
13
         <version>1.5.3.RELEASE</version>
14
     </parent>
14
     </parent>
15
+    
16
+    <properties>
17
+        <java.version>1.7</java.version>
18
+    </properties>
15
 
19
 
16
     <dependencies>
20
     <dependencies>
17
         <dependency>
21
         <dependency>

+ 10
- 0
initial/build.gradle 查看文件

17
     version =  '0.1.0'
17
     version =  '0.1.0'
18
 }
18
 }
19
 
19
 
20
+sourceCompatibility = 1.7
21
+targetCompatibility = 1.7
22
+
23
+eclipse {
24
+    classpath {
25
+         containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
26
+         containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7'
27
+    }
28
+}
29
+
20
 repositories {
30
 repositories {
21
     mavenCentral()
31
     mavenCentral()
22
 }
32
 }

+ 4
- 0
initial/pom.xml 查看文件

13
         <version>1.5.3.RELEASE</version>
13
         <version>1.5.3.RELEASE</version>
14
     </parent>
14
     </parent>
15
 
15
 
16
+    <properties>
17
+        <java.version>1.7</java.version>
18
+    </properties>
19
+
16
     <dependencies>
20
     <dependencies>
17
         <dependency>
21
         <dependency>
18
             <groupId>org.springframework.boot</groupId>
22
             <groupId>org.springframework.boot</groupId>