diff --git a/alerting-config-service-impl/build.gradle.kts b/alerting-config-service-impl/build.gradle.kts index 97e5d9a3..2cdb5f64 100644 --- a/alerting-config-service-impl/build.gradle.kts +++ b/alerting-config-service-impl/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { api(projects.alertingConfigServiceApi) implementation(projects.configServiceApi) implementation(projects.configProtoConverter) - implementation(projects.objectStore) - implementation(projects.validationUtils) + implementation(projects.configObjectStore) + implementation(projects.configValidationUtils) implementation(projects.configServiceChangeEventGenerator) implementation(commonLibs.guava) diff --git a/object-store/build.gradle.kts b/config-object-store/build.gradle.kts similarity index 93% rename from object-store/build.gradle.kts rename to config-object-store/build.gradle.kts index 62bbad37..920d4f2b 100644 --- a/object-store/build.gradle.kts +++ b/config-object-store/build.gradle.kts @@ -2,6 +2,7 @@ plugins { `java-library` jacoco alias(commonLibs.plugins.hypertrace.jacoco) + alias(commonLibs.plugins.hypertrace.publish) } dependencies { diff --git a/object-store/gradle.lockfile b/config-object-store/gradle.lockfile similarity index 100% rename from object-store/gradle.lockfile rename to config-object-store/gradle.lockfile diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ClientConfig.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ClientConfig.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ClientConfig.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ClientConfig.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObject.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectImpl.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolver.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolver.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolver.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolver.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObject.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStore.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/DefaultObjectStore.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/DeletedConfigObject.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedConfigObject.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/DeletedConfigObject.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedConfigObject.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObject.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObject.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObject.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObject.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObjectImpl.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObjectImpl.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObjectImpl.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/DeletedContextualConfigObjectImpl.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStore.java diff --git a/object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilter.java b/config-object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilter.java similarity index 100% rename from object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilter.java rename to config-object-store/src/main/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilter.java diff --git a/object-store/src/test/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolverTest.java b/config-object-store/src/test/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolverTest.java similarity index 100% rename from object-store/src/test/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolverTest.java rename to config-object-store/src/test/java/org/hypertrace/config/objectstore/ConfigObjectScopeResolverTest.java diff --git a/object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java b/config-object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java similarity index 100% rename from object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java rename to config-object-store/src/test/java/org/hypertrace/config/objectstore/ContextuallyIdentifiedObjectStoreTest.java diff --git a/object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java b/config-object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java similarity index 100% rename from object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java rename to config-object-store/src/test/java/org/hypertrace/config/objectstore/DefaultObjectStoreTest.java diff --git a/object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java b/config-object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java similarity index 100% rename from object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java rename to config-object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreTest.java diff --git a/object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilterTest.java b/config-object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilterTest.java similarity index 100% rename from object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilterTest.java rename to config-object-store/src/test/java/org/hypertrace/config/objectstore/IdentifiedObjectStoreWithFilterTest.java diff --git a/config-service-change-event-generator/build.gradle.kts b/config-service-change-event-generator/build.gradle.kts index a5d172b6..c1c24f04 100644 --- a/config-service-change-event-generator/build.gradle.kts +++ b/config-service-change-event-generator/build.gradle.kts @@ -2,6 +2,7 @@ plugins { `java-library` jacoco alias(commonLibs.plugins.hypertrace.jacoco) + alias(commonLibs.plugins.hypertrace.publish) } dependencies { diff --git a/validation-utils/build.gradle.kts b/config-validation-utils/build.gradle.kts similarity index 84% rename from validation-utils/build.gradle.kts rename to config-validation-utils/build.gradle.kts index 0ba8e55b..fd7bf4e3 100644 --- a/validation-utils/build.gradle.kts +++ b/config-validation-utils/build.gradle.kts @@ -1,5 +1,6 @@ plugins { `java-library` + alias(commonLibs.plugins.hypertrace.publish) } dependencies { diff --git a/validation-utils/gradle.lockfile b/config-validation-utils/gradle.lockfile similarity index 100% rename from validation-utils/gradle.lockfile rename to config-validation-utils/gradle.lockfile diff --git a/validation-utils/src/main/java/org/hypertrace/config/validation/GrpcValidatorUtils.java b/config-validation-utils/src/main/java/org/hypertrace/config/validation/GrpcValidatorUtils.java similarity index 100% rename from validation-utils/src/main/java/org/hypertrace/config/validation/GrpcValidatorUtils.java rename to config-validation-utils/src/main/java/org/hypertrace/config/validation/GrpcValidatorUtils.java diff --git a/validation-utils/src/main/java/org/hypertrace/config/validation/RegexValidator.java b/config-validation-utils/src/main/java/org/hypertrace/config/validation/RegexValidator.java similarity index 100% rename from validation-utils/src/main/java/org/hypertrace/config/validation/RegexValidator.java rename to config-validation-utils/src/main/java/org/hypertrace/config/validation/RegexValidator.java diff --git a/label-application-rule-config-service-impl/build.gradle.kts b/label-application-rule-config-service-impl/build.gradle.kts index 18c373c3..b3170dd1 100644 --- a/label-application-rule-config-service-impl/build.gradle.kts +++ b/label-application-rule-config-service-impl/build.gradle.kts @@ -14,8 +14,8 @@ protobuf { dependencies { api(projects.labelApplicationRuleConfigServiceApi) implementation(projects.configServiceApi) - implementation(projects.objectStore) - implementation(projects.validationUtils) + implementation(projects.configObjectStore) + implementation(projects.configValidationUtils) implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator) implementation(commonLibs.typesafe.config) diff --git a/labels-config-service-impl/build.gradle.kts b/labels-config-service-impl/build.gradle.kts index ce3f55d7..77d619f2 100644 --- a/labels-config-service-impl/build.gradle.kts +++ b/labels-config-service-impl/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(projects.labelsConfigServiceApi) - implementation(projects.objectStore) + implementation(projects.configObjectStore) implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator) implementation(commonLibs.typesafe.config) diff --git a/notification-channel-config-service-impl/build.gradle.kts b/notification-channel-config-service-impl/build.gradle.kts index 31ac6d5c..dfb3e648 100644 --- a/notification-channel-config-service-impl/build.gradle.kts +++ b/notification-channel-config-service-impl/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { api(projects.notificationChannelConfigServiceApi) implementation(projects.configServiceApi) implementation(projects.configProtoConverter) - implementation(projects.objectStore) - implementation(projects.validationUtils) + implementation(projects.configObjectStore) + implementation(projects.configValidationUtils) implementation(projects.configServiceChangeEventGenerator) implementation(commonLibs.hypertrace.grpcutils.context) diff --git a/notification-rule-config-service-impl/build.gradle.kts b/notification-rule-config-service-impl/build.gradle.kts index 3c5c8392..35175626 100644 --- a/notification-rule-config-service-impl/build.gradle.kts +++ b/notification-rule-config-service-impl/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { api(projects.notificationRuleConfigServiceApi) implementation(projects.configServiceApi) implementation(projects.configProtoConverter) - implementation(projects.objectStore) - implementation(projects.validationUtils) + implementation(projects.configObjectStore) + implementation(projects.configValidationUtils) implementation(projects.configServiceChangeEventGenerator) implementation(commonLibs.hypertrace.grpcutils.context) diff --git a/settings.gradle.kts b/settings.gradle.kts index 67bf72cd..d6575466 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,8 +30,8 @@ include(":config-service") include(":config-service-factory") include(":config-proto-converter") -include(":object-store") -include(":validation-utils") +include(":config-object-store") +include(":config-validation-utils") include(":spaces-config-service-api") include(":spaces-config-service-impl") diff --git a/span-processing-config-service-impl/build.gradle.kts b/span-processing-config-service-impl/build.gradle.kts index daebe97c..69151f31 100644 --- a/span-processing-config-service-impl/build.gradle.kts +++ b/span-processing-config-service-impl/build.gradle.kts @@ -7,8 +7,8 @@ plugins { dependencies { api(projects.spanProcessingConfigServiceApi) implementation(projects.configServiceApi) - implementation(projects.objectStore) - implementation(projects.validationUtils) + implementation(projects.configObjectStore) + implementation(projects.configValidationUtils) implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator)