diff options
author | 2019-02-13 11:09:38 +0100 | |
---|---|---|
committer | 2019-02-14 08:51:05 +0100 | |
commit | 7b4e5e94ce9533fb9bcb53a764eeb63e7a0bef00 (patch) | |
tree | 8850936daf8e23fa6564b339f00ee8cc596f3e5b /pom.xml | |
parent | 011aed6aa0f9265739e5e2d2fe35ddefde4ff255 (diff) |
Use protobuf definitions from SDK
Change-Id: I22163f3239769070e1e04c8d0e8f0da179069632
Issue-ID: DCAEGEN2-1218
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 41 |
1 files changed, 7 insertions, 34 deletions
@@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ dcaegen2-collectors-veshv ~ ================================================================================ - ~ Copyright (C) 2018 NOKIA + ~ Copyright (C) 2018-2019 NOKIA ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -56,13 +56,10 @@ <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version> <jacoco.version>0.8.2</jacoco.version> <detekt.version>1.0.0-RC11</detekt.version> - <sdk.version>1.1.1-SNAPSHOT</sdk.version> + <sdk.version>1.1.2-SNAPSHOT</sdk.version> <!-- Protocol buffers --> <protobuf.version>3.6.1</protobuf.version> - <protoc-jar-maven-plugin.version>3.6.0.1</protoc-jar-maven-plugin.version> - <protobuf-generated-files.directory>${project.build.directory}/generated-sources/proto/main/java/ - </protobuf-generated-files.directory> <!-- Testing and code analysis --> <junit-platform.version>1.2.0-RC1</junit-platform.version> @@ -152,30 +149,6 @@ </executions> </plugin> <plugin> - <groupId>com.github.os72</groupId> - <artifactId>protoc-jar-maven-plugin</artifactId> - <version>${protoc-jar-maven-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>${build-helper-maven-plugin.version}</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${protobuf-generated-files.directory}</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> @@ -550,11 +523,6 @@ --> <dependency> <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>${protobuf.version}</version> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> <version>${protobuf.version}</version> </dependency> @@ -601,6 +569,11 @@ <artifactId>hvvesclient-producer-api</artifactId> <version>${sdk.version}</version> </dependency> + <dependency> + <groupId>org.onap.dcaegen2.services.sdk</groupId> + <artifactId>hvvesclient-protobuf</artifactId> + <version>${sdk.version}</version> + </dependency> <!-- Test dependencies --> |