diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2018-01-10 15:34:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 15:34:22 +0100 |
| commit | ae6a93de9fcdd4d8a2cb22d8819bcbf52de64aad (patch) | |
| tree | 7c6038eb86507018041bfb84107c4319dab2df98 | |
| parent | e3c842c8f7271126cb9e869937da907c4ddfd312 (diff) | |
| parent | 035508fa1040586d21eeb204e9aef19defae078d (diff) | |
Merge pull request #4607 from vespa-engine/bjorncs/athenz-clients-module
Add athenz-clients module
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | vespa-athenz/OWNERS | 1 | ||||
| -rw-r--r-- | vespa-athenz/README.md | 4 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 106 |
4 files changed, 112 insertions, 0 deletions
@@ -1054,6 +1054,7 @@ <module>vespaclient-container-plugin</module> <module>vespaclient-java</module> <module>vespa-application-maven-plugin</module> + <module>vespa-athenz</module> <module>vespa-documentgen-plugin</module> <module>vespa_feed_perf</module> <module>vespa-hadoop</module> diff --git a/vespa-athenz/OWNERS b/vespa-athenz/OWNERS new file mode 100644 index 00000000000..569bf1cc3a1 --- /dev/null +++ b/vespa-athenz/OWNERS @@ -0,0 +1 @@ +bjorncs diff --git a/vespa-athenz/README.md b/vespa-athenz/README.md new file mode 100644 index 00000000000..8085f217ce2 --- /dev/null +++ b/vespa-athenz/README.md @@ -0,0 +1,4 @@ +<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +# vespa-athenz + +Contains common Athenz related interfaces and utility classes, packaged as a bundle with Athenz ZMS/ZTS client libraries. diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml new file mode 100644 index 00000000000..cf5cb4d1be6 --- /dev/null +++ b/vespa-athenz/pom.xml @@ -0,0 +1,106 @@ +<?xml version="1.0"?> +<!-- Copyright 2017 Yahoo Holdings. 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> + <artifactId>vespa-athenz</artifactId> + <packaging>container-plugin</packaging> + <version>6-SNAPSHOT</version> + + <parent> + <groupId>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <version>6-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <dependencies> + <!-- provided --> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-dev</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- test --> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-test</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <!-- compile --> + <dependency> + <groupId>com.yahoo.athenz</groupId> + <artifactId>athenz-zms-java-client</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <!-- Exclude all Jersey bundles provided by JDisc --> + <exclusion> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + </exclusion> + <!--Exclude all Jackson bundles provided by JDisc --> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.yahoo.athenz</groupId> + <artifactId>athenz-zts-java-client</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <!--Exclude all Jackson bundles provided by JDisc --> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + +</project> |