Merging aws changes

provider/legal-aws/maven/settings.xml

@@ -63,15 +63,14 @@
         </server>
     </servers>
 
-    <!-- CodeArtifact doesn't support external repos yet that aren't Maven Central.  ETA Q4 2020. -->
-    <!-- <mirrors> -->
-    <!-- <mirror> -->
-    <!-- <id>aws-osdu-dev-maven</id> -->
-    <!-- <name>aws-osdu-dev-maven</name> -->
-    <!-- <url>https://osdu-dev-888733619319.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/</url> -->
-    <!-- <mirrorOf>*,!gitlab-os-core-common-maven</mirrorOf> -->
-    <!-- </mirror> -->
-    <!-- </mirrors> -->
+    <mirrors>
+        <mirror>
+            <id>aws-osdu-dev-maven</id>
+            <name>aws-osdu-dev-maven</name>
+            <url>https://osdu-dev-${AWS_ACCOUNT_ID}.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/</url>
+            <mirrorOf>central,!gitlab-os-core-common-maven,!gitlab-os-core-lib-aws-maven</mirrorOf>
+        </mirror>
+    </mirrors>
 
     <activeProfiles>
         <activeProfile>credentialsConfiguration</activeProfile>

provider/legal-aws/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.9.0</version>
+            <version>0.9.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>

provider/legal-aws/src/main/resources/application.properties

@@ -14,7 +14,7 @@ aws.region=${AWS_REGION}
 
 REGION=${AWS_REGION}
 AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
-PARTITION_API=${ENTITLEMENTS_BASE_URL}/api/partition/v1
+PARTITION_API=${PARTITION_BASE_URL}/api/partition/v1
 LEGAL_HOSTNAME=notused
 CRON_JOB_IP=10.0.0.1
 ACCEPT_HTTP=true
@@ -37,4 +37,6 @@ server.ssl.key-store-type=PKCS12
 server.ssl.key-store=${SSL_KEY_STORE_PATH:/certs/osduonaws.p12}
 server.ssl.key-alias=${SSL_KEY_ALIAS:osduonaws}
 server.ssl.key-password=${SSL_KEY_PASSWORD:}
-server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:}
\ No newline at end of file
+server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:}
+
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration

testing/legal-test-aws/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.9.0</version>
+            <version>0.9.2-SNAPSHOT</version>
         </dependency>
 
         <!-- AWS managed packages -->