Skip to content

Commit 2b7b97c

Browse files
rjeberhardrjeberhard
committed
dependency and snapshot updates
1 parent bbd6da6 commit 2b7b97c

File tree

11 files changed

+40
-33
lines changed

11 files changed

+40
-33
lines changed

‎buildDockerImage.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
usage() {
@@ -33,7 +33,7 @@ while getopts "t:" optname; do
3333
esac
3434
done
3535

36-
IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:3.4.7}
36+
IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:3.4.8-SNAPSHOT}
3737
SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
3838

3939
# Proxy settings

‎integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>oracle.kubernetes</groupId>
99
<artifactId>operator-parent</artifactId>
10-
<version>3.4.7</version>
10+
<version>3.4.8-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>integration-tests</artifactId>

‎json-schema-generator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>operator-parent</artifactId>
99
<groupId>oracle.kubernetes</groupId>
10-
<version>3.4.7</version>
10+
<version>3.4.8-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>json-schema</artifactId>

‎kubernetes/charts/weblogic-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ name: weblogic-operator
66
description: Helm chart for configuring the WebLogic operator.
77

88
type: application
9-
version: 3.4.7
10-
appVersion: 3.4.7
9+
version: 3.4.8-SNAPSHOT
10+
appVersion: 3.4.8-SNAPSHOT

‎kubernetes/charts/weblogic-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ domainNamespaces:
6363
enableClusterRoleBinding: false
6464

6565
# image specifies the container image containing the operator.
66-
image: "ghcr.io/oracle/weblogic-kubernetes-operator:3.4.7"
66+
image: "ghcr.io/oracle/weblogic-kubernetes-operator:3.4.8-SNAPSHOT"
6767

6868
# imagePullPolicy specifies the image pull policy for the operator's container image.
6969
imagePullPolicy: IfNotPresent

‎kubernetes/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
-->
44
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>oracle.kubernetes</groupId>
1111
<artifactId>operator-parent</artifactId>
12-
<version>3.4.7</version>
12+
<version>3.4.8-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>installation-tests</artifactId>

‎operator-build-maven-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>operator-parent</artifactId>
99
<groupId>oracle.kubernetes</groupId>
10-
<version>3.4.7</version>
10+
<version>3.4.8-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>operator-build-maven-plugin</artifactId>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.apache.maven.plugin-tools</groupId>
3232
<artifactId>maven-plugin-annotations</artifactId>
33-
<version>3.8.1</version>
33+
<version>3.8.2</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.junit.jupiter</groupId>

‎operator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>oracle.kubernetes</groupId>
99
<artifactId>operator-parent</artifactId>
10-
<version>3.4.7</version>
10+
<version>3.4.8-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>weblogic-kubernetes-operator</artifactId>

‎pom.xml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
<!-- Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33
<project xmlns="http://maven.apache.org/POM/4.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -7,7 +7,7 @@
77

88
<groupId>oracle.kubernetes</groupId>
99
<artifactId>operator-parent</artifactId>
10-
<version>3.4.7</version>
10+
<version>3.4.8-SNAPSHOT</version>
1111

