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

ibm develop sync with og master

See merge request !35

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

@@ -15,7 +15,7 @@
         <app.version>1</app.version>
         <app.id>crs-converter-ocp</app.id>
         <!--azure.version>2.3.2</azure.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>
     </properties>
 
     <prerequisites>
@@ -72,7 +72,6 @@
                     </execution>
                 </executions>
 			</plugin>
-
         </plugins>
     </build>
 

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

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

provider/crs-converter-ibm/crs-converter-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 java.io.IOException;
@@ -52,17 +55,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Acce
     @Override
     protected void configure(HttpSecurity http) throws Exception {
        
- http.csrf().disable()
-        .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER)
-        .and()
-        .authorizeRequests()
-        .antMatchers(AUTH_WHITELIST).permitAll()
-        .anyRequest().authenticated()
-        .and()
-        .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class);
-        //.oauth2ResourceServer().jwt();      
-
-	 
+		 http.csrf().disable()
+		        .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER)
+		        .and()
+		        .authorizeRequests()
+		        .antMatchers(AUTH_WHITELIST).permitAll()
+		        .anyRequest().authenticated()
+		        .and()
+		        .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class);
+		        //.oauth2ResourceServer().jwt();	 
     }
     
     public SecurityConfig(@Value("${ENTITLEMENT_URL}") String entitlementsUrl, HandlerExceptionResolver handlerExceptionResolver) {
@@ -98,6 +99,5 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Acce
         out.print(body);
         out.flush();
     }
-
     
 }
\ No newline at end of file

testing/crs_converter_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/crs_converter_test_ibm/run_test.py

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