diff options
| author |   Rashmi Pujar <rashmi.pujar@bell.ca> | 2021-06-01 17:35:56 -0400 |
|---|---|---|
| committer |   Ram Krishna Verma <ram_krishna.verma@bell.ca> | 2021-06-04 13:01:34 -0400 |
| commit | f620409bd8f381b55a336c5e1917083be1465a78 (patch) | |
| tree | a20cb17039b313ed6662732c92a86f99d102b041 | |
| parent | 558aefed481adb5e32641a30e4655ae1b02c4b25 (diff) | |
Upgrade CDS dependency
CDS client libraries are exposed by a different
maven module making is much more cleaner to use.
The only drawback is we need to go back to older
version of grpc-testing artifact due to conflicts.
Issue-ID: POLICY-3338
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I98c79de7f12feefbae7c42c4c8f26357801b44f9
(cherry picked from commit d8b5454e5d389332f4f624c291fa46690cf177ef)
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
| -rw-r--r-- | models-interactions/model-impl/cds/pom.xml | 57 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 6 insertions, 53 deletions
diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml index 57c289bd1..3d787e387 100644 --- a/models-interactions/model-impl/cds/pom.xml +++ b/models-interactions/model-impl/cds/pom.xml @@ -19,8 +19,8 @@ --> <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"> + 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> <artifactId>model-impl</artifactId> @@ -33,61 +33,14 @@ <description>gRPC client implementation to send process message to CDS blueprint processor gRPC endpoint.</description> <properties> - <grpc.version>1.35.0</grpc.version> - <protobuf.version>3.14.0</protobuf.version> + <grpc.version>1.25.0</grpc.version> </properties> <dependencies> <!-- CDS dependencies --> <dependency> - <groupId>org.onap.ccsdk.cds.components</groupId> - <artifactId>proto-definition</artifactId> - </dependency> - - <!-- protobuf dependencies --> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>${protobuf.version}</version> - </dependency> - - <!-- gRPC dependencies --> - <!-- io.netty artifacts have security issues and are transitive dependencies from io.grpc:grpc-netty:1.17.1. - Override io.netty dependencies and add exclusions to io.grpc:grpc-netty where io.netty version is mandated. --> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http2</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler-proxy</artifactId> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-protobuf</artifactId> - <version>${grpc.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-stub</artifactId> - <version>${grpc.version}</version> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-netty</artifactId> - <version>${grpc.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http2</artifactId> - </exclusion> - </exclusions> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>blueprint-proto</artifactId> </dependency> <dependency> <groupId>io.grpc</groupId> @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>3.3.0</version> + <version>3.3.1-SNAPSHOT</version> <relativePath /> </parent> |