diff --git a/provider/legal-aws/maven/settings.xml b/provider/legal-aws/maven/settings.xml index 3dbde15f47c27d083537fa2f0b280f97f9aa54b5..7a6c05029421b0b3d5f66b77b4a38ea57a72bdfb 100644 --- a/provider/legal-aws/maven/settings.xml +++ b/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> diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 29dacd59512aab7c6707c89b43aefb09061702a1..ceb55521161bbb2280894849c566fa42f9a28678 100644 --- a/provider/legal-aws/pom.xml +++ b/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> diff --git a/provider/legal-aws/src/main/resources/application.properties b/provider/legal-aws/src/main/resources/application.properties index 3af3c71e2c4052b61f5e036f0675c26992d29f64..ab892709b8975aba19af2599a335d1f4e6b3e4d8 100644 --- a/provider/legal-aws/src/main/resources/application.properties +++ b/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 diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index 98ed09bd479fff9820d7b4e8201cea3a485838fa..96e74475408c56a834cadb13b74e7cf7c366e513 100644 --- a/testing/legal-test-aws/pom.xml +++ b/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 -->