Skip to content

Commit e4c5a1d

Browse files
authored
Merge pull request #1015 from oracle/rmarano2
updates for 2.2, JDK 11, jenkins-ignore
2 parents 31dcb0f + 99f94be commit e4c5a1d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

docs-source/content/developerguide/requirements.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ weight: 1
88
In addition to the requirements listed in the [User guide]({{< relref "/userguide/introduction/introduction.md#prerequisites" >}}), the following software is also required to obtain and build the operator:
99

1010
* Git (1.8 or later recommended)
11-
* Java Developer Kit (1.8u131 or later recommended; please use 1.8, tests will not work on 1.9 or later versions)
12-
* Apache Maven (3.3 or later recommended)
11+
* Java Developer Kit (11 required, 11.0.2 recommended)
12+
* Apache Maven (3.5.3 min, 3.6 recommended)
1313

14-
The operator is written primarily in Java, BASH shell scripts, and WLST scripts. The Java code uses features introduced in Java 1.8 -- for example, closures -- but does not use any Java 1.9 features.
14+
The operator is written primarily in Java, BASH shell scripts, and WLST scripts.
1515

1616
Because the target runtime environment for the operator is Oracle Linux, no particular effort has been made to ensure the build or tests run on any other operating system. Please be aware that Oracle will not provide support, or accept pull requests to add support, for other operating systems.
1717

docs-source/content/quickstart/get-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
1919
1. Pull the operator image:
2020

2121
```bash
22-
$ docker pull oracle/weblogic-kubernetes-operator:2.1
22+
$ docker pull oracle/weblogic-kubernetes-operator:2.2
2323
```
2424

2525
1. Pull the Traefik load balancer image:

docs-source/content/quickstart/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ $ helm install stable/traefik \
5757
$ helm install kubernetes/charts/weblogic-operator \
5858
--name sample-weblogic-operator \
5959
--namespace sample-weblogic-operator-ns \
60-
--set image=oracle/weblogic-kubernetes-operator:2.1 \
60+
--set image=oracle/weblogic-kubernetes-operator:2.2 \
6161
--set serviceAccount=sample-weblogic-operator-sa \
6262
--set "domainNamespaces={}" \
6363
--wait

docs-source/content/userguide/introduction/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
1818

1919
```
2020
$ docker login
21-
$ docker pull oracle/weblogic-kubernetes-operator:2.1
21+
$ docker pull oracle/weblogic-kubernetes-operator:2.2
2222
```
2323

2424
For more details on acquiring the operator image and prerequisites for installing the operator, consult the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}).

docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ d. Update the `image` property of the domain resource specifying the new image n
161161
```
162162
domain:
163163
spec:
164-
image: oracle/weblogic-updated:2.1
164+
image: oracle/weblogic-updated:2.2
165165
```
166166
e. The operator will now initiate a rolling restart, which will apply the updated image, for all the server pods in the domain.
167167

0 commit comments

Comments
 (0)