Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): rename conflicting module auth-api #6728

Merged
merged 3 commits into from
Dec 10, 2022
Merged

fix(build): rename conflicting module auth-api #6728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45729db
fix(security): commons-text in frontend
david-leifker Dec 9, 2022
ad31fac
Merge branch 'datahub-project:master' into master
david-leifker Dec 9, 2022
db2dee4
fix(build): rename conflicting module `auth-api`
david-leifker Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datahub-frontend/play.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
}

compile project(":metadata-service:restli-client")
compile project(":metadata-service:auth-api")
compile project(":metadata-service:auth-config")


implementation externalDependency.jettyJaas
Expand Down
2 changes: 1 addition & 1 deletion datahub-graphql-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'java'
dependencies {
compile project(':metadata-service:restli-client')
compile project(':metadata-service:auth-impl')
compile project(':metadata-service:auth-api')
compile project(':metadata-service:auth-config')
compile project(':metadata-io')
compile project(':metadata-utils')

Expand Down
2 changes: 1 addition & 1 deletion metadata-jobs/mae-consumer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
compile (project(':metadata-service:factories')) {
exclude group: 'org.neo4j.test'
}
compile project(':metadata-service:auth-api')
compile project(':metadata-service:auth-config')
compile project(':metadata-service:restli-client')
compile project(':metadata-io')
compile project(':ingestion-scheduler')
Expand Down
0 metadata-service/auth-api/build.gradle → metadata-service/auth-config/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...tication/AuthenticationConfiguration.java → ...tication/AuthenticationConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...thentication/AuthenticationConstants.java → ...thentication/AuthenticationConstants.java
View file
Open in desktop
File renamed without changes.
0 ...ntication/AuthenticatorConfiguration.java → ...ntication/AuthenticatorConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...orization/AuthorizationConfiguration.java → ...orization/AuthorizationConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...uthorization/AuthorizerConfiguration.java → ...uthorization/AuthorizerConfiguration.java
View file
Open in desktop
File renamed without changes.
0 ...ation/DefaultAuthorizerConfiguration.java → ...ation/DefaultAuthorizerConfiguration.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion metadata-service/auth-filter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'java'

dependencies {
compile project(':metadata-auth:auth-api');
compile project(path: ':metadata-service:auth-api')
compile project(path: ':metadata-service:auth-config')
compile project(path: ':metadata-service:factories')

compile externalDependency.servletApi
Expand Down
2 changes: 1 addition & 1 deletion metadata-service/auth-impl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ compileJava {
dependencies {
compile project(path: ':metadata-models')
compile project(path: ':metadata-auth:auth-api')
compile project(path: ':metadata-service:auth-api')
compile project(path: ':metadata-service:auth-config')
compile project(path: ':metadata-io')

implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
Expand Down
2 changes: 1 addition & 1 deletion metadata-service/factories/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
compile project(':metadata-io')
compile project(':metadata-utils')
compile project(':metadata-service:auth-impl')
compile project(':metadata-service:auth-api')
compile project(':metadata-service:auth-config')
compile project(':metadata-service:plugin')
compile project(':datahub-graphql-core')
compile project(':metadata-service:restli-servlet-impl')
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include 'datahub-graphql-core'
include 'metadata-service:war'
include 'metadata-service:servlet'
include 'metadata-service:factories'
include 'metadata-service:auth-api'
include 'metadata-service:auth-config'
include 'metadata-service:auth-impl'
include 'metadata-service:auth-filter'
include 'metadata-service:auth-servlet-impl'
Expand Down