merge to the latest develop branch

Author: maggiehe00

build-tools/pom.xml

@@ -1,7 +1,7 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>oracle.kubernetes</groupId>
-  <artifactId>build-tools</artifactId>
-  <version>1.0</version>
-  <name>Build Tools</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>oracle.kubernetes</groupId>
+    <artifactId>build-tools</artifactId>
+    <version>1.0</version>
+    <name>Build Tools</name>
 </project>

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/customized_google_checks.xml

@@ -27,6 +27,11 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="RegexpHeader">
+        <property name="headerFile" value="build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -42,7 +47,7 @@
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
         <module name="LineLength">
-            <property name="max" value="100"/>
+            <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport"/>
@@ -193,7 +198,7 @@
         <module name="CustomImportOrder">
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="customImportOrderRules" value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceBefore">

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header

@@ -0,0 +1,3 @@
+^// Copyright (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\.  All rights reserved\.$
+^// Licensed under the Universal Permissive License v 1\.0 as shown at$
+^// http://oss\.oracle\.com/licenses/upl\.$

buildtime-reports/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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>
 
@@ -19,26 +19,6 @@
             <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>
@@ -48,7 +28,7 @@
             <id>reports</id>
             <activation>
                 <property>
-                  <name>!no-reports</name>
+                    <name>!no-reports</name>
                 </property>
             </activation>
             <build>

docs-source/content/developerguide/building.md

@@ -16,11 +16,7 @@ $ mvn clean install
 
 This will compile the source files, build JAR files containing the compiled classes and libraries needed to run the operator, and will also execute all of the unit tests.
 
-Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).  To automatically update local code to conform to formatting standards, issue the following command:
-
-```
-$ mvn fmt:format
-```
+Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
 
 #### Building Javadoc
 

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.2.0
+    $ docker pull oracle/weblogic-kubernetes-operator:2.2.1
     ```
 
 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.2.0 \
+      --set image=oracle/weblogic-kubernetes-operator:2.2.1 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "domainNamespaces={}" \
       --wait

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.2.0
+$ docker pull oracle/weblogic-kubernetes-operator:2.2.1
 ```
 
 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/configoverrides/_index.md

@@ -336,7 +336,12 @@ spec:
 ---
 ### Debugging
 
-Incorrectly formatted override files may be accepted without warnings or errors and will not prevent WebLogic pods from booting. So, it is important to make sure that the template files are correct in a QA environment, otherwise your WebLogic Servers may start even though critically required overrides are failing to take effect.
+Incorrectly formatted override files may be accepted without warnings or errors and may not prevent WebLogic pods from booting. So, it is important to make sure that the template files are correct in a QA environment, otherwise your WebLogic Servers may start even though critically required overrides are failing to take effect.
+
+On WebLogic Servers that support the `weblogic.SituationalConfig.failBootOnError` system property ( Note: It is not supported in WebLogic Server 12.2.1.3.0 ),
+by default the WebLogic server will fail to boot if any situational configuration files are invalid,
+or if it encounters an error while loading situational configuration files.
+By setting the `FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR` environment variable in the Kubernetes containers for the WebLogic Servers to `false`, you can start up the WebLogic Servers even with incorrectly formatted override files.
 
 * Make sure you've followed each step in the [Step-by-step guide](#step-by-step-guide).
 
@@ -363,9 +368,17 @@ Incorrectly formatted override files may be accepted without warnings or errors
            ...
          ```
   * Look in your `DOMAIN_HOME/optconfig` directory.
-      * This directory, or a subdirectory within this directory, should contain each of your custom situational configuration files.
-      * If it doesn't, then this likely indicates your domain resource `configOverrides` was not set to match your custom override configuration map name, or that your custom override configuration map does not contain your override files.
-
+    * This directory, or a subdirectory within this directory, should contain each of your custom situational configuration files.
+    * If it doesn't, then this likely indicates your domain resource `configOverrides` was not set to match your custom override configuration map name, or that your custom override configuration map does not contain your override files.
+
+* If the Administration Server pod does start but fails to reach ready state or tries to restart:
+  * Check for this message ` WebLogic server failed to start due to missing or invalid situational configuration files` in the Administration Server pod's `kubectl log`
+    * This suggests that the Administration Server failure to start may have been caused by errors found in a configuration override file.
+      * Lines containing the String `situational` may be found in the Administration Server pod log to provide more hints. 
+      * For example:
+        * `<Jun 20, 2019 3:48:45 AM GMT> <Warning> <Management> <BEA-141323> <The situational config file has an invalid format, it is being ignored: XMLSituationalConfigFile[/shared/domains/domain1/optconfig/jdbc/testDS-0527-jdbc-situational-config.xml] because org.xml.sax.SAXParseException; lineNumber: 8; columnNumber: 3; The element type "jdbc:jdbc-driver-params" must be terminated by the matching end-tag "</jdbc:jdbc-driver-params>".`
+      * The warning message suggests a syntax error is found in the provided configuration override file for the testDS JDBC datasource.
+  
 * If you'd like to verify that the situational configuration is taking effect in the WebLogic MBean tree, then one way to do this is to compare the `server config` and `domain config` MBean tree values.
   * The `domain config` value should reflect the original value in your domain home configuration.
   * The `server config` value should reflect the overridden value.

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

@@ -161,7 +161,7 @@ d. Update the `image` property of the domain resource specifying the new image n
      ```
         domain:
               spec:
-                   image: oracle/weblogic-updated:2.2
+                   image: oracle/weblogic-updated:2.2.1
      ```
 e. The operator will now initiate a rolling restart, which will apply the updated image, for all the server pods in the domain.