Merge branch 'ibm-sync-merge' into 'master'

Ibm sync merge

See merge request !33

provider/crs-catalog-ibm/crs-catalog-ocp/pom.xml

@@ -24,7 +24,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <objectify.version>5.1.22</objectify.version>
-        <os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version>
+        <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version>
         <slf4j.version>1.7.25</slf4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>

provider/crs-catalog-ibm/crs-catalog-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpApplication.java

-// Copyright 2017-2019, IBM
-//
-// 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.
+/* Licensed Materials - Property of IBM              */
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
 
 package org.opengroup.osdu.crs;
 

provider/crs-catalog-ibm/crs-catalog-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpConfiguration.java

+/* Licensed Materials - Property of IBM              */
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.crs;
 
 import org.opengroup.osdu.crs.model.CatalogImpl;

provider/crs-catalog-ibm/crs-catalog-ocp/src/main/java/org/opengroup/osdu/crs/security/SecurityConfig.java

+/* Licensed Materials - Property of IBM              */
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.crs.security;
 
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;

testing/catalog_test_ibm/jwt_client.py

+# Licensed Materials - Property of IBM
+# (c) Copyright IBM Corp. 2020. All Rights Reserved.
 
 import os
 from keycloak import KeycloakOpenID

testing/catalog_test_ibm/run_test.py

+# Licensed Materials - Property of IBM
+# (c) Copyright IBM Corp. 2020. All Rights Reserved.
+
 import sys
 sys.path.append("..")
 from dotenv import load_dotenv