Skip to content
GitLab
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
27a279fe
Commit
27a279fe
authored
Nov 20, 2020
by
Riabokon Stanislav(EPAM)[GCP]
Committed by
Rostislav Dublin (EPAM)
Nov 20, 2020
Browse files
Added <exclusion>google-cloud-core-http</exclusion>
for google-cloud-datastore.
parent
726deb21
Changes
10
Hide whitespace changes
Inline
Side-by-side
.mvn/community-maven.settings.xml
View file @
27a279fe
...
...
@@ -7,7 +7,15 @@
<activeByDefault>
true
</activeByDefault>
</activation>
<properties>
<gitlab-server>
community-maven-via-job-token
</gitlab-server>
<repo.releases.id>
community-maven-repo
</repo.releases.id>
<publish.snapshots.id>
community-maven-via-job-token
</publish.snapshots.id>
<publish.releases.id>
community-maven-via-job-token
</publish.releases.id>
<repo.releases.url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</repo.releases.url>
<publish.snapshots.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.snapshots.url>
<publish.releases.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.releases.url>
</properties>
</profile>
...
...
@@ -22,7 +30,15 @@
</property>
</activation>
<properties>
<gitlab-server>
community-maven-via-private-token
</gitlab-server>
<repo.releases.id>
community-maven-repo
</repo.releases.id>
<publish.snapshots.id>
community-maven-via-private-token
</publish.snapshots.id>
<publish.releases.id>
community-maven-via-private-token
</publish.releases.id>
<repo.releases.url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</repo.releases.url>
<publish.snapshots.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.snapshots.url>
<publish.releases.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.releases.url>
</properties>
</profile>
</profiles>
...
...
@@ -51,5 +67,17 @@
</httpHeaders>
</configuration>
</server>
<server>
<id>
azure-auth
</id>
<configuration>
<tenant>
${env.AZURE_TENANT_ID}
</tenant>
<client>
${env.AZURE_CLIENT_ID}
</client>
<key>
${env.AZURE_CLIENT_SECRET}
</key>
<environment>
AZURE
</environment>
</configuration>
</server>
</servers>
</settings>
\ No newline at end of file
</settings>
pom.xml
View file @
27a279fe
...
...
@@ -44,24 +44,43 @@
<module>
provider/schema-gcp
</module>
<module>
provider/schema-ibm
</module>
<module>
provider/schema-azure
</module>
<module>
testing/schema-test-core
</module>
</modules>
<repositories>
<repository>
<id>
${
gitlab-server
}
</id>
<url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</url>
<id>
${
repo.releases.id
}
</id>
<url>
${repo.releases.url}
</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>
${
gitlab-server
}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
<id>
${
publish.releases.id
}
</id>
<url>
${publish.releases.url}
</url>
</repository>
<snapshotRepository>
<id>
${
gitlab-server
}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
<id>
${
publish.snapshots.id
}
</id>
<url>
${publish.snapshots.url}
</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>
Default
</id>
<activation>
<property>
<name>
!repo.releases.id
</name>
</property>
</activation>
<properties>
<repo.releases.id>
community-maven-repo
</repo.releases.id>
<publish.snapshots.id>
community-maven-via-job-token
</publish.snapshots.id>
<publish.releases.id>
community-maven-via-job-token
</publish.releases.id>
<repo.releases.url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</repo.releases.url>
<publish.snapshots.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.snapshots.url>
<publish.releases.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.releases.url>
</properties>
</profile>
</profiles>
</project>
provider/schema-aws/pom.xml
View file @
27a279fe
...
...
@@ -21,8 +21,9 @@
<artifactId>
os-schema
</artifactId>
<groupId>
org.opengroup.osdu
</groupId>
<version>
0.0.1
</version>
<relativePath>
../../
</relativePath>
<relativePath>
../../
pom.xml
</relativePath>
</parent>
<artifactId>
os-schema-aws
</artifactId>
<description>
AWS implementation of the OSDU Schema Service
</description>
<packaging>
jar
</packaging>
...
...
@@ -112,23 +113,4 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</repository>
<snapshotRepository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</snapshotRepository>
</distributionManagement>
</project>
provider/schema-gcp/pom.xml
View file @
27a279fe
...
...
@@ -6,8 +6,9 @@
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema
</artifactId>
<version>
0.0.1
</version>
<relativePath>
../../
</relativePath>
<relativePath>
../../
pom.xml
</relativePath>
</parent>
<artifactId>
os-schema-gcp
</artifactId>
<description>
Google cloud related implementation staff.
</description>
<packaging>
jar
</packaging>
...
...
provider/schema-ibm/pom.xml
View file @
27a279fe
...
...
@@ -6,7 +6,7 @@
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema
</artifactId>
<version>
0.0.1
</version>
<relativePath>
../../
</relativePath>
<relativePath>
../../
pom.xml
</relativePath>
</parent>
<artifactId>
os-schema-ibm
</artifactId>
<description>
IBM cloud related implementation staff.
</description>
...
...
@@ -14,7 +14,7 @@
<properties>
<start-class>
org.opengroup.osdu.schema.provider.ibm.app.SchemaIBMApplication
</start-class>
<os-core-lib-ibm.version>
0.
0.19
-SNAPSHOT
</os-core-lib-ibm.version>
<os-core-lib-ibm.version>
0.
3.8
-SNAPSHOT
</os-core-lib-ibm.version>
</properties>
...
...
@@ -58,28 +58,8 @@
<version>
5.4.0
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</repository>
<snapshotRepository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
...
...
schema-core/pom.xml
View file @
27a279fe
...
...
@@ -127,25 +127,6 @@
</dependencies>
<repositories>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</repository>
<snapshotRepository>
<id>
${gitlab-server}
</id>
<url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
...
...
testing/pom.xml
0 → 100644
View file @
27a279fe
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema-test
</artifactId>
<version>
0.0.1
</version>
<description>
Schema Service Integration Test Root Project
</description>
<packaging>
pom
</packaging>
<licenses>
<license>
<name>
Apache License, Version 2.0
</name>
<url>
https://www.apache.org/licenses/LICENSE-2.0.txt
</url>
<distribution>
repo
</distribution>
</license>
</licenses>
<modules>
<module>
schema-test-core
</module>
<module>
schema-test-aws
</module>
<module>
schema-test-gcp
</module>
</modules>
<repositories>
<repository>
<id>
${repo.releases.id}
</id>
<url>
${repo.releases.url}
</url>
</repository>
<repository>
<id>
spring.io
</id>
<url>
https://repo.spring.io/milestone
</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>
${publish.releases.id}
</id>
<url>
${publish.releases.url}
</url>
</repository>
<snapshotRepository>
<id>
${publish.snapshots.id}
</id>
<url>
${publish.snapshots.url}
</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>
Default
</id>
<activation>
<property>
<name>
!repo.releases.id
</name>
</property>
</activation>
<properties>
<repo.releases.id>
community-maven-repo
</repo.releases.id>
<publish.snapshots.id>
community-maven-via-job-token
</publish.snapshots.id>
<publish.releases.id>
community-maven-via-job-token
</publish.releases.id>
<repo.releases.url>
https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</repo.releases.url>
<publish.snapshots.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.snapshots.url>
<publish.releases.url>
https://community.opengroup.org/api/v4/projects/26/packages/maven
</publish.releases.url>
</properties>
</profile>
</profiles>
</project>
\ No newline at end of file
testing/schema-test-aws/pom.xml
0 → 100644
View file @
27a279fe
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema-test
</artifactId>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema-test-aws
</artifactId>
<version>
0.0.1
</version>
<packaging>
jar
</packaging>
<name>
schema-test-aws
</name>
<description>
AWS implementation of test project for schema service
</description>
</project>
\ No newline at end of file
testing/schema-test-core/pom.xml
View file @
27a279fe
...
...
@@ -5,14 +5,18 @@
<parent>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema
</artifactId>
<artifactId>
os-schema
-test
</artifactId>
<version>
0.0.1
</version>
<relativePath>
../
../
pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
<artifactId>
schema-test-core
</artifactId>
<properties>
<os-core-lib-ibm.version>
0.3.6-SNAPSHOT
</os-core-lib-ibm.version>
<os-core-lib-azure.version>
0.0.42
</os-core-lib-azure.version>
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.source>
1.8
</maven.compiler.source>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
</properties>
<dependencies>
...
...
@@ -77,7 +81,7 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
core-lib-azure
</artifactId>
<version>
0.0.17
</version>
<version>
${os-core-lib-azure.version}
</version>
</dependency>
<dependency>
...
...
@@ -93,6 +97,20 @@
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<!-- Inherit managed dependencies from core-lib-azure -->
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
core-lib-azure
</artifactId>
<version>
${os-core-lib-azure.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
...
...
testing/schema-test-gcp/pom.xml
0 → 100644
View file @
27a279fe
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema-test
</artifactId>
<version>
0.0.1
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-schema-test-gcp
</artifactId>
<version>
0.0.1
</version>
<packaging>
jar
</packaging>
<name>
schema-test-gcp
</name>
<description>
GCP implementation of test project for schema service
</description>
</project>
\ No newline at end of file
Rucha Deshpande
@deshruch
mentioned in merge request
!61 (merged)
·
Dec 15, 2020
mentioned in merge request
!61 (merged)
mentioned in merge request !61
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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