Merge pull request #336 in DM/herd from develop to master

* commit 'bbeb9ceed72593c0a5fc0e2838e09f0305890c6b':
  Added initial version of the herd.postgres.0.70.0-to-0.71.0.upgrade.sql script
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-10834: Support for Kerberos Attributes in EMR Cluster Definition
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-10653 ( Allow non-backwards compatible Schema changes based on Format indicator)
  DM-3103: Factory CQ - Call Cluster Mgmt without long running query
  DM-10584 Remove BDef Index Search from code base and documentation
  Increment Maven POM version numbers to 0.71.0-SNAPSHOT

herd-build/herd-build-tools/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd build tools</name>

herd-build/herd-docs/herd-docs-javadoc/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-docs</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs javadoc</name>

herd-build/herd-docs/herd-docs-swagger/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-docs</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs swagger</name>

herd-build/herd-docs/pom.xml

@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs</name>

herd-build/herd-scripts/herd-scripts-bootstrap/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <description>This project contains the core herd EMR bootstrap scripts.</description>

herd-build/herd-scripts/herd-scripts-cloud-formation/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts cloud formation</name>

herd-build/herd-scripts/herd-scripts-sql/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts sql</name>

herd-build/herd-scripts/herd-scripts-sql/src/main/resources/herd.postgres.0.70.0-to-0.71.0.upgrade.sql

@@ -0,0 +1,26 @@
+/*
+* Copyright 2015 herd contributors
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+--bus_objct_frmt
+
+alter table bus_objct_frmt add column alw_non_bckwrds_cmptbl_chgs_fl char(1);
+
+alter table bus_objct_frmt add constraint bus_objct_frmt_ck3 check (alw_non_bckwrds_cmptbl_chgs_fl in ('Y', 'N'));
+
+--scrty_fn_lk
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_FORMAT_SCHEMA_BACKWARDS_COMPATIBILITY_PUT', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');

herd-build/herd-scripts/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts</name>

herd-build/herd-swaggergen-maven-plugin/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd swaggergen maven plugin</name>

herd-build/pom.xml

@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd build</name>

herd-code/herd-app/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd app</name>

herd-code/herd-core/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd core</name>

herd-code/herd-dao/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.70.0-SNAPSHOT</version>
+      <version>0.71.0-SNAPSHOT</version>
    </parent>
 
    <name>herd dao</name>

herd-code/herd-dao/src/main/java/org/finra/herd/dao/EmrClusterDefinitionDao.java

@@ -19,34 +19,27 @@
 
 import org.finra.herd.model.api.xml.EmrClusterDefinitionKey;
 import org.finra.herd.model.jpa.EmrClusterDefinitionEntity;
+import org.finra.herd.model.jpa.NamespaceEntity;
 
 public interface EmrClusterDefinitionDao extends BaseJpaDao
 {
     /**
-     * Retrieves EMR cluster definition entity by alternate key.
+     * Retrieves an EMR cluster definition entity by namespace entity and EMR cluster definition name.
      *
-     * @param emrClusterDefinitionKey the EMR cluster definition key
+     * @param namespaceEntity the namespace entity
+     * @param emrClusterDefinitionName the name of the EMR cluster definition (case-insensitive)
      *
      * @return the EMR cluster definition entity
      */
-    public EmrClusterDefinitionEntity getEmrClusterDefinitionByAltKey(EmrClusterDefinitionKey emrClusterDefinitionKey);
+    EmrClusterDefinitionEntity getEmrClusterDefinitionByNamespaceAndName(NamespaceEntity namespaceEntity, String emrClusterDefinitionName);
 
     /**
-     * Retrieves EMR cluster definition entity by alternate key.
+     * Gets a list of keys for all EMR cluster definitions defined in the system for the specified namespace. The result list is sorted by EMR cluster
+     * definition name in ascending order.
      *
-     * @param namespace the namespace (case-insensitive)
-     * @param definitionName the EMR cluster definition name (case-insensitive)
-     *
-     * @return the EMR cluster definition entity
-     */
-    public EmrClusterDefinitionEntity getEmrClusterDefinitionByAltKey(String namespace, String definitionName);
-
-    /**
-     * Gets a list of keys for all EMR cluster definitions defined in the system for the specified namespace.
-     *
-     * @param namespace the namespace (case-insensitive)
+     * @param namespaceEntity the namespace entity
      *
      * @return the list of EMR cluster definition keys
      */
-    public List<EmrClusterDefinitionKey> getEmrClusterDefinitionsByNamespace(String namespace);
+    List<EmrClusterDefinitionKey> getEmrClusterDefinitionKeysByNamespace(NamespaceEntity namespaceEntity);
 }