From be9348b518c5b6fbef208c763ea9d96d3684a99a Mon Sep 17 00:00:00 2001 From: david-leifker <114954101+david-leifker@users.noreply.github.com> Date: Fri, 9 Dec 2022 18:06:51 -0600 Subject: [PATCH] fix(build): rename conflicting module `auth-api` (#6728) * fix(build): rename conflicting module `auth-api` --- datahub-frontend/play.gradle | 2 +- datahub-graphql-core/build.gradle | 2 +- metadata-jobs/mae-consumer/build.gradle | 2 +- metadata-service/{auth-api => auth-config}/build.gradle | 0 .../com/datahub/authentication/AuthenticationConfiguration.java | 0 .../com/datahub/authentication/AuthenticationConstants.java | 0 .../com/datahub/authentication/AuthenticatorConfiguration.java | 0 .../com/datahub/authorization/AuthorizationConfiguration.java | 0 .../java/com/datahub/authorization/AuthorizerConfiguration.java | 0 .../datahub/authorization/DefaultAuthorizerConfiguration.java | 0 metadata-service/auth-filter/build.gradle | 2 +- metadata-service/auth-impl/build.gradle | 2 +- metadata-service/factories/build.gradle | 2 +- settings.gradle | 2 +- 14 files changed, 7 insertions(+), 7 deletions(-) rename metadata-service/{auth-api => auth-config}/build.gradle (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authentication/AuthenticationConstants.java (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authentication/AuthenticatorConfiguration.java (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authorization/AuthorizationConfiguration.java (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authorization/AuthorizerConfiguration.java (100%) rename metadata-service/{auth-api => auth-config}/src/main/java/com/datahub/authorization/DefaultAuthorizerConfiguration.java (100%) diff --git a/datahub-frontend/play.gradle b/datahub-frontend/play.gradle index 08a1891feced3..7dfb9ddc6262a 100644 --- a/datahub-frontend/play.gradle +++ b/datahub-frontend/play.gradle @@ -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 diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle index c07106be514d1..99c467c64df32 100644 --- a/datahub-graphql-core/build.gradle +++ b/datahub-graphql-core/build.gradle @@ -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') diff --git a/metadata-jobs/mae-consumer/build.gradle b/metadata-jobs/mae-consumer/build.gradle index 610fddde3c2b8..c5ba4e005f230 100644 --- a/metadata-jobs/mae-consumer/build.gradle +++ b/metadata-jobs/mae-consumer/build.gradle @@ -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') diff --git a/metadata-service/auth-api/build.gradle b/metadata-service/auth-config/build.gradle similarity index 100% rename from metadata-service/auth-api/build.gradle rename to metadata-service/auth-config/build.gradle diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java rename to metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticationConstants.java b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConstants.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticationConstants.java rename to metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConstants.java diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticatorConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticatorConfiguration.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authentication/AuthenticatorConfiguration.java rename to metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticatorConfiguration.java diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authorization/AuthorizationConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authorization/AuthorizationConfiguration.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authorization/AuthorizationConfiguration.java rename to metadata-service/auth-config/src/main/java/com/datahub/authorization/AuthorizationConfiguration.java diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authorization/AuthorizerConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authorization/AuthorizerConfiguration.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authorization/AuthorizerConfiguration.java rename to metadata-service/auth-config/src/main/java/com/datahub/authorization/AuthorizerConfiguration.java diff --git a/metadata-service/auth-api/src/main/java/com/datahub/authorization/DefaultAuthorizerConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authorization/DefaultAuthorizerConfiguration.java similarity index 100% rename from metadata-service/auth-api/src/main/java/com/datahub/authorization/DefaultAuthorizerConfiguration.java rename to metadata-service/auth-config/src/main/java/com/datahub/authorization/DefaultAuthorizerConfiguration.java diff --git a/metadata-service/auth-filter/build.gradle b/metadata-service/auth-filter/build.gradle index 569f15befe6d6..2c77850209205 100644 --- a/metadata-service/auth-filter/build.gradle +++ b/metadata-service/auth-filter/build.gradle @@ -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 diff --git a/metadata-service/auth-impl/build.gradle b/metadata-service/auth-impl/build.gradle index c0aa02b27ddb1..aefbf81577a9b 100644 --- a/metadata-service/auth-impl/build.gradle +++ b/metadata-service/auth-impl/build.gradle @@ -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' diff --git a/metadata-service/factories/build.gradle b/metadata-service/factories/build.gradle index 2473f7c8ae4b3..c4417c9232ce6 100644 --- a/metadata-service/factories/build.gradle +++ b/metadata-service/factories/build.gradle @@ -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') diff --git a/settings.gradle b/settings.gradle index 70737b1e08c8b..740b2fd765400 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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'