Skip to content

Commit 97f3fa9

Browse files
rjeberhardrjeberhard
authored
Merge pull request #1011 from oracle/update-dependencies
Require JDK 11, Maven plugin and dependency versions
2 parents 799c65b + 894d736 commit 97f3fa9

File tree

14 files changed

+484
-74
lines changed

14 files changed

+484
-74
lines changed

‎build-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<artifactId>build-tools</artifactId>
55
<version>1.0</version>
66
<name>Build Tools</name>
7-
</project>
7+
</project>

‎buildtime-reports/pom.xml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,47 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
57
<parent>
68
<artifactId>operator-parent</artifactId>
79
<groupId>oracle.kubernetes</groupId>
810
<version>2.2</version>
911
</parent>
10-
<modelVersion>4.0.0</modelVersion>
1112

1213
<artifactId>buildtime-reports</artifactId>
1314
<packaging>pom</packaging>
1415
<name>Project Reports</name>
1516

17+
<build>
18+
<plugins>
19+
<plugin>
20+
<groupId>org.apache.maven.plugins</groupId>
21+
<artifactId>maven-enforcer-plugin</artifactId>
22+
<version>${maven-enforcer-plugin-version}</version>
23+
<executions>
24+
<execution>
25+
<id>enforce-maven</id>
26+
<goals>
27+
<goal>enforce</goal>
28+
</goals>
29+
<configuration>
30+
<rules>
31+
<requireMavenVersion>
32+
<version>${maven.version.range}</version>
33+
</requireMavenVersion>
34+
<requireJavaVersion>
35+
<version>${java.version.range}</version>
36+
</requireJavaVersion>
37+
<requirePluginVersions></requirePluginVersions>
38+
</rules>
39+
</configuration>
40+
</execution>
41+
</executions>
42+
</plugin>
43+
</plugins>
44+
</build>
45+
1646
<profiles>
1747
<profile>
1848
<id>reports</id>

‎integration-tests/pom.xml

Lines changed: 125 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,123 @@
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+
<requireJavaVersion>
104+
<version>${java.version.range}</version>
105+
</requireJavaVersion>
106+
<requirePluginVersions></requirePluginVersions>
107+
</rules>
108+
</configuration>
109+
</execution>
110+
</executions>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-compiler-plugin</artifactId>
115+
<version>${maven-compiler-plugin-version}</version>
116+
<configuration>
117+
<release>11</release>
118+
<compilerArgs>
119+
<arg>-Xpkginfo:always</arg>
120+
</compilerArgs>
121+
</configuration>
122+
</plugin>
123+
<plugin>
124+
<groupId>com.coveo</groupId>
125+
<artifactId>fmt-maven-plugin</artifactId>
126+
<version>2.8</version>
127+
<executions>
128+
<execution>
129+
<phase>test</phase>
130+
<goals>
131+
<goal>check</goal>
132+
</goals>
133+
</execution>
134+
</executions>
135+
</plugin>
136+
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-release-plugin</artifactId>
139+
<version>${maven-release-plugin-version}</version>
140+
</plugin>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-resources-plugin</artifactId>
144+
<version>${maven-resources-plugin-version}</version>
145+
</plugin>
146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-surefire-plugin</artifactId>
149+
<version>${maven-surefire-plugin-version}</version>
150+
</plugin>
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-jar-plugin</artifactId>
154+
<version>${maven-jar-plugin-version}</version>
155+
</plugin>
156+
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
158+
<artifactId>maven-pmd-plugin</artifactId>
159+
<version>${maven-pmd-plugin-version}</version>
160+
</plugin>
161+
<plugin>
162+
<groupId>org.apache.maven.plugins</groupId>
163+
<artifactId>maven-site-plugin</artifactId>
164+
<version>${maven-site-plugin-version}</version>
165+
</plugin>
166+
<plugin>
167+
<groupId>org.apache.maven.plugins</groupId>
168+
<artifactId>maven-javadoc-plugin</artifactId>
169+
<version>${maven-javadoc-plugin-version}</version>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-clean-plugin</artifactId>
174+
<version>${maven-clean-plugin-version}</version>
175+
</plugin>
176+
<plugin>
177+
<groupId>org.apache.maven.plugins</groupId>
178+
<artifactId>maven-checkstyle-plugin</artifactId>
179+
<version>${maven-checkstyle-plugin-version}</version>
180+
</plugin>
181+
<plugin>
182+
<groupId>org.apache.maven.plugins</groupId>
183+
<artifactId>maven-install-plugin</artifactId>
184+
<version>${maven-install-plugin-version}</version>
185+
</plugin>
186+
<plugin>
187+
<groupId>org.apache.maven.plugins</groupId>
188+
<artifactId>maven-deploy-plugin</artifactId>
189+
<version>${maven-deploy-plugin-version}</version>
190+
</plugin>
191+
<plugin>
192+
<groupId>com.github.spotbugs</groupId>
193+
<artifactId>spotbugs-maven-plugin</artifactId>
194+
<version>${spotbugs-maven-plugin-version}</version>
195+
</plugin>
196+
<plugin>
197+
<groupId>org.jacoco</groupId>
198+
<artifactId>jacoco-maven-plugin</artifactId>
199+
<version>${jacoco.version}</version>
200+
</plugin>
201+
</plugins>
202+
</build>
86203

