Skip to content

Commit dadad11

Browse files
committed
Several more changes to explicitly set plugin versions and remove serverjre
1 parent fb62f1c commit dadad11

File tree

4 files changed

+74
-4
lines changed

4 files changed

+74
-4
lines changed

build-tools/pom.xml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,51 @@
11
<project>
22
<modelVersion>4.0.0</modelVersion>
3+
4+
<parent>
5+
<groupId>oracle.kubernetes</groupId>
6+
<artifactId>operator-parent</artifactId>
7+
<version>2.2</version>
8+
</parent>
9+
10+
311
<groupId>oracle.kubernetes</groupId>
412
<artifactId>build-tools</artifactId>
5-
<version>1.0</version>
613
<name>Build Tools</name>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-enforcer-plugin</artifactId>
20+
<version>${maven-enforcer-plugin-version}</version>
21+
<executions>
22+
<execution>
23+
<id>enforce-maven</id>
24+
<goals>
25+
<goal>enforce</goal>
26+
</goals>
27+
<configuration>
28+
<rules>
29+
<requireMavenVersion>
30+
<version>${maven.version.range}</version>
31+
</requireMavenVersion>
32+
</rules>
33+
</configuration>
34+
</execution>
35+
</executions>
36+
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-compiler-plugin</artifactId>
40+
<version>${maven-compiler-plugin-version}</version>
41+
<configuration>
42+
<release>11</release>
43+
<compilerArgs>
44+
<arg>-Xpkginfo:always</arg>
45+
</compilerArgs>
46+
</configuration>
47+
</plugin>
48+
</plugins>
49+
</build>
50+
751
</project>

buildtime-reports/pom.xml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,43 @@
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+
</rules>
35+
</configuration>
36+
</execution>
37+
</executions>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
1642
<profiles>
1743
<profile>
1844
<id>reports</id>

src/integration-tests/bash/krun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# - This script is an expansion of https://gist.github.com/yuanying/3aa7d59dcce65470804ab43def646ab6
1212
#
1313

14-
IMAGE='store/oracle/serverjre:8'
14+
IMAGE='openjdk:11-oracle'
1515
IMAGEPULLPOLICY='IfNotPresent'
1616
IMAGEPULLSECRETS=''
1717
IPSCOMMA=''

src/integration-tests/introspector/util_krun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# - Image secret parameter hasn't been tested.
1515
#
1616

17-
IMAGE='store/oracle/serverjre:8'
17+
IMAGE='openjdk:11-oracle'
1818
IMAGEPULLPOLICY='IfNotPresent'
1919
IMAGEPULLSECRETS=''
2020
IPSCOMMA=''

0 commit comments

Comments
 (0)