diff options
| author | jonmv <venstad@gmail.com> | 2022-05-03 07:32:12 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-05-03 07:32:12 +0200 |
| commit | 32b3adf25a6f9c4f2c10936aa2f14d4e4d4e7073 (patch) | |
| tree | ee517a3320e05c20cf3d6b5e96143826bef63f55 /http-client | |
| parent | 6872505203d96295c1cdfe0c108daab554d64928 (diff) | |
Revert "Merge pull request #22392 from vespa-engine/revert-22390-jonmv/export-package"
This reverts commit 3a757528a0a978d44cb1bd9aae28b567c477d139, reversing
changes made to ea6f91775e837040dc5debad521e446f389ed8ab.
Diffstat (limited to 'http-client')
| -rw-r--r-- | http-client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | http-client/pom.xml | 22 | ||||
| -rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/package-info.java | 5 |
3 files changed, 29 insertions, 0 deletions
diff --git a/http-client/CMakeLists.txt b/http-client/CMakeLists.txt new file mode 100644 index 00000000000..3f5bf469481 --- /dev/null +++ b/http-client/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(http-client) diff --git a/http-client/pom.xml b/http-client/pom.xml index ebe83a80903..75e9bdc27cb 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -11,6 +11,7 @@ <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> + <packaging>container-plugin</packaging> <artifactId>http-client</artifactId> <description>HTTP client wrapper around an Apache http client 5</description> @@ -24,6 +25,12 @@ <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-apache-http-client-bundle</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -59,5 +66,20 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + </plugins> + </build> + </project> diff --git a/http-client/src/main/java/ai/vespa/hosted/client/package-info.java b/http-client/src/main/java/ai/vespa/hosted/client/package-info.java new file mode 100644 index 00000000000..bfabf9ade4f --- /dev/null +++ b/http-client/src/main/java/ai/vespa/hosted/client/package-info.java @@ -0,0 +1,5 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package ai.vespa.hosted.client; + +import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file |