diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | dist/vespa.spec | 1 | ||||
| -rw-r--r-- | filedistribution-client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | filedistribution-client/pom.xml | 91 | ||||
| -rw-r--r-- | filedistribution-client/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java (renamed from filedistribution/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java) | 0 | ||||
| -rw-r--r-- | filedistribution-client/src/main/sh/vespa-status-filedistribution.sh (renamed from filedistribution/src/main/sh/vespa-status-filedistribution.sh) | 0 | ||||
| -rw-r--r-- | filedistribution-client/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java (renamed from filedistribution/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java) | 0 | ||||
| -rw-r--r-- | filedistribution/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | filedistribution/pom.xml | 32 | ||||
| -rw-r--r-- | pom.xml | 1 |
10 files changed, 98 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 02e04b36f67..dc9fa40b121 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,6 +101,7 @@ 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 1a8a104bb13..8cfe63dda7d 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -606,6 +606,7 @@ 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 new file mode 100644 index 00000000000..dd1c2be116a --- /dev/null +++ b/filedistribution-client/CMakeLists.txt @@ -0,0 +1,4 @@ +# 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 new file mode 100644 index 00000000000..c97311ebd11 --- /dev/null +++ b/filedistribution-client/pom.xml @@ -0,0 +1,91 @@ +<!-- 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/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java b/filedistribution-client/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java index a9bbfafeaf0..a9bbfafeaf0 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java +++ b/filedistribution-client/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java diff --git a/filedistribution/src/main/sh/vespa-status-filedistribution.sh b/filedistribution-client/src/main/sh/vespa-status-filedistribution.sh index 3d930c72ccf..3d930c72ccf 100644 --- a/filedistribution/src/main/sh/vespa-status-filedistribution.sh +++ b/filedistribution-client/src/main/sh/vespa-status-filedistribution.sh diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java b/filedistribution-client/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java index a724838e7c7..a724838e7c7 100644 --- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java +++ b/filedistribution-client/src/test/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClientTest.java diff --git a/filedistribution/CMakeLists.txt b/filedistribution/CMakeLists.txt index ff6e3b28473..73c581c0b7f 100644 --- a/filedistribution/CMakeLists.txt +++ b/filedistribution/CMakeLists.txt @@ -1,4 +1,2 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_jar(filedistribution-jar-with-dependencies.jar) - -vespa_install_script(src/main/sh/vespa-status-filedistribution.sh vespa-status-filedistribution bin) diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index e16f8324da9..fb851d8325d 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -20,18 +20,6 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-apache-http-client-bundle</artifactId> - <version>${project.version}</version> - <scope>provided</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>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -68,26 +56,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>airline</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <scope>compile</scope> - <version>${slf4j.version}</version> - </dependency> </dependencies> <build> @@ -74,6 +74,7 @@ <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> |