From f250a8432305feace7d8968739c6004d869a4eaf Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Tue, 6 Feb 2024 13:31:33 -0500
Subject: [PATCH] Adjust transform-service module names and deps with
 sdks/java/core

---
 sdks/java/transform-service/app/build.gradle      | 2 +-
 sdks/java/transform-service/build.gradle          | 2 +-
 sdks/java/transform-service/launcher/build.gradle | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sdks/java/transform-service/app/build.gradle b/sdks/java/transform-service/app/build.gradle
index 5125899bec9b..bf7a47a462e2 100644
--- a/sdks/java/transform-service/app/build.gradle
+++ b/sdks/java/transform-service/app/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'org.apache.beam.module'
 apply plugin: 'application'
 
 applyJavaNature(
-    automaticModuleName: 'org.apache.beam.sdk.transform.service.app',
+    automaticModuleName: 'org.apache.beam.sdk.transformservice.app',
     exportJavadoc: false,
     validateShadowJar: false,
     shadowClosure: {},
diff --git a/sdks/java/transform-service/build.gradle b/sdks/java/transform-service/build.gradle
index 1d72c1d424bb..2fee0b4f1708 100644
--- a/sdks/java/transform-service/build.gradle
+++ b/sdks/java/transform-service/build.gradle
@@ -19,7 +19,7 @@
 apply plugin: 'org.apache.beam.module'
 
 applyJavaNature(
-        automaticModuleName: 'org.apache.beam.sdk.transform.service',
+        automaticModuleName: 'org.apache.beam.sdk.transformservice',
         exportJavadoc: false,
         validateShadowJar: false,
         shadowClosure: {},
diff --git a/sdks/java/transform-service/launcher/build.gradle b/sdks/java/transform-service/launcher/build.gradle
index e225d8da2f1d..5ae514af1dc9 100644
--- a/sdks/java/transform-service/launcher/build.gradle
+++ b/sdks/java/transform-service/launcher/build.gradle
@@ -18,7 +18,7 @@
 apply plugin: 'org.apache.beam.module'
 
 applyJavaNature(
-    automaticModuleName: 'org.apache.beam.sdk.transform.service',
+    automaticModuleName: 'org.apache.beam.sdk.transformservice.launcher',
 )
 
 description = "Apache Beam :: SDKs :: Java :: Transform Service :: Launcher"
@@ -28,9 +28,7 @@ ext.summary = """Contains code that can be used to run an transform service."""
 // Exclude tests that need a runner
 test {
     systemProperty "beamUseDummyRunner", "true"
-    useJUnit {
-        excludeCategories "org.apache.beam.sdk.testing.NeedsRunner"
-    }
+    useJUnit { }
 }
 
 dependencies {
@@ -42,7 +40,6 @@ dependencies {
     permitUnusedDeclared(library.java.error_prone_annotations)
     testImplementation library.java.junit
     testImplementation library.java.mockito_core
-    testImplementation project(path: ":sdks:java:core")
 }
 
 sourceSets {