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
Data Flow
Data Enrichment
wks
Commits
907d8158
Commit
907d8158
authored
May 20, 2021
by
harshit aggarwal
Browse files
Merge branch 'master' into haaggarw/UpdatingConfig
parents
b4cf7807
7c140620
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
NOTICE
View file @
907d8158
This diff is collapsed.
Click to expand it.
pom.xml
View file @
907d8158
...
...
@@ -24,7 +24,7 @@
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-dependencies
</artifactId>
<version>
2.
2.6
.RELEASE
</version>
<version>
2.
3.10
.RELEASE
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
...
...
provider/wks-azure/pom.xml
View file @
907d8158
...
...
@@ -96,6 +96,16 @@
<artifactId>
mockito-junit-jupiter
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
net.minidev
</groupId>
<artifactId>
json-smart
</artifactId>
<version>
2.4.7
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-cbor
</artifactId>
<version>
2.12.3
</version>
</dependency>
</dependencies>
<repositories>
...
...
provider/wks-azure/src/test/java/org/opengroup/osdu/wks/provider/azure/utils/AppInsightsMetricTest.java
View file @
907d8158
...
...
@@ -3,8 +3,8 @@ package org.opengroup.osdu.wks.provider.azure.utils;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
spy
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.
jupiter.api.
Before
Each
;
import
org.junit.
jupiter.api.
Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.mockito.Mock
;
import
org.mockito.junit.jupiter.MockitoExtension
;
...
...
@@ -18,7 +18,7 @@ public class AppInsightsMetricTest {
@Mock
TelemetryClient
mockTelemetryClient
;
@Before
()
@Before
Each
()
public
void
setUp
()
throws
Exception
{
mockTelemetryClient
=
mock
(
TelemetryClient
.
class
);
...
...
provider/wks-gcp/pom.xml
View file @
907d8158
...
...
@@ -4,7 +4,7 @@
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-wks
</artifactId>
<version>
0.9.0-SNAPSHOT
</version>
<relativePath>
../../
</relativePath>
<relativePath>
../../
pom.xml
</relativePath>
</parent>
<artifactId>
os-wks-gcp
</artifactId>
<description>
Google cloud related implementation stuff.
</description>
...
...
@@ -34,7 +34,7 @@
<dependency>
<groupId>
com.google.cloud
</groupId>
<artifactId>
google-cloud-datastore
</artifactId>
<version>
1.10
2.2
</version>
<version>
1.10
5.6
</version>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
@@ -51,13 +51,13 @@
<dependency>
<groupId>
com.google.apis
</groupId>
<artifactId>
google-api-services-iam
</artifactId>
<version>
v1-rev31
0
-1.25.0
</version>
<version>
v1-rev31
6
-1.25.0
</version>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
core-lib-gcp
</artifactId>
<version>
0.1.15
</version>
<groupId>
com.google.oauth-client
</groupId>
<artifactId>
google-oauth-client
</artifactId>
<version>
1.31.0
</version>
</dependency>
<dependency>
...
...
@@ -84,7 +84,7 @@
<dependency>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>
4.2.
0
</version>
<version>
4.2.
3
</version>
<scope>
test
</scope>
</dependency>
...
...
@@ -151,4 +151,4 @@
</build>
</project>
\ No newline at end of file
</project>
testing/wks-test-core/pom.xml
View file @
907d8158
...
...
@@ -83,10 +83,15 @@
<version>
5.4.0
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.google.oauth-client
</groupId>
<artifactId>
google-oauth-client
</artifactId>
<version>
1.31.0
</version>
</dependency>
<dependency>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>
4.2.
0
</version>
<version>
4.2.
3
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
wks-core/pom.xml
View file @
907d8158
...
...
@@ -92,14 +92,9 @@
<dependency>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>
4.2.
0
</version>
<version>
4.2.
3
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu.de
</groupId>
<artifactId>
os-automation-test-common-lib
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.awaitility
</groupId>
<artifactId>
awaitility
</artifactId>
...
...
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