Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Schema
Commits
2435e958
Commit
2435e958
authored
Jul 13, 2021
by
Spencer Sutton
Browse files
Merge branch 'aws-blue-update' into 'master'
AWS Updates See merge request
!133
parents
818e667a
a8f3ce3a
Pipeline
#51944
failed with stages
in 51 minutes and 12 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
provider/schema-aws/maven/settings.xml
View file @
2435e958
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
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
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.
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.
-->
<settings
xmlns=
"http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"
>
<profiles>
<profile>
<id>
aws-osdu-dev-maven
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<repositories>
<repository>
<id>
aws-osdu-dev-maven
</id>
<url>
${env.AWS_OSDU_DEV_MAVEN_URL}
</url>
</repository>
<repository>
<id>
gitlab-os-core-common-maven
</id>
<url>
https://community.opengroup.org/api/v4/projects/67/packages/maven
</url>
</repository>
<repository>
<profiles>
<profile>
<id>
aws-osdu-dev-maven
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<repositories>
<repository>
<id>
aws-osdu-dev-maven
</id>
<url>
${env.AWS_OSDU_DEV_MAVEN_URL}
</url>
</repository>
<repository>
<id>
gitlab-os-core-common-maven
</id>
<url>
https://community.opengroup.org/api/v4/projects/67/packages/maven
</url>
</repository>
<repository>
<id>
gitlab-os-core-lib-aws-maven
</id>
<url>
https://community.opengroup.org/api/v4/projects/68/packages/maven
</url>
</repository>
</repositories>
</profile>
<profile>
<id>
credentialsConfiguration
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<properties>
<deployment.environment>
dev
</deployment.environment>
<aws.accessKeyId>
no-default
</aws.accessKeyId>
<aws.secretKey>
no-default
</aws.secretKey>
<azure.devops.username>
Another-Access-Token-2021
</azure.devops.username>
<azure.devops.token>
no-default
</azure.devops.token>
</properties>
</profile>
</profiles>
</repositories>
</profile>
<profile>
<id>
credentialsConfiguration
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<properties>
<deployment.environment>
dev
</deployment.environment>
<aws.accessKeyId>
no-default
</aws.accessKeyId>
<aws.secretKey>
no-default
</aws.secretKey>
<azure.devops.username>
Another-Access-Token-2021
</azure.devops.username>
<azure.devops.token>
no-default
</azure.devops.token>
</properties>
</profile>
</profiles>
<servers>
<server>
<id>
aws-osdu-dev-maven
</id>
<username>
aws
</username>
<password>
${env.AWS_OSDU_DEV_MAVEN_AUTH_TOKEN}
</password>
</server>
</servers>
<servers>
<server>
<id>
aws-osdu-dev-maven
</id>
<username>
aws
</username>
<password>
${env.AWS_OSDU_DEV_MAVEN_AUTH_TOKEN}
</password>
</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>
</activeProfiles>
<activeProfiles>
<activeProfile>
credentialsConfiguration
</activeProfile>
</activeProfiles>
</settings>
\ No newline at end of file
provider/schema-aws/pom.xml
View file @
2435e958
...
...
@@ -67,7 +67,7 @@
<dependency>
<groupId>
org.opengroup.osdu.core.aws
</groupId>
<artifactId>
os-core-lib-aws
</artifactId>
<version>
0.
9.0
</version>
<version>
0.
10.0-SNAPSHOT
</version>
</dependency>
<dependency>
...
...
provider/schema-aws/src/main/resources/application.properties
View file @
2435e958
...
...
@@ -19,7 +19,7 @@ aws.resource.prefix=${ENVIRONMENT}
AUTHORIZE_API
=
${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
AUTHORIZE_API_KEY
=
PARTITION_API
=
${
ENTITLEMENTS
_BASE_URL}/api/partition/v1
PARTITION_API
=
${
PARTITION
_BASE_URL}/api/partition/v1
LOG_PREFIX
=
schema
...
...
@@ -55,4 +55,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
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment