Skip to content

Commit fb62f1c

Browse files
rjeberhardrjeberhard
committed
Use JDK 11
1 parent 9323644 commit fb62f1c

File tree

10 files changed

+188
-68
lines changed

10 files changed

+188
-68
lines changed

‎integration-tests/pom.xml

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,41 @@
8383
</dependency>
8484
</dependencies>
8585

86+
<build>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-enforcer-plugin</artifactId>
91+
<version>${maven-enforcer-plugin-version}</version>
92+
<executions>
93+
<execution>
94+
<id>enforce-maven</id>
95+
<goals>
96+
<goal>enforce</goal>
97+
</goals>
98+
<configuration>
99+
<rules>
100+
<requireMavenVersion>
101+
<version>${maven.version.range}</version>
102+
</requireMavenVersion>
103+
</rules>
104+
</configuration>
105+
</execution>
106+
</executions>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-compiler-plugin</artifactId>
111+
<version>${maven-compiler-plugin-version}</version>
112+
<configuration>
113+
<release>11</release>
114+
<compilerArgs>
115+
<arg>-Xpkginfo:always</arg>
116+
</compilerArgs>
117+
</configuration>
118+
</plugin>
119+
</plugins>
120+
</build>
86121

87122
<profiles>
88123

@@ -95,29 +130,10 @@
95130
</properties>
96131
<build>
97132
<plugins>
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-enforcer-plugin</artifactId>
101-
<executions>
102-
<execution>
103-
<id>enforce-maven</id>
104-
<goals>
105-
<goal>enforce</goal>
106-
</goals>
107-
<configuration>
108-
<rules>
109-
<requireMavenVersion>
110-
<version>${maven.version.range}</version>
111-
</requireMavenVersion>
112-
</rules>
113-
</configuration>
114-
</execution>
115-
</executions>
116-
</plugin>
117133
<plugin>
118134
<groupId>org.codehaus.mojo</groupId>
119135
<artifactId>exec-maven-plugin</artifactId>
120-
<version>1.6.0</version>
136+
<version>${exec-maven-plugin-version}</version>
121137
<executions>
122138
<execution>
123139
<goals>
@@ -173,10 +189,15 @@
173189
<plugin>
174190
<groupId>org.apache.maven.plugins</groupId>
175191
<artifactId>maven-failsafe-plugin</artifactId>
176-
<version>2.22.1</version>
192+
<version>${maven-failsafe-plugin-version}</version>
177193
<configuration> <!-- run tests in parallel -->
194+
<argLine>
195+
--illegal-access=permit
196+
</argLine>
178197
<encoding>UTF-8</encoding>
179-
<argLine>${failsafeArgLine}</argLine>
198+
<argLine>
199+
--illegal-access=permit
200+
</argLine>
180201
<failIfNoTests>false</failIfNoTests>
181202
<systemPropertyVariables>
182203
<!-- Add any system properties here -->
@@ -218,10 +239,6 @@
218239
<activation>
219240
<activeByDefault>true</activeByDefault>
220241
</activation>
221-
<properties>
222-
<surefireArgLine></surefireArgLine>
223-
<failsafeArgLine></failsafeArgLine>
224-
</properties>
225242
<build>
226243
<plugins>
227244
<plugin>

‎json-schema-maven-plugin/pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,25 @@
4040
</dependency>
4141
<dependency>
4242
<groupId>org.ow2.asm</groupId>
43-
<artifactId>asm-all</artifactId>
44-
<version>5.2</version>
43+
<artifactId>asm</artifactId> <!-- was asm-all -->
44+
<version>7.1</version>
4545
<scope>test</scope>
4646
</dependency>
4747
</dependencies>
4848

