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
Notification
Commits
0baf9889
Commit
0baf9889
authored
Aug 05, 2020
by
Hong Yan
Browse files
Update version of os-core-common and fix broken integration tests
parent
9d9b4caa
Pipeline
#4938
failed with stage
in 1 minute and 7 seconds
Changes
6
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
notification-core/pom.xml
View file @
0baf9889
...
...
@@ -61,7 +61,6 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.0.20
</version>
</dependency>
<dependency>
...
...
pom.xml
View file @
0baf9889
...
...
@@ -27,6 +27,7 @@
<java.version>
8
</java.version>
<maven.compiler.target>
${java.version}
</maven.compiler.target>
<maven.compiler.source>
${java.version}
</maven.compiler.source>
<os-core-common.version>
0.3.6
</os-core-common.version>
</properties>
<licenses>
...
...
@@ -48,6 +49,12 @@
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
${os-core-common.version}
</version>
</dependency>
</dependencies>
</dependencyManagement>
...
...
provider/notification-gcp/pom.xml
View file @
0baf9889
...
...
@@ -60,7 +60,6 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.0.20
</version>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
...
...
testing/notification-test-core/pom.xml
View file @
0baf9889
...
...
@@ -69,7 +69,7 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.
0.20
</version>
<version>
0.
3.6
</version>
</dependency>
<dependency>
<groupId>
javax.json
</groupId>
...
...
testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/BaseTestTemplate.java
View file @
0baf9889
...
...
@@ -86,7 +86,7 @@ public abstract class BaseTestTemplate extends TestBase {
ClientResponse
response
=
descriptor
.
run
(
getArg
(),
testUtils
.
getOpsToken
());
assertEquals
(
error
(
response
.
getStatus
()
==
204
?
""
:
response
.
getEntity
(
String
.
class
)),
expectedOkResponseCode
(),
response
.
getStatus
());
assertEquals
(
"[GET, POST, PUT, DELETE, OPTIONS, HEAD]"
,
response
.
getHeaders
().
getFirst
(
"Access-Control-Allow-Methods"
));
assertEquals
(
"[GET, POST, PUT, DELETE, OPTIONS, HEAD
, PATCH
]"
,
response
.
getHeaders
().
getFirst
(
"Access-Control-Allow-Methods"
));
assertEquals
(
"[origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey]"
,
response
.
getHeaders
().
getFirst
(
"Access-Control-Allow-Headers"
));
assertEquals
(
"[*]"
,
response
.
getHeaders
().
getFirst
(
"Access-Control-Allow-Origin"
));
assertEquals
(
"[true]"
,
response
.
getHeaders
().
getFirst
(
"Access-Control-Allow-Credentials"
));
...
...
testing/notification-test-gcp/pom.xml
View file @
0baf9889
...
...
@@ -59,7 +59,7 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.
0.20
</version>
<version>
0.
3.6
</version>
</dependency>
...
...
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