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
Search
Commits
e9bc9e6e
Commit
e9bc9e6e
authored
Mar 22, 2021
by
Alok Joshi
Committed by
Jason
Mar 22, 2021
Browse files
update core-common for azure and core
parent
c8efbf90
Changes
3
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
e9bc9e6e
...
...
@@ -44,6 +44,7 @@
<log4j-core.version>
2.13.2
</log4j-core.version>
<google-oauth-client.version>
1.31.0
</google-oauth-client.version>
<commons-compress.version>
1.20
</commons-compress.version>
<osdu.oscorecommon.version>
0.6.9
</osdu.oscorecommon.version>
</properties>
<licenses>
...
...
@@ -320,7 +321,7 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.3.28
</version>
<version>
${osdu.oscorecommon.version}
</version>
</dependency>
</dependencies>
...
...
provider/search-azure/pom.xml
View file @
e9bc9e6e
...
...
@@ -37,7 +37,7 @@
<project.main.basedir>
${project.parent.basedir}
</project.main.basedir>
<springboot.version>
2.1.7.RELEASE
</springboot.version>
<osdu.corelibazure.version>
0.0.41
</osdu.corelibazure.version>
<osdu.oscorecommon.version>
0.
3.16
</osdu.oscorecommon.version>
<osdu.oscorecommon.version>
0.
6.9
</osdu.oscorecommon.version>
<osdu.search-core.version>
0.8.0-SNAPSHOT
</osdu.search-core.version>
<spatial4j.version>
0.7
</spatial4j.version>
<jts-io-common.version>
1.15.0
</jts-io-common.version>
...
...
@@ -79,7 +79,7 @@
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common
</artifactId>
<version>
0.3.16
</version>
<version>
${osdu.oscorecommon.version}
</version>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
...
...
provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/AzureBootstrapConfig.java
View file @
e9bc9e6e
...
...
@@ -17,6 +17,8 @@ package org.opengroup.osdu.search.provider.azure.config;
import
org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig
;
import
org.opengroup.osdu.core.common.entitlements.EntitlementsFactory
;
import
org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory
;
import
org.opengroup.osdu.core.common.http.json.HttpResponseBodyMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -41,6 +43,9 @@ public class AzureBootstrapConfig {
@Value
(
"${AUTHORIZE_API_KEY}"
)
private
String
entitlementsAPIKey
;
@Autowired
private
HttpResponseBodyMapper
httpResponseBodyMapper
;
@Bean
@Named
(
"KEY_VAULT_URL"
)
public
String
getKeyVaultURL
()
{
...
...
@@ -67,6 +72,6 @@ public class AzureBootstrapConfig {
.
apiKey
(
entitlementsAPIKey
)
.
rootUrl
(
entitlementsAPIEndpoint
)
.
build
();
return
new
EntitlementsFactory
(
apiConfig
);
return
new
EntitlementsFactory
(
apiConfig
,
httpResponseBodyMapper
);
}
}
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