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
Security and Compliance
entitlements
Commits
23d7280a
Commit
23d7280a
authored
Jun 24, 2021
by
Bhushan Rade
Browse files
Merge branch 'ibm-impl-22-06' into 'master'
ibm update See merge request
!88
parents
6dba6055
85f84394
Pipeline
#47977
passed with stages
in 17 minutes and 37 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
23d7280a
...
...
@@ -38,5 +38,4 @@ include:
file
:
"
publishing/pages.yml"
-
project
:
"
osdu/platform/ci-cd-pipelines"
ref
:
"
entitlements-v2-ibm-cicd"
file
:
"
cloud-providers/ibm.yml"
provider/entitlements-v2-ibm/pom.xml
View file @
23d7280a
...
...
@@ -4,7 +4,7 @@
<properties>
<java.version>
8
</java.version>
<os-core-lib-ibm.version>
0.
10.0-SNAPSHOT
</os-core-lib-ibm.version>
<os-core-lib-ibm.version>
0.
9.0
</os-core-lib-ibm.version>
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.source>
1.8
</maven.compiler.source>
</properties>
...
...
@@ -39,7 +39,6 @@
<dependency>
<groupId>
io.lettuce
</groupId>
<artifactId>
lettuce-core
</artifactId>
<!-- <version>5.3.0.RELEASE</version> -->
</dependency>
<dependency>
...
...
@@ -74,7 +73,6 @@
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-pool2
</artifactId>
<!-- <version>2.8.0</version> -->
</dependency>
<dependency>
<groupId>
io.github.resilience4j
</groupId>
...
...
provider/entitlements-v2-ibm/src/main/java/org/opengroup/osdu/entitlements/v2/ibm/security/SecurityConfig.java
View file @
23d7280a
...
...
@@ -16,7 +16,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
protected
void
configure
(
HttpSecurity
http
)
throws
Exception
{
http
.
httpBasic
().
disable
()
.
csrf
().
disable
().
authorizeRequests
().
anyRequest
()
.
authenticated
().
and
().
oauth2ResourceServer
().
jwt
();
//disable default authN. AuthN handled by endpoints proxy
.
authenticated
().
and
().
oauth2ResourceServer
().
jwt
();
}
}
...
...
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