Merge pull request #25089 from vespa-engine/balder/move-filedistribution-client-to-the-other-clients

Balder/move filedistribution client to the other clients

10 files changed, 17 insertions, 101 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f7d7a0c0bb..5c291c1952a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,6 @@ add_subdirectory(fastos)
 add_subdirectory(fbench)
 add_subdirectory(fileacquirer)
 add_subdirectory(filedistribution)
-add_subdirectory(filedistribution-client)
 add_subdirectory(flags)
 add_subdirectory(fnet)
 add_subdirectory(fsa)
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 333ec7b57fc..37e333932e8 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -606,7 +606,6 @@ fi
 %{_prefix}/lib/jars/configserver-flags-jar-with-dependencies.jar
 %{_prefix}/lib/jars/configserver-jar-with-dependencies.jar
 %{_prefix}/lib/jars/document.jar
-%{_prefix}/lib/jars/filedistribution-client-jar-with-dependencies.jar
 %{_prefix}/lib/jars/filedistribution-jar-with-dependencies.jar
 %{_prefix}/lib/jars/http-client-jar-with-dependencies.jar
 %{_prefix}/lib/jars/logserver-jar-with-dependencies.jar
diff --git a/filedistribution-client/CMakeLists.txt b/filedistribution-client/CMakeLists.txt
deleted file mode 100644
index dd1c2be116a..00000000000
--- a/filedistribution-client/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_jar(filedistribution-client-jar-with-dependencies.jar)
-
-vespa_install_script(src/main/sh/vespa-status-filedistribution.sh vespa-status-filedistribution bin)
diff --git a/filedistribution-client/pom.xml b/filedistribution-client/pom.xml
deleted file mode 100644
index c97311ebd11..00000000000
--- a/filedistribution-client/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>parent</artifactId>
-        <version>8-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <artifactId>filedistribution-client</artifactId>
-    <version>8-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.core5</groupId>
-            <artifactId>httpcore5</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>http-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>security-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>airline</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 6b91704c4e5..553e43b489a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,6 @@
         <module>fat-model-dependencies</module>
         <module>fileacquirer</module>
         <module>filedistribution</module>
-        <module>filedistribution-client</module>
         <module>flags</module>
         <module>fsa</module>
         <module>hosted-api</module>
diff --git a/vespaclient-java/CMakeLists.txt b/vespaclient-java/CMakeLists.txt
index 2af1bbe55cd..666e9633726 100644
--- a/vespaclient-java/CMakeLists.txt
+++ b/vespaclient-java/CMakeLists.txt
@@ -12,3 +12,4 @@ vespa_install_script(src/main/sh/vespa-get.sh vespa-get bin)
 vespa_install_script(src/main/sh/vespa-visit.sh vespa-visit bin)
 vespa_install_script(src/main/sh/vespa-visit-target.sh vespa-visit-target bin)
 vespa_install_script(src/main/sh/vespa-feed-perf vespa-feed-perf bin)
+vespa_install_script(src/main/sh/vespa-status-filedistribution.sh vespa-status-filedistribution bin)
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml
index acfc7834ef2..f5856e1d019 100644
--- a/vespaclient-java/pom.xml
+++ b/vespaclient-java/pom.xml
@@ -54,9 +54,21 @@
             <artifactId>lz4-java</artifactId>
         </dependency>
         <dependency>
+          <groupId>io.airlift</groupId>
+          <artifactId>airline</artifactId>
+        </dependency>
+        <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
+            <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
diff --git a/filedistribution-client/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
index a9bbfafeaf0..a9bbfafeaf0 100644
--- a/filedistribution-client/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
diff --git a/filedistribution-client/src/main/sh/vespa-status-filedistribution.sh b/vespaclient-java/src/main/sh/vespa-status-filedistribution.sh
index c8bf7593111..70976581723 100644
--- a/filedistribution-client/src/main/sh/vespa-status-filedistribution.sh
+++ b/vespaclient-java/src/main/sh/vespa-status-filedistribution.sh
@@ -86,6 +86,6 @@ fi
 
 defaults="--tenant default --application default --instance default"
 jvmoptions="-XX:MaxJavaStackTraceDepth=1000000 $(getJavaOptionsIPV46) -Xms48m -Xmx48m"
-jar="-cp ${VESPA_HOME}/lib/jars/filedistribution-client-jar-with-dependencies.jar"
+jar="-cp ${VESPA_HOME}/lib/jars/vespaclient-java-jar-with-dependencies.jar"
 
 exec java $jvmoptions $jar com.yahoo.vespa.filedistribution.status.FileDistributionStatusClient $defaults $environment $region "$@"
diff --git a/filedistribution-client/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java b/vespaclient-java/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java
index a724838e7c7..0f150c6d877 100644
--- a/filedistribution-client/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java
@@ -2,10 +2,11 @@
 
 package com.yahoo.vespa.filedistribution.status;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import static com.yahoo.vespa.filedistribution.status.FileDistributionStatusClient.CommandLineArguments;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileDistributionStatusClientTest {