From 00f07864784dc71b131244533abce4aaad48b5fa Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Thu, 1 Feb 2024 21:44:48 -0500 Subject: [PATCH] Remove sdks/java/fn-execution --- build.gradle.kts | 1 - runners/direct-java/build.gradle | 2 -- sdks/java/expansion-service/build.gradle | 2 -- sdks/java/fn-execution/build.gradle | 34 ------------------------ sdks/java/harness/build.gradle | 3 +-- settings.gradle.kts | 1 - 6 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 sdks/java/fn-execution/build.gradle diff --git a/build.gradle.kts b/build.gradle.kts index d4bd0fca4fc1..82b3b6356a69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -293,7 +293,6 @@ tasks.register("javaPreCommit") { dependsOn(":sdks:java:extensions:sorter:build") dependsOn(":sdks:java:extensions:timeseries:build") dependsOn(":sdks:java:extensions:zetasketch:build") - dependsOn(":sdks:java:fn-execution:build") dependsOn(":sdks:java:harness:build") dependsOn(":sdks:java:harness:jmh:build") dependsOn(":sdks:java:io:bigquery-io-perf-tests:build") diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle index e0365fb839ce..39fc1d2a53c9 100644 --- a/runners/direct-java/build.gradle +++ b/runners/direct-java/build.gradle @@ -26,7 +26,6 @@ def dependOnProjects = [":runners:core-construction-java", ":runners:core-java", ":runners:local-java", ":runners:java-fn-execution", - ":sdks:java:fn-execution", ":sdks:java:extensions:avro" ] @@ -95,7 +94,6 @@ dependencies { validatesRunner project(path: project.path, configuration: "shadowTest") permitUnusedDeclared library.java.vendored_grpc_1_60_1 permitUnusedDeclared project(":runners:java-fn-execution") - permitUnusedDeclared project(":sdks:java:fn-execution") permitUnusedDeclared project(":sdks:java:extensions:avro") examplesJavaIntegrationTest project(project.path) examplesJavaIntegrationTest project(":examples:java") diff --git a/sdks/java/expansion-service/build.gradle b/sdks/java/expansion-service/build.gradle index 18df128b9386..6947e53354db 100644 --- a/sdks/java/expansion-service/build.gradle +++ b/sdks/java/expansion-service/build.gradle @@ -41,10 +41,8 @@ dependencies { implementation project(path: ":sdks:java:core", configuration: "shadow") implementation project(path: ":runners:core-construction-java") implementation project(path: ":runners:java-fn-execution") - implementation project(path: ":sdks:java:fn-execution") implementation project(path: ":sdks:java:harness") permitUnusedDeclared project(path: ":model:fn-execution") - permitUnusedDeclared project(path: ":sdks:java:fn-execution") implementation library.java.jackson_annotations implementation library.java.jackson_databind implementation library.java.jackson_dataformat_yaml diff --git a/sdks/java/fn-execution/build.gradle b/sdks/java/fn-execution/build.gradle deleted file mode 100644 index 01a073bb7ae7..000000000000 --- a/sdks/java/fn-execution/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -plugins { id 'org.apache.beam.module' } -applyJavaNature( - automaticModuleName: 'org.apache.beam.sdk.fn', -) - -description = "Apache Beam :: SDKs :: Java :: Fn Execution" -ext.summary = """Contains code shared across the Beam Java SDK Harness and Java Runners to execute using -the Beam Portability Framework.""" - -dependencies { - testImplementation project(path: ":sdks:java:core", configuration: "shadowTest") - testImplementation library.java.junit - testImplementation library.java.mockito_core - testImplementation library.java.commons_lang3 - testRuntimeOnly library.java.slf4j_jdk14 -} diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle index 52c20e62c498..d3b4267424ce 100644 --- a/sdks/java/harness/build.gradle +++ b/sdks/java/harness/build.gradle @@ -90,8 +90,7 @@ dependencies { permitUnusedDeclared project(path: ":sdks:java:transform-service:launcher") testImplementation library.java.junit testImplementation library.java.mockito_core - shadowTestRuntimeClasspath project(path: ":sdks:java:core", configuration: "shadowTest") - testImplementation project(path: ":sdks:java:fn-execution", configuration: "testRuntimeMigration") + shadowTest project(path: ":sdks:java:core", configuration: "shadowTest") shadowTestRuntimeClasspath library.java.slf4j_jdk14 permitUnusedDeclared library.java.avro } diff --git a/settings.gradle.kts b/settings.gradle.kts index b1b03b55add0..034df0fbda5f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -203,7 +203,6 @@ include(":sdks:java:extensions:sql:udf") include(":sdks:java:extensions:sql:udf-test-provider") include(":sdks:java:extensions:timeseries") include(":sdks:java:extensions:zetasketch") -include(":sdks:java:fn-execution") include(":sdks:java:harness") include(":sdks:java:harness:jmh") include(":sdks:java:io:amazon-web-services")