A few extra unintentional changes reverted

Author: rjeberhard

docs/domains/Domain.json

@@ -32,13 +32,13 @@
             "IF_NEEDED"
           ]
         },
-        "restartVersion": {
-          "description": "If present, every time this value is updated the operator will restart the required servers.",
-          "type": "string"
-        },
         "adminService": {
           "description": "Configures which of the admin server\u0027s WebLogic admin channels should be exposed outside the Kubernetes cluster via a node port service.",
           "$ref": "#/definitions/AdminService"
+        },
+        "restartVersion": {
+          "description": "If present, every time this value is updated the operator will restart the required servers.",
+          "type": "string"
         }
       }
     },
@@ -434,6 +434,10 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
           }
         },
+        "resources": {
+          "description": "Memory and cpu minimum requirements and limits for the server.",
+          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+        },
         "readinessProbe": {
           "description": "Settings for the readiness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
@@ -442,10 +446,6 @@
           "description": "The annotations to be attached to generated resources.",
           "$ref": "#/definitions/Map"
         },
-        "resources": {
-          "description": "Memory and cpu minimum requirements and limits for the server.",
-          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
-        },
         "containerSecurityContext": {
           "description": "Container-level security attributes. Will override any matching pod-level attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
@@ -457,10 +457,6 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
-        "labels": {
-          "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
-          "$ref": "#/definitions/Map"
-        },
         "nodeSelector": {
           "description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
           "$ref": "#/definitions/Map"
@@ -471,6 +467,10 @@
           "items": {
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount"
           }
+        },
+        "labels": {
+          "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
+          "$ref": "#/definitions/Map"
         }
       }
     },

docs/domains/index.html

@@ -952,13 +952,13 @@
             "IF_NEEDED"
           ]
         },
-        "restartVersion": {
-          "description": "If present, every time this value is updated the operator will restart the required servers.",
-          "type": "string"
-        },
         "adminService": {
           "description": "Configures which of the admin server\u0027s WebLogic admin channels should be exposed outside the Kubernetes cluster via a node port service.",
           "$ref": "#/definitions/AdminService"
+        },
+        "restartVersion": {
+          "description": "If present, every time this value is updated the operator will restart the required servers.",
+          "type": "string"
         }
       }
     },
@@ -1354,6 +1354,10 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
           }
         },
+        "resources": {
+          "description": "Memory and cpu minimum requirements and limits for the server.",
+          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+        },
         "readinessProbe": {
           "description": "Settings for the readiness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
@@ -1362,10 +1366,6 @@
           "description": "The annotations to be attached to generated resources.",
           "$ref": "#/definitions/Map"
         },
-        "resources": {
-          "description": "Memory and cpu minimum requirements and limits for the server.",
-          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
-        },
         "containerSecurityContext": {
           "description": "Container-level security attributes. Will override any matching pod-level attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
@@ -1377,10 +1377,6 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
-        "labels": {
-          "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
-          "$ref": "#/definitions/Map"
-        },
         "nodeSelector": {
           "description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
           "$ref": "#/definitions/Map"
@@ -1391,6 +1387,10 @@
           "items": {
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount"
           }
+        },
+        "labels": {
+          "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
+          "$ref": "#/definitions/Map"
         }
       }
     },

model/pom.xml

@@ -107,7 +107,7 @@
             <configuration>
               <resources>
                 <resource>
-                  <directory>${project.build.outputDirectory}/schema/oracle/kubernetes/weblogic/domain/v3</directory>
+                  <directory>${project.build.outputDirectory}/schema/oracle/kubernetes/weblogic/domain/model</directory>
                 </resource>
               </resources>
               <outputDirectory>

model/src/test/java/oracle/kubernetes/weblogic/domain/model/BaseConfigurationTestBase.java

@@ -2,10 +2,7 @@
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
-package oracle.kubernetes.weblogic.domain.model; // Copyright 2018, 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.
+package oracle.kubernetes.weblogic.domain.model;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;

operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupportTest.java

@@ -151,8 +151,8 @@ public void afterDeletePod_podsInDifferentNamespacesStillExist() {
   public void listPodSelectsByLabel() {
     V1Pod pod1 = createLabeledPod("ns1", "pod1", ImmutableMap.of("k1", "v1", "k2", "v2"));
     V1Pod pod2 = createLabeledPod("ns1", "pod2", ImmutableMap.of("k1", "v2"));
-    V1Pod pod3 = createLabeledPod("ns1", "pod3", ImmutableMap.of("k1", "v1", "k2", "model"));
-    V1Pod pod4 = createLabeledPod("ns2", "pod4", ImmutableMap.of("k1", "v1", "k2", "model"));
+    V1Pod pod3 = createLabeledPod("ns1", "pod3", ImmutableMap.of("k1", "v1", "k2", "v2"));
+    V1Pod pod4 = createLabeledPod("ns2", "pod4", ImmutableMap.of("k1", "v1", "k2", "v2"));
     testSupport.defineResources(pod1, pod2, pod3, pod4);
 
     TestResponseStep<V1PodList> responseStep = new TestResponseStep<>();

operator/src/test/java/oracle/kubernetes/operator/rest/RestTest.java

@@ -155,7 +155,7 @@ public void testLatestVersion() {
 
   @Test
   public void testNonExistingVersion() {
-    String href = OPERATOR_HREF + "/model";
+    String href = OPERATOR_HREF + "/v2";
     Response r = request(href).get();
     verifyNotFound(r);
     ErrorModel want = new ErrorModel(Status.NOT_FOUND.getStatusCode(), href);