diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2016-09-07 14:00:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 14:00:31 +0200 |
| commit | d2c16e61ba0a211260a9e4addf4e3b12e0ecaa8e (patch) | |
| tree | d479fbbf60aae209a243f14ed5fe324b4c1fb7ad | |
| parent | 7bec1d9cc0fb2564cf2261b7a9db77be79707697 (diff) | |
| parent | 96ae0909e3ec60e607f9f11adc945766a5c99f13 (diff) | |
Merge pull request #576 from yahoo/dybdahl/node-admin-with-working-dependencies
Move back to working versions of libraries.
| -rw-r--r-- | docker-api/pom.xml | 84 | ||||
| -rw-r--r-- | node-admin/pom.xml | 15 |
2 files changed, 86 insertions, 13 deletions
diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 6c06481564d..ccfadbac225 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -39,14 +39,84 @@ <artifactId>slf4j-api</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + </exclusion> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>orchestrator-restapi</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jaxrs_utils</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jaxrs_client_utils</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>application-model</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -57,8 +127,8 @@ <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>application</artifactId> - <version>${project.version}</version> <scope>test</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -66,13 +136,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - <version>2.0.0.0</version> - <scope>test</scope> + <groupId>io.airlift</groupId> + <artifactId>airline</artifactId> + <version>0.7</version> </dependency> </dependencies> + <build> <plugins> <plugin> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 2658826616c..a655a63acaf 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -19,6 +19,12 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>docker-api</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>node-repository</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -47,12 +53,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>docker-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>4.4.1</version> @@ -84,6 +84,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>application-model</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -119,6 +120,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> + <source>1.8</source> <target>1.8</target> <compilerArgs> @@ -131,6 +133,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <finalName>node-admin-maintenance</finalName> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> |