4949
<build>
5050
<plugins>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-compiler-plugin</artifactId>
54+
<version>${maven-compiler-plugin-version}</version>
55+
<configuration>
56+
<release>11</release>
57+
<compilerArgs>
58+
<arg>-Xpkginfo:always</arg>
59+
</compilerArgs>
60+
</configuration>
61+
</plugin>
5162
<plugin>
5263
<groupId>org.apache.maven.plugins</groupId>
5364
<artifactId>maven-plugin-plugin</artifactId>

‎json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/JsonSchemaMojoTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static org.apache.maven.plugins.annotations.LifecyclePhase.PROCESS_CLASSES;
1010
import static org.hamcrest.MatcherAssert.assertThat;
1111
import static org.hamcrest.Matchers.*;
12-
import static org.objectweb.asm.Opcodes.ASM5;
12+
import static org.objectweb.asm.Opcodes.ASM7;
1313

1414
import com.google.common.collect.ImmutableMap;
1515
import com.meterware.simplestub.Memento;
@@ -393,7 +393,7 @@ private class Visitor extends ClassVisitor {
393393
private Class<?> theClass;
394394

395395
Visitor(Class<?> theClass) {
396-
super(ASM5);
396+
super(ASM7);
397397
this.theClass = theClass;
398398
}
399399

@@ -438,7 +438,7 @@ private abstract class MojoAnnotationVisitor extends AnnotationVisitor {
438438
private Map<String, AnnotationInfo> annotations;
439439

440440
MojoAnnotationVisitor(Map<String, AnnotationInfo> annotations, String desc) {
441-
super(ASM5);
441+
super(ASM7);
442442
this.annotations = annotations;
443443
annotationClassDesc = desc;
444444
annotations.put(desc, new AnnotationInfo());
@@ -490,7 +490,7 @@ private class MojoFieldVisitor extends FieldVisitor {
490490
private final Map<String, AnnotationInfo> annotationMap;
491491

492492
MojoFieldVisitor(Field field) {
493-
super(ASM5);
493+
super(ASM7);
494494
this.annotationMap = getOrCreateAnnotationMap(field);
495495
}
496496

‎json-schema/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@
1111

1212
<artifactId>json-schema</artifactId>
1313

14+
<build>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-compiler-plugin</artifactId>
19+
<version>${maven-compiler-plugin-version}</version>
20+
<configuration>
21+
<release>11</release>
22+
<compilerArgs>
23+
<arg>-Xpkginfo:always</arg>
24+
</compilerArgs>
25+
</configuration>
26+
</plugin>
27+
</plugins>
28+
</build>
1429
<dependencies>
1530
<dependency>
1631
<groupId>io.kubernetes</groupId>

‎kubernetes/pom.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-enforcer-plugin</artifactId>
34+
<version>${maven-enforcer-plugin-version}</version>
3435
<executions>
3536
<execution>
3637
<id>enforce-maven</id>
@@ -47,6 +48,17 @@
4748
</execution>
4849
</executions>
4950
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-compiler-plugin</artifactId>
54+
<version>${maven-compiler-plugin-version}</version>
55+
<configuration>
56+
<release>11</release>
57+
<compilerArgs>
58+
<arg>-Xpkginfo:always</arg>
59+
</compilerArgs>
60+
</configuration>
61+
</plugin>
5062
<plugin>
5163
<groupId>com.coveo</groupId>
5264
<artifactId>fmt-maven-plugin</artifactId>
@@ -63,7 +75,7 @@
6375
<plugin>
6476
<groupId>org.codehaus.mojo</groupId>
6577
<artifactId>exec-maven-plugin</artifactId>
66-
<version>1.6.0</version>
78+
<version>${exec-maven-plugin-version}</version>
6779
<executions>
6880
<execution><!-- helm chart package-->
6981
<id>package-helm-charts</id>
@@ -132,8 +144,12 @@
132144
<plugin>
133145
<groupId>org.apache.maven.plugins</groupId>
134146
<artifactId>maven-failsafe-plugin</artifactId>
135-
<version>2.22.1</version>
136-
<executions>
147+
<version>${maven-failsafe-plugin-version}</version>
148+
<configuration>
149+
<argLine>
150+
--illegal-access=permit
151+
</argLine>
152+
</configuration> <executions>
137153
<execution>
138154
<goals>
139155
<goal>integration-test</goal>

‎model/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<plugin>
3333
<groupId>org.apache.maven.plugins</groupId>
3434
<artifactId>maven-enforcer-plugin</artifactId>
35+
<version>${maven-enforcer-plugin-version}</version>
3536
<executions>
3637
<execution>
3738
<id>enforce-maven</id>
@@ -73,8 +74,9 @@
7374
<plugin>
7475
<groupId>org.apache.maven.plugins</groupId>
7576
<artifactId>maven-compiler-plugin</artifactId>
76-
<version>3.7.0</version>
77+
<version>${maven-compiler-plugin-version}</version>
7778
<configuration>
79+
<release>11</release>
7880
<compilerArgs>
7981
<arg>-Xpkginfo:always</arg>
8082
</compilerArgs>
@@ -116,7 +118,7 @@
116118

117119
<plugin>
118120
<artifactId>maven-resources-plugin</artifactId>
119-
<version>3.1.0</version>
121+
<version>${maven-resources-plugin-version}</version>
120122
<executions>
121123
<execution>
122124
<phase>install</phase>

‎operator/pom.xml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-enforcer-plugin</artifactId>
34+
<version>${maven-enforcer-plugin-version}</version>
3435
<executions>
3536
<execution>
3637
<id>enforce-maven</id>
@@ -51,7 +52,7 @@
5152
<plugin>
5253
<groupId>pl.project13.maven</groupId>
5354
<artifactId>git-commit-id-plugin</artifactId>
54-
<version>2.2.4</version>
55+
<version>2.2.6</version>
5556
<executions>
5657
<execution>
5758
<id>get-the-git-infos</id>
@@ -84,15 +85,7 @@
8485
<plugin>
8586
<groupId>org.apache.maven.plugins</groupId>
8687
<artifactId>maven-jar-plugin</artifactId>
87-
<version>2.6</version>
88-
<executions>
89-
<execution>
90-
<goals>
91-
<goal>jar</goal>
92-
<goal>test-jar</goal>
93-
</goals>
94-
</execution>
95-
</executions>
88+
<version>${maven-jar-plugin-version}</version>
9689
<configuration>
9790
<archive>
9891
<manifest>
@@ -114,7 +107,11 @@
114107
<plugin>
115108
<groupId>org.apache.maven.plugins</groupId>
116109
<artifactId>maven-surefire-plugin</artifactId>
110+
<version>${maven-surefire-plugin-version}</version>
117111
<configuration>
112+
<argLine>
113+
--illegal-access=permit
114+
</argLine>
118115
<skipTests>${skip.unit.tests}</skipTests>
119116
<includes>
120117
<exclude>**/*Test.java</exclude>
@@ -141,7 +138,9 @@
141138
<plugin>
142139
<groupId>org.apache.maven.plugins</groupId>
143140
<artifactId>maven-compiler-plugin</artifactId>
141+
<version>${maven-compiler-plugin-version}</version>
144142
<configuration>
143+
<release>11</release>
145144
<compilerArgs>
146145
<arg>-Xpkginfo:always</arg>
147146
</compilerArgs>
@@ -150,7 +149,12 @@
150149
<plugin>
151150
<groupId>org.apache.maven.plugins</groupId>
152151
<artifactId>maven-failsafe-plugin</artifactId>
153-
<version>3.0.0-M3</version>
152+
<version>${maven-failsafe-plugin-version}</version>
153+
<configuration>
154+
<argLine>
155+
--illegal-access=permit
156+
</argLine>
157+
</configuration>
154158
<executions>
155159
<execution>
156160
<goals>

0 commit comments

Comments
 (0)