87204
<profiles>
88205

@@ -98,7 +215,7 @@
98215
<plugin>
99216
<groupId>org.codehaus.mojo</groupId>
100217
<artifactId>exec-maven-plugin</artifactId>
101-
<version>1.6.0</version>
218+
<version>${exec-maven-plugin-version}</version>
102219
<executions>
103220
<execution>
104221
<goals>
@@ -154,10 +271,15 @@
154271
<plugin>
155272
<groupId>org.apache.maven.plugins</groupId>
156273
<artifactId>maven-failsafe-plugin</artifactId>
157-
<version>2.22.1</version>
274+
<version>${maven-failsafe-plugin-version}</version>
158275
<configuration> <!-- run tests in parallel -->
276+
<argLine>
277+
--illegal-access=permit
278+
</argLine>
159279
<encoding>UTF-8</encoding>
160-
<argLine>${failsafeArgLine}</argLine>
280+
<argLine>
281+
--illegal-access=permit
282+
</argLine>
161283
<failIfNoTests>false</failIfNoTests>
162284
<systemPropertyVariables>
163285
<!-- Add any system properties here -->
@@ -193,34 +315,5 @@
193315
</plugins>
194316
</build>
195317
</profile>
196-
197-
<profile>
198-
<id>default</id>
199-
<activation>
200-
<activeByDefault>true</activeByDefault>
201-
</activation>
202-
<properties>
203-
<surefireArgLine></surefireArgLine>
204-
<failsafeArgLine></failsafeArgLine>
205-
</properties>
206-
<build>
207-
<plugins>
208-
<plugin>
209-
<groupId>com.coveo</groupId>
210-
<artifactId>fmt-maven-plugin</artifactId>
211-
<version>2.8</version>
212-
<executions>
213-
<execution>
214-
<phase>test</phase>
215-
<goals>
216-
<goal>check</goal>
217-
</goals>
218-
</execution>
219-
</executions>
220-
</plugin>
221-
</plugins>
222-
</build>
223-
</profile>
224318
</profiles>
225-
226319
</project>

‎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>
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: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,41 @@
2828

2929
<build>
3030
<plugins>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-enforcer-plugin</artifactId>
34+
<version>${maven-enforcer-plugin-version}</version>
35+
<executions>
36+
<execution>
37+
<id>enforce-maven</id>
38+
<goals>
39+
<goal>enforce</goal>
40+
</goals>
41+
<configuration>
42+
<rules>
43+
<requireMavenVersion>
44+
<version>${maven.version.range}</version>
45+
</requireMavenVersion>
46+
<requireJavaVersion>
47+
<version>${java.version.range}</version>
48+
</requireJavaVersion>
49+
<requirePluginVersions></requirePluginVersions>
50+
</rules>
51+
</configuration>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-compiler-plugin</artifactId>
58+
<version>${maven-compiler-plugin-version}</version>
59+
<configuration>
60+
<release>11</release>
61+
<compilerArgs>
62+
<arg>-Xpkginfo:always</arg>
63+
</compilerArgs>
64+
</configuration>
65+
</plugin>
3166
<plugin>
3267
<groupId>com.coveo</groupId>
3368
<artifactId>fmt-maven-plugin</artifactId>
@@ -44,7 +79,7 @@
4479
<plugin>
4580
<groupId>org.codehaus.mojo</groupId>
4681
<artifactId>exec-maven-plugin</artifactId>
47-
<version>1.6.0</version>
82+
<version>${exec-maven-plugin-version}</version>
4883
<executions>
4984
<execution><!-- helm chart package-->
5085
<id>package-helm-charts</id>
@@ -113,7 +148,12 @@
113148
<plugin>
114149
<groupId>org.apache.maven.plugins</groupId>
115150
<artifactId>maven-failsafe-plugin</artifactId>
116-
<version>2.22.1</version>
151+
<version>${maven-failsafe-plugin-version}</version>
152+
<configuration>
153+
<argLine>
154+
--illegal-access=permit
155+
</argLine>
156+
</configuration>
117157
<executions>
118158
<execution>
119159
<goals>

0 commit comments

Comments
 (0)