Merge remote-tracking branch 'origin/release/2.2'

Author: rjeberhard

README.md

@@ -21,8 +21,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
 The fastest way to experience the operator is to follow the [Quick Start guide](https://oracle.github.io/weblogic-kubernetes-operator/quickstart/), or you can peruse our [documentation](https://oracle.github.io/weblogic-kubernetes-operator), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples](https://oracle.github.io/weblogic-kubernetes-operator/samples/).
 
 ***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.1.
-This release was published on April 4, 2019.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
+This release was published on TBD.
 ***
 
 # Documentation

build-tools/pom.xml

@@ -4,4 +4,4 @@
   <artifactId>build-tools</artifactId>
   <version>1.0</version>
   <name>Build Tools</name>
-</project>
+</project>

buildtime-reports/pom.xml

@@ -2,17 +2,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>2.1</version>
+        <version>2.2</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>buildtime-reports</artifactId>
     <packaging>pom</packaging>
     <name>Project Reports</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${maven-enforcer-plugin-version}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>${maven.version.range}</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>${java.version.range}</version>
+                                </requireJavaVersion>
+                                <requirePluginVersions></requirePluginVersions>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>reports</id>

docs-source/content/_index.md

@@ -17,8 +17,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
 The fastest way to experience the operator is to follow the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}), or you can peruse our [documentation]({{< relref "/userguide/_index.md" >}}), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples]({{< relref "/samples/_index.md" >}}).
 
 ***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.1.
-This release was published on April 4, 2019.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
+This release was published on TBD.
 ***
 
 #### Operator earlier versions

docs-source/content/developerguide/branching.md

@@ -11,7 +11,7 @@ The `develop` branch is protected and contains source for the latest completed f
 
 Because we want to balance separating destabilizing work into feature branches against the possibility of later difficult merges, we encourage developers working on features to pull out any necessary refactoring or improvements that are general purpose into their own shorter-lived branches and create pull requests to `develop` when these smaller work items are completed.
 
-All commits to `develop` must pass the [integration test suite]({{< relref "/developerguide/integration-tests.md" >}}).  Please run these tests locally before submitting a pull request.  Additionally, each push to a branch in our GitHub repository triggers a run of a subset of the integration tests with the results visible [here](https://app.wercker.com/Oracle/weblogic-kubernetes-operator/runs).
+All commits to `develop` must pass the [integration test suite]({{< relref "/developerguide/integration-tests.md" >}}).  Please run these tests locally before submitting a pull request.  Additionally, each push to a branch in our GitHub repository triggers a run of a subset of the integration tests with the results visible [here](http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/).
 
 Please submit pull requests to the `develop` branch unless you are collaborating on a feature and have another target branch.  Please see details on the Oracle Contributor Agreement (OCA) and guidelines for pull requests on the [README]({{< relref "/_index.md#contributing-to-the-oracle-weblogic-server-kubernetes-operator-repository" >}}).
 

docs-source/content/developerguide/building.md

@@ -27,7 +27,7 @@ $ mvn fmt:format
 To build the Javadoc for the operator, issue the following command:
 
 ```
-$ mvn javadoc:javadoc
+$ mvn javadoc:aggregate
 ```
 
 The Javadoc is also available in the GitHub repository [here](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html).

docs-source/content/developerguide/documentation.md

@@ -25,12 +25,12 @@ update to the documentation, follow this process:
 3. Make your documentation updates by editing the source files in
 `docs-source/content`.
 {{% notice note %}}
-Make sure you _only_ check in the changes from the `docs-source/content` area;
+Make sure you check in the changes from the `docs-source/content` area _only_;
 do not build the site and check in the static files.
 {{% /notice %}}
 
 4. If you wish to view your changes, you can run the site locally using
-these commands; the site will be available on the URL shown here:
+these commands. The site will be available on the URL shown here:
 
     ```
     cd docs-source

docs-source/content/developerguide/requirements.md

@@ -8,10 +8,10 @@ weight: 1
 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:
 
 * Git (1.8 or later recommended)
-* Java Developer Kit (1.8u131 or later recommended; please use 1.8, tests will not work on 1.9 or later versions)
-* Apache Maven (3.3 or later recommended)
+* Java Developer Kit (11 required, 11.0.2 recommended)
+* Apache Maven (3.5.3 min, 3.6 recommended)
 
-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.
+The operator is written primarily in Java, BASH shell scripts, and WLST scripts.  
 
 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.
 

docs-source/content/quickstart/create-domain.md

@@ -22,7 +22,7 @@ Follow the directions in the [sample]({{< relref "/samples/simple/domains/domain
 including:
 
     * Copying the sample `kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml` file and updating your copy with the `domainUID` (`sample-domain1`),
-domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`store/oracle/weblogic:12.2.1.3`).
+domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`container-registry.oracle.com/middleware/weblogic:12.2.1.3`).
 
     * Setting `weblogicCredentialsSecretName` to the name of the secret containing the WebLogic credentials, in this case, `sample-domain1-weblogic-credentials`.
 

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

@@ -19,7 +19,7 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
 1. Pull the operator image:
 
     ```bash
-    $ docker pull oracle/weblogic-kubernetes-operator:2.1
+    $ docker pull oracle/weblogic-kubernetes-operator:2.2
     ```
 
 1. Pull the Traefik load balancer image:
@@ -28,14 +28,17 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
     $ docker pull traefik:1.7.6
     ```
 
-1. Pull the WebLogic 12.2.1.3 install image:
+1. Obtain the WebLogic image from the [Oracle Container Registry](https://container-registry.oracle.com).
 
-    ```bash
-    $ docker pull store/oracle/weblogic:12.2.1.3
-    ```  
+    a. First time users, follow these [directions]({{< relref "/userguide/managing-domains/domain-in-image/base-images/_index.md#obtaining-standard-images-from-the-oracle-container-registry" >}}).
+
+    b. Find and then pull the WebLogic 12.2.1.3 install image:
 
+     ```bash
+     $ docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3
+     ```
 
-    {{% notice note %}} The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if you pulled the image prior to that date.
+    {{% notice note %}} The WebLogic Docker image, `weblogic:12.2.1.3`, has all the necessary patches applied.
     {{% /notice %}}