Merge remote-tracking branch 'origin/develop' into dz_nm_127

Author: rjeberhard

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.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/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/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/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:

docs-source/content/quickstart/install.md

@@ -57,7 +57,7 @@ $ helm install stable/traefik \
     $ helm install kubernetes/charts/weblogic-operator \
       --name sample-weblogic-operator \
       --namespace sample-weblogic-operator-ns \
-      --set image=oracle/weblogic-kubernetes-operator:2.1 \
+      --set image=oracle/weblogic-kubernetes-operator:2.2 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "domainNamespaces={}" \
       --wait

docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

@@ -213,7 +213,7 @@ spec:
     - name: JAVA_OPTIONS
       value: "-Dweblogic.StdoutDebugEnabled=false"
     - name: USER_MEM_ARGS
-      value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
+      value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
     # volumes:
     # - name: weblogic-domain-storage-volume
     #   persistentVolumeClaim:

docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

@@ -170,7 +170,7 @@ spec:
     - name: JAVA_OPTIONS
       value: "-Dweblogic.StdoutDebugEnabled=false"
     - name: USER_MEM_ARGS
-      value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
+      value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
     volumes:
     - name: weblogic-domain-storage-volume
       persistentVolumeClaim:

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

@@ -18,7 +18,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
 
 ```
 $ docker login
-$ docker pull oracle/weblogic-kubernetes-operator:2.1
+$ docker pull oracle/weblogic-kubernetes-operator:2.2
 ```
 
 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/_index.md

@@ -63,7 +63,7 @@ Please be aware of the following important considerations for WebLogic domains r
 * _Host Path Persistent Volumes:_ If using a `hostPath` persistent volume, then it must be available on all worker nodes in the cluster and have read/write/many permissions for all container/pods in the WebLogic Server deployment.  Be aware
   that many cloud provider's volume providers may not support volumes across availability zones.  You may want to use NFS or a clustered file system to work around this limitation.
 
-* _Security Note:_ The `USER_MEM_ARGS` environment variable defaults to `-Djava.security.egd=file:/dev/./urandom` in all WebLogic Server pods and the WebLogic introspection job. It can be explicitly set to another value in your domain resource YAML file using the `env` attribute under the `serverPod` configuration.
+* _Security Note:_ The `USER_MEM_ARGS` environment variable defaults to `-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom` in all WebLogic Server pods and the WebLogic introspection job. It can be explicitly set to another value in your domain resource YAML file using the `env` attribute under the `serverPod` configuration.
 
 The following features are **not** certified or supported in this release: