diff --git a/NOTICE b/NOTICE
index 27cc18554f8de0aeb7c609caac1e86b8b70965ad..f9f9f16a805f3724385a83a92b6e0c1ab0fd6008 100644
--- a/NOTICE
+++ b/NOTICE
@@ -28,7 +28,7 @@ The following software have components provided under the terms of this license:
- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core)
+- Maven Core (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-core/, https://repo1.maven.org/maven2/org/apache/maven/maven-core)
- Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics)
- Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor)
- Maven Plugin Descriptor Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-descriptor)
@@ -189,20 +189,20 @@ The following software have components provided under the terms of this license:
- Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
- Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
- Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox)
-- Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact)
+- Maven Artifact (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-artifact/, https://repo1.maven.org/maven2/org/apache/maven/maven-artifact)
- Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager)
-- Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core)
+- Maven Core (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-core/, https://repo1.maven.org/maven2/org/apache/maven/maven-core)
- Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics)
-- Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model)
+- Maven Model (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-model/, https://repo1.maven.org/maven2/org/apache/maven/maven-model)
- Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor)
-- Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api)
+- Maven Plugin API (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-plugin-api/, https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api)
- Maven Plugin Descriptor Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-descriptor)
- Maven Plugin Parameter Documenter API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-parameter-documenter)
- Maven Plugin Registry Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-registry)
- Maven Profile Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-profile)
- Maven Project (from https://repo1.maven.org/maven2/org/apache/maven/maven-project)
-- Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata)
-- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings)
+- Maven Repository Metadata Model (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-repository-metadata/, https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata)
+- Maven Settings (from https://maven.apache.org/ref/4.0.0-alpha-8/maven-settings/, https://repo1.maven.org/maven2/org/apache/maven/maven-settings)
- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -713,7 +713,6 @@ The following software have components provided under the terms of this license:
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
-- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
diff --git a/devops/aws/chart/.helmignore b/devops/aws/chart/.helmignore
index 6e238cb1cbd9e264bf7790a760830304695e22a1..ddd3d572395f8d2b36dbfce78b7d2218f37567f3 100644
--- a/devops/aws/chart/.helmignore
+++ b/devops/aws/chart/.helmignore
@@ -1,3 +1,17 @@
+# Copyright © Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# 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.
+
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
diff --git a/devops/aws/chart/Chart.yaml b/devops/aws/chart/Chart.yaml
index f5e86b13ec950b9facf9263031e9d89ff150ac24..88876716a45801ca236dc73f3a25fd563ee54754 100644
--- a/devops/aws/chart/Chart.yaml
+++ b/devops/aws/chart/Chart.yaml
@@ -1,3 +1,17 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# 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.
+
apiVersion: v2
name: "os-crs-catalog"
version: __CHART_VERSION__
diff --git a/devops/aws/chart/templates/authorizationpolicy.yaml b/devops/aws/chart/templates/authorizationpolicy.yaml
index e98ab5fd57e7764cc6dff500f4f0709f16a67acd..94a7467f678b53c0277038b2f6a1f0add7adf055 100644
--- a/devops/aws/chart/templates/authorizationpolicy.yaml
+++ b/devops/aws/chart/templates/authorizationpolicy.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.authzpolicy" (list . "os-crs-catalog.authzpolicy") -}}
{{- define "os-crs-catalog.authzpolicy" -}}
## Define overrides for the service authorization policy resource here
diff --git a/devops/aws/chart/templates/deployment.yaml b/devops/aws/chart/templates/deployment.yaml
index 46eca9646e5520a98dc611f0260d21c2dd9b72df..724493c7ae8203020c26f85bb298f4d83df5f0a6 100644
--- a/devops/aws/chart/templates/deployment.yaml
+++ b/devops/aws/chart/templates/deployment.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.deployment" (list . "os-crs-catalog.deployment") -}}
{{- define "os-crs-catalog.deployment" -}}
## Define overrides for the service deployment resource here
diff --git a/devops/aws/chart/templates/destinationrule.yaml b/devops/aws/chart/templates/destinationrule.yaml
index 16e1910d6acb4d0a4dc526a81d94462d48292266..593ae3405952f09afe5c2d7eec2365b556abdb52 100644
--- a/devops/aws/chart/templates/destinationrule.yaml
+++ b/devops/aws/chart/templates/destinationrule.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.destinationrule" (list . "os-crs-catalog.destinationrule") -}}
{{- define "os-crs-catalog.destinationrule" -}}
## Define overrides for the service destination rule resource here
diff --git a/devops/aws/chart/templates/scaledobject.yaml b/devops/aws/chart/templates/scaledobject.yaml
index 47bd02be39e36280ffd2e2972161bcdc1b345943..879cf442fd58fbe37f382bf91122c85dd9a93bfc 100644
--- a/devops/aws/chart/templates/scaledobject.yaml
+++ b/devops/aws/chart/templates/scaledobject.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.scaledobject" (list . "os-crs-catalog.scaledobject") -}}
{{- define "os-crs-catalog.scaledobject" -}}
## Define overrides for the service's scaled object resource here
diff --git a/devops/aws/chart/templates/service.yaml b/devops/aws/chart/templates/service.yaml
index 5328d6aa38e71b3ae99d3461a5725f6caa9b02ff..29373be01e2c9c6cddc73b8ce4440dcf69e1668d 100644
--- a/devops/aws/chart/templates/service.yaml
+++ b/devops/aws/chart/templates/service.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.service" (list . "os-crs-catalog.service") -}}
{{- define "os-crs-catalog.service" -}}
## Define overrides for the service resource here
diff --git a/devops/aws/chart/templates/serviceaccount.yaml b/devops/aws/chart/templates/serviceaccount.yaml
index c207d210917c6bb65e41d972019345ecaca587c0..0c67e19ab08ec38e5f1ff686c87f98ffb1ad57f3 100644
--- a/devops/aws/chart/templates/serviceaccount.yaml
+++ b/devops/aws/chart/templates/serviceaccount.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.serviceaccount" (list . "os-crs-catalog.serviceaccount") -}}
{{- define "os-crs-catalog.serviceaccount" -}}
## Define overrides for the service's service account resource here
diff --git a/devops/aws/chart/templates/serviceparameters.yaml b/devops/aws/chart/templates/serviceparameters.yaml
index 115dedcc304660bb218b3718621d71bbafe69c7c..89cc7b15a5164e8adf98b238ee1b9be9846ddde4 100644
--- a/devops/aws/chart/templates/serviceparameters.yaml
+++ b/devops/aws/chart/templates/serviceparameters.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.serviceparameters" (list . "os-crs-catalog.serviceparameters") -}}
{{- define "os-crs-catalog.serviceparameters" -}}
## Define overrides for the service parameters here
diff --git a/devops/aws/chart/templates/virtualservice.yaml b/devops/aws/chart/templates/virtualservice.yaml
index ae0873aad3b2ca0c899e06e1a0890fcc0562aa47..78f213882af8f5c000bd175979dcafdf02f85849 100644
--- a/devops/aws/chart/templates/virtualservice.yaml
+++ b/devops/aws/chart/templates/virtualservice.yaml
@@ -1,3 +1,17 @@
+{{- /* Copyright 2020 Amazon Web Services
+
+ 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.*/}}
+
{{- template "common.virtualservice" (list . "os-crs-catalog.virtualservice") -}}
{{- define "os-crs-catalog.virtualservice" -}}
## Define overrides for the service's virtual service resource here
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index 5dbb0cd2c512ef8ae9ddc7c0695b5390010fcebf..df43ce6f77aa313c3b0f53a527bd4f2563b643ec 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -1,2 +1,16 @@
+# Copyright © 2020 Amazon Web Services
+#
+# 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.
+
# Service Config
image: __CONTAINER__
\ No newline at end of file
diff --git a/devops/aws/pipeline/override-stages.yml b/devops/aws/pipeline/override-stages.yml
index 8f6cf4ab4d6b222a81ae60a4c013ed3bd6112255..cfdad28ed75336d3f64a425e5dd74d06354d31a8 100644
--- a/devops/aws/pipeline/override-stages.yml
+++ b/devops/aws/pipeline/override-stages.yml
@@ -1,3 +1,17 @@
+# Copyright © 2020 Amazon Web Services
+#
+# 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.
+
aws-test-python:
variables:
MY_TENANT: "osdu"
diff --git a/provider/crs-catalog-aws/build-aws/buildspec.yaml b/provider/crs-catalog-aws/build-aws/buildspec.yaml
index d802e9926142e4cf453c343c17790abd2e813b11..89616448a0236b8705e45f73b614ea1199083659 100644
--- a/provider/crs-catalog-aws/build-aws/buildspec.yaml
+++ b/provider/crs-catalog-aws/build-aws/buildspec.yaml
@@ -54,7 +54,7 @@ phases:
pre_build:
commands:
- echo "Logging in to Amazon ECR..."
- - $(aws ecr get-login --no-include-email --region $AWS_REGION) # authenticate with ECR via the AWS CLI
+ - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${ECR_REGISTRY} # authenticate with ECR via the AWS CLI
build:
commands:
- export REPO_NAME=${PWD##*/}
diff --git a/provider/crs-catalog-aws/build-aws/entrypoint.sh b/provider/crs-catalog-aws/build-aws/entrypoint.sh
index bedb432663e4274aaad71f3757f8f5eefb564b76..9728249c91ee28bbebbe757cd45c1514c95f10a7 100755
--- a/provider/crs-catalog-aws/build-aws/entrypoint.sh
+++ b/provider/crs-catalog-aws/build-aws/entrypoint.sh
@@ -1,2 +1,15 @@
+# Copyright © 2020 Amazon Web Services
+#
+# 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.
java $JAVA_OPTS -jar /app.jar
\ No newline at end of file
diff --git a/provider/crs-catalog-aws/pom.xml b/provider/crs-catalog-aws/pom.xml
index ea0497d8b39ddf5f3e251d0ad9f55f7bced5bcb8..cb5ac1d6dbcfc6a15c5ebe96b6a1429816b80221 100644
--- a/provider/crs-catalog-aws/pom.xml
+++ b/provider/crs-catalog-aws/pom.xml
@@ -57,11 +57,37 @@
<groupId>org.opengroup.osdu.crs-catalog-service</groupId>
<artifactId>crs-catalog-core</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>5.6.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <version>2.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ <version>2.7.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>5.3.27</version>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <version>2.7.11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -82,7 +108,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
+ <version>5.3.28</version>
</dependency>
<!-- Testing packages -->
@@ -105,6 +131,10 @@
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsApplicationAWS.java b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsApplicationAWS.java
index e7d448a67050cf5671a15cd871ba0a5da11092a7..90fb050efe21a3dcfbd37653eccf44319dc39bc9 100644
--- a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsApplicationAWS.java
+++ b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsApplicationAWS.java
@@ -1,16 +1,18 @@
-/* Copyright © 2020 Amazon Web Services
-
-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. */
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* 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.
+*/
package org.opengroup.osdu.crs;
diff --git a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsConfigurationAWS.java b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsConfigurationAWS.java
index 58b41dccd64212ff2e38660d52c4ad3dce4b13e2..b5df8dff221b31f73a3ccbdc2bff4dc61b6eab1b 100644
--- a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsConfigurationAWS.java
+++ b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/CrsConfigurationAWS.java
@@ -1,16 +1,18 @@
-/* Copyright © 2020 Amazon Web Services
-
-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. */
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* 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.
+*/
package org.opengroup.osdu.crs;
diff --git a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/security/AuthSecurityConfig.java b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/security/AuthSecurityConfig.java
index 907a6bddefc37ef1fb84eef6f739c1502bc6ea78..21a39e6ef6c841a649367f59137635df98845b72 100644
--- a/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/security/AuthSecurityConfig.java
+++ b/provider/crs-catalog-aws/src/main/java/org/opengroup/osdu/crs/security/AuthSecurityConfig.java
@@ -1,16 +1,18 @@
-/* Copyright © 2020 Amazon Web Services
-
-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. */
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* 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.
+*/
package org.opengroup.osdu.crs.security;
diff --git a/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/AuthSecurityConfigTest.java b/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/AuthSecurityConfigTest.java
index decaa857f32985c1558a1d3c4ba42d22dfe605d9..bd0ef89d800fc31ca6f6d3af35dc4d66d06286e1 100644
--- a/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/AuthSecurityConfigTest.java
+++ b/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/AuthSecurityConfigTest.java
@@ -1,3 +1,19 @@
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* 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.
+*/
+
package org.opengroup.osdu.crs.security;
import org.junit.Before;
diff --git a/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/UnauthorizedErrorResponseTest.java b/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/UnauthorizedErrorResponseTest.java
index 0e24f23c8b1bedc35c7ecf057a6ae7d0974fecf4..88639fc95f4086b108e96cd68c237f0e944ee939 100644
--- a/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/UnauthorizedErrorResponseTest.java
+++ b/provider/crs-catalog-aws/src/test/java/org/opengroup/osdu/crs/security/UnauthorizedErrorResponseTest.java
@@ -1,3 +1,19 @@
+/**
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* 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.
+*/
+
package org.opengroup.osdu.crs.security;
import org.junit.Test;