oracle
diff --git a/‎Dockerfile‎
Lines changed: 9 additions & 9 deletions b/‎Dockerfile‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎LICENSE.txt‎
Lines changed: 1 addition & 1 deletion b/‎LICENSE.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎build-tools/checkstyle/customized_google_checks.xml‎
Lines changed: 1 addition & 1 deletion b/‎build-tools/checkstyle/customized_google_checks.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎build/kube.config‎
Lines changed: 0 additions & 19 deletions b/‎build/kube.config‎
Lines changed: 0 additions & 19 deletions
diff --git a/‎buildDockerImage.sh‎
Lines changed: 1 addition & 1 deletion b/‎buildDockerImage.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎buildtime-reports/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎buildtime-reports/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎deploy.sh‎
Lines changed: 0 additions & 11 deletions b/‎deploy.sh‎
Lines changed: 0 additions & 11 deletions
diff --git a/‎docs-source/content/_index.md‎
Lines changed: 6 additions & 31 deletions b/‎docs-source/content/_index.md‎
Lines changed: 6 additions & 31 deletions
diff --git a/‎docs-source/content/developerguide/backwards-compatibility.md‎
Lines changed: 1 addition & 1 deletion b/‎docs-source/content/developerguide/backwards-compatibility.md‎
Lines changed: 1 addition & 1 deletion
@@ -20,23 +20,23 @@ RUN set -eux; \
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
-ENV JAVA_HOME /usr/local/graalvm-ce-java11
+ENV JAVA_HOME /usr/local/java
 ENV PATH /operator:$JAVA_HOME/bin:$PATH
 
-ENV JAVA_VERSION 11.0.7
-ENV JAVA_URL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.2/graalvm-ce-java11-linux-amd64-19.3.2.tar.gz
+ENV JAVA_VERSION 14.0.2
+ENV JAVA_URL https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/11/GPL/openjdk-14.0.2_linux-x64_bin.tar.gz
 
 # Install Java and make the operator run with a non-root user id (1000 is the `oracle` user)
 RUN set -eux; \
-    curl -fL -o /graalvm-ce-java11.tar.gz "$JAVA_URL"; \
+    curl -fL -o /jdk.tar.gz "$JAVA_URL"; \
     mkdir -p "$JAVA_HOME"; \
-    tar --extract --file /graalvm-ce-java11.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
-    rm /graalvm-ce-java11.tar.gz; \
+    tar --extract --file /jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
+    rm /jdk.tar.gz; \
     mkdir /usr/java; \
     ln -sfT "$JAVA_HOME" /usr/java/default; \
     ln -sfT "$JAVA_HOME" /usr/java/latest; \
-    rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods" "$JAVA_HOME/languages" "$JAVA_HOME/tools" "$JAVA_HOME/lib/svm" "$JAVA_HOME/lib/installer" "$JAVA_HOME/lib/visualvm" "$JAVA_HOME/lib/truffle" "$JAVA_HOME/lib/polyglot"; \
-    rm -f "$JAVA_HOME/lib/src.zip" "$JAVA_HOME/lib/libjvmcicompiler.so" "$JAVA_HOME/bin/polyglot"; \
+    rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods"; \
+    rm -f "$JAVA_HOME/lib/src.zip"; \
     for bin in "$JAVA_HOME/bin/"*; do \
         base="$(basename "$bin")"; \
         [ ! -e "/usr/bin/$base" ]; \
@@ -60,4 +60,4 @@ HEALTHCHECK --interval=1m --timeout=10s \
 
 WORKDIR /operator/
 
-CMD ["/operator/operator.sh"]
+CMD ["/operator/operator.sh"]
@@ -1,4 +1,4 @@
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 
 
@@ -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](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.6.0.
-This release was published on June 22, 2020.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.0.0.
+This release was published on July 17, 2020.
 ***
 
 # Documentation
 
@@ -302,7 +302,7 @@
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowedAnnotations" value="Override, Test, Before, After"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
         </module>
         <module name="MethodName">
 
@@ -33,7 +33,7 @@ while getopts "t:" optname; do
   esac
 done
 
-IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:2.6.0}
+IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:3.0.0}
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
 # Proxy settings
 
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>2.6.0</version>
+        <version>3.0.0</version>
     </parent>
 
     <artifactId>buildtime-reports</artifactId>
 
@@ -23,37 +23,12 @@ using the operator to deploy and run a WebLogic domain container-packaged web ap
 ***
 #### Current production release
 
-The [current production release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.6.0.
-This release was published on June 22, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
-
-#### Preview of next major release
-
-The [current preview release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.0.0-rc1 (release candidate).
-This release candidate is suitable for use by early adopters who wish to test 3.0.0 features and provide feedback.
-This release candidate was published on May 8, 2020.  There may be additional release candidates before the final 3.0.0 release.
-
-This release candidate introduces _non-backward compatible_ changes.  This release candidate cannot be run in the same
-cluster as another release of the operator.  You can upgrade from 2.6.0 to 3.0.0-rc1 without needing to restart or recreate
-any existing domains. However, please note that we _do_ plan to support running the final 3.0.0
-release in the same cluster with at least one 2.x release of the operator to allow for staged migration.
-
-The feature changes in 3.0.0-rc1 are:
-
-* Introduction of a new ["Model In Image"]({{% relref "/userguide/managing-domains/model-in-image" %}}) feature which allows you to have a domain
-  created at pod startup time from a WebLogic Deploy Tool model and archive.
-  This supports user-requested use cases like creating multiple domains from
-  the same model and automated updating of the domain based on model changes.
-  The operator automates management of the domain encryption keys to ensure
-  that they are not changed during domain updates.
-  We provide a [sample]({{% relref "/samples/simple/domains/model-in-image" %}}) that
-  demonstrates the key use cases for this feature.
-* Support for running the operator on Kubernetes 1.16.
-* Deprecation and removal of support for running the operator on Kubernetes 1.13
-  and earlier versions.
-* Deprecation and removal of support for Helm 2.x.  Helm 2.x uses the "tiller" pod
-  which needs to run with elevated privileges (`cluster-admin` or very close to that)
-  and which could be a vector for a privilege escalation attack.  Helm 3.x removes
-  Tiller and does not create the same exposure.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.0.0.
+This release was published on July 17, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
+
+This release introduces _non-backward compatible_ changes; however, operators using this release can be run in the same
+Kubernetes cluster as operators using the 2.6.0 version allowing for staged migration. You can replace a 2.6.0 operator with a 3.x operator without needing to recreate any existing domains; however, you must delete the 2.6.0 Helm release and then install the 3.x version rather than using a Helm upgrade. When the 3.x operator starts, it will roll any running WebLogic Server instances
+started by the 2.6.0 operator. See the operator upgrade guide [here]({{< relref "/userguide/managing-operators/installation/_index.md#upgrade-the-operator" >}}).
 
 ***
 
 
@@ -5,4 +5,4 @@ draft: false
 weight: 9
 ---
 
-Starting with the 2.0.1 release, operator releases must be backward compatible with respect to the domain resource schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface.  We will maintain compatibility for three releases, except in the case of a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.
+Starting with the 2.0.1 release, operator releases must be backward compatible with respect to the Domain schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface.  We will maintain compatibility for three releases, except in the case of a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.`
	`1`	`+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.`
`2`	`2`
`3`	`3`	`The Universal Permissive License (UPL), Version 1.0`
`4`	`4`