Commit e4460f5 1 parent baadca6 commit e4460f5 Copy full SHA for e4460f5
File tree 12 files changed +33
-15
lines changed
org.openhab.ui.cometvisu.php
org.openhab.ui.homebuilder
org.openhab.ui.iconset.classic
12 files changed +33
-15
lines changed Original file line number Diff line number Diff line change 1
1
sudo : required
2
- dist : xenial
2
+ dist : bionic
3
3
4
4
language : java
5
5
6
- jdk :
7
- - openjdk8
8
- - openjdk11
6
+ jdk : openjdk11
9
7
10
8
cache :
11
9
directories :
Original file line number Diff line number Diff line change 18
18
<attribute name =" test" value =" true" />
19
19
</attributes >
20
20
</classpathentry >
21
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
21
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
22
22
<attributes >
23
23
<attribute name =" maven.pomderived" value =" true" />
24
24
</attributes >
Original file line number Diff line number Diff line change 13
13
<stringAttribute key =" M2_USER_SETTINGS" value =" " />
14
14
<booleanAttribute key =" M2_WORKSPACE_RESOLUTION" value =" false" />
15
15
<booleanAttribute key =" org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value =" true" />
16
- <stringAttribute key =" org.eclipse.jdt.launching.JRE_CONTAINER" value =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-1.8 " />
16
+ <stringAttribute key =" org.eclipse.jdt.launching.JRE_CONTAINER" value =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-11 " />
17
17
<stringAttribute key =" org.eclipse.jdt.launching.WORKING_DIRECTORY" value =" ${workspace_loc:/org.openhab.ui.basic}" />
18
18
</launchConfiguration >
Original file line number Diff line number Diff line change 13
13
<attribute name =" test" value =" true" />
14
14
</attributes >
15
15
</classpathentry >
16
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
16
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
17
17
<attributes >
18
18
<attribute name =" maven.pomderived" value =" true" />
19
19
</attributes >
Original file line number Diff line number Diff line change 19
19
</attributes >
20
20
</classpathentry >
21
21
<classpathentry kind =" src" path =" src/gen/java" />
22
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
22
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
23
23
<attributes >
24
24
<attribute name =" maven.pomderived" value =" true" />
25
25
</attributes >
Original file line number Diff line number Diff line change 28
28
<attribute name =" test" value =" true" />
29
29
</attributes >
30
30
</classpathentry >
31
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
31
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
32
32
<attributes >
33
33
<attribute name =" maven.pomderived" value =" true" />
34
34
</attributes >
Original file line number Diff line number Diff line change 29
29
<attribute name =" test" value =" true" />
30
30
</attributes >
31
31
</classpathentry >
32
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
32
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
33
33
<attributes >
34
34
<attribute name =" maven.pomderived" value =" true" />
35
35
</attributes >
Original file line number Diff line number Diff line change 23
23
<attribute name =" test" value =" true" />
24
24
</attributes >
25
25
</classpathentry >
26
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
26
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
27
27
<attributes >
28
28
<attribute name =" maven.pomderived" value =" true" />
29
29
</attributes >
Original file line number Diff line number Diff line change 18
18
<attribute name =" test" value =" true" />
19
19
</attributes >
20
20
</classpathentry >
21
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
21
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
22
22
<attributes >
23
23
<attribute name =" maven.pomderived" value =" true" />
24
24
</attributes >
Original file line number Diff line number Diff line change 18
18
<attribute name =" test" value =" true" />
19
19
</attributes >
20
20
</classpathentry >
21
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
21
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
22
22
<attributes >
23
23
<attribute name =" maven.pomderived" value =" true" />
24
24
</attributes >
Original file line number Diff line number Diff line change 18
18
<attribute name =" test" value =" true" />
19
19
</attributes >
20
20
</classpathentry >
21
- <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 " >
21
+ <classpathentry kind =" con" path =" org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 " >
22
22
<attributes >
23
23
<attribute name =" maven.pomderived" value =" true" />
24
24
</attributes >
Original file line number Diff line number Diff line change 54
54
<properties >
55
55
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
56
56
<project .reporting.outputEncoding>UTF-8</project .reporting.outputEncoding>
57
- <oh .java.version>1.8 </oh .java.version>
57
+ <oh .java.version>11 </oh .java.version>
58
58
<maven .compiler.source>${oh.java.version} </maven .compiler.source>
59
59
<maven .compiler.target>${oh.java.version} </maven .compiler.target>
60
60
<maven .compiler.compilerVersion>${oh.java.version} </maven .compiler.compilerVersion>
@@ -450,6 +450,26 @@ Import-Package: \\
450
450
</execution >
451
451
</executions >
452
452
</plugin >
453
+
454
+ <plugin >
455
+ <groupId >org.apache.maven.plugins</groupId >
456
+ <artifactId >maven-enforcer-plugin</artifactId >
457
+ <executions >
458
+ <execution >
459
+ <id >enforce-java</id >
460
+ <goals >
461
+ <goal >enforce</goal >
462
+ </goals >
463
+ <configuration >
464
+ <rules >
465
+ <requireJavaVersion >
466
+ <version >[11.0,12.0)</version >
467
+ </requireJavaVersion >
468
+ </rules >
469
+ </configuration >
470
+ </execution >
471
+ </executions >
472
+ </plugin >
453
473
</plugins >
454
474
</build >
455
475
You can’t perform that action at this time.
0 commit comments