1212
<modules>
1313
<module>operator</module>
@@ -59,6 +59,7 @@
5959
<release>11</release>
6060
<compilerArgs>
6161
<arg>-Xpkginfo:always</arg>
62+
<arg>-Xlint:all</arg>
6263
</compilerArgs>
6364
</configuration>
6465
</plugin>
@@ -113,7 +114,15 @@
113114
<requireJavaVersion>
114115
<version>${java.version.range}</version>
115116
</requireJavaVersion>
116-
<requirePluginVersions></requirePluginVersions>
117+
<requireReleaseDeps>
118+
<excludes>
119+
<exclude>oracle.kubernetes:*</exclude>
120+
</excludes>
121+
</requireReleaseDeps>
122+
<requirePluginVersions>
123+
<banSnapshots>true</banSnapshots>
124+
<unCheckedPluginList>oracle.kubernetes:operator-build-maven-plugin</unCheckedPluginList>
125+
</requirePluginVersions>
117126
</rules>
118127
</configuration>
119128
</execution>
@@ -204,7 +213,6 @@
204213
<groupId>org.apache.maven.plugins</groupId>
205214
<artifactId>maven-enforcer-plugin</artifactId>
206215
</plugin>
207-
208216
<plugin>
209217
<groupId>org.commonjava.maven.plugins</groupId>
210218
<artifactId>directory-maven-plugin</artifactId>
@@ -379,7 +387,6 @@
379387
</execution>
380388
</executions>
381389
</plugin>
382-
383390
</plugins>
384391
</build>
385392
</profile>
@@ -600,15 +607,15 @@
600607
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
601608
<maven-site-plugin-version>3.12.1</maven-site-plugin-version>
602609
<maven-surefire-plugin-version>3.0.0</maven-surefire-plugin-version>
603-
<maven-checkstyle-plugin-version>3.2.1</maven-checkstyle-plugin-version>
610+
<maven-checkstyle-plugin-version>3.2.2</maven-checkstyle-plugin-version>
604611
<maven-release-plugin-version>3.0.0</maven-release-plugin-version>
605612
<maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
606613
<maven-failsafe-plugin-version>3.0.0</maven-failsafe-plugin-version>
607614
<maven-dependency-plugin-version>3.5.0</maven-dependency-plugin-version>
608615
<exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
609616
<spotbugs-maven-plugin-version>4.7.3.4</spotbugs-maven-plugin-version>
610617
<spotbugs-version>4.7.3</spotbugs-version>
611-
<checkstyle-version>10.9.3</checkstyle-version>
618+
<checkstyle-version>10.10.0</checkstyle-version>
612619
<directory-maven-version>1.0</directory-maven-version>
613620
<maven-jxr-plugin-version>3.3.0</maven-jxr-plugin-version>
614621
<maven-gpg-plugin-version>3.0.1</maven-gpg-plugin-version>
@@ -617,7 +624,7 @@
617624
<jakarta-json-version>2.0.1</jakarta-json-version>
618625
<jms-api-version>2.0.1</jms-api-version>
619626
<kjetland-mbknor-jsonschema-version>1.0.39</kjetland-mbknor-jsonschema-version>
620-
<networknt-jsonschmema-validator-version>1.0.79</networknt-jsonschmema-validator-version>
627+
<networknt-jsonschmema-validator-version>1.0.81</networknt-jsonschmema-validator-version>
621628
<commons-exec-version>1.3</commons-exec-version>
622629
<commons-codec-version>1.15</commons-codec-version>
623630
<httpunit-version>1.7.3</httpunit-version>
@@ -629,24 +636,24 @@
629636
<commons.io.version>2.11.0</commons.io.version>
630637
<awaitility-version>4.2.0</awaitility-version>
631638
<client-java-version>16.0.3</client-java-version>
632-
<kotlin-stdlib-version>1.8.20</kotlin-stdlib-version>
633-
<okhttp-version>4.10.0</okhttp-version>
634-
<junit.jupiter.version>5.9.2</junit.jupiter.version>
639+
<kotlin-stdlib-version>1.8.21</kotlin-stdlib-version>
640+
<okhttp-version>4.11.0</okhttp-version>
641+
<junit.jupiter.version>5.9.3</junit.jupiter.version>
635642
<junit.vintage.version>5.7.1</junit.vintage.version>
636643
<junit.platform.version>1.7.0</junit.platform.version>
637644
<junit.platform.surefire.version>1.3.2</junit.platform.surefire.version>
638645
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
639646
<jersey-version>3.1.1</jersey-version>
640-
<jackson-version>2.14.2</jackson-version>
647+
<jackson-version>2.15.0</jackson-version>
641648
<snakeyaml-version>1.33</snakeyaml-version>
642-
<jackson-databind-version>2.14.2</jackson-databind-version>
649+
<jackson-databind-version>2.15.0</jackson-databind-version>
643650
<dependency-check-version>8.2.1</dependency-check-version>
644651
<root-generated-swagger>${project.basedir}/src-generated-swagger</root-generated-swagger>
645652
<src-generated-swagger>${root-generated-swagger}/main/java</src-generated-swagger>
646653
<domain-swagger-file>${project.basedir}/swagger/domain.json</domain-swagger-file>
647654
<skip.unit.tests>false</skip.unit.tests>
648655
<skip.dependency-check>false</skip.dependency-check>
649-
<jacoco.version>0.8.9</jacoco.version>
656+
<jacoco.version>0.8.10</jacoco.version>
650657
<git-commit-id-plugin-version>4.9.10</git-commit-id-plugin-version>
651658
<htmlunit-version>2.70.0</htmlunit-version>
652659
<checkstyle.config.location>${root.basedir}/build-tools/checkstyle/customized_google_checks.xml</checkstyle.config.location>

‎sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Required metadata
22
sonar.projectKey=weblogic-kubernetes-operator
33
sonar.projectName=WebLogic Kubernetes Operator
4-
sonar.projectVersion=3.4.7
4+
sonar.projectVersion=3.4.8-SNAPSHOT
55
# Comma-separated paths to directories with sources (required)
66
sonar.sources=operator/src/main/java
77
sonar.java.source=11

0 commit comments

Comments
 (0)