Code Review
/
cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
printyaml method fix
[cli.git]
/
grpc
/
pom.xml
diff --git
a/grpc/pom.xml
b/grpc/pom.xml
index
d350358
..
4b134cb
100644
(file)
--- a/
grpc/pom.xml
+++ b/
grpc/pom.xml
@@
-18,9
+18,9
@@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli</artifactId>
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli</artifactId>
- <version>
2.0.5
</version>
+ <version>
6.0.0-SNAPSHOT
</version>
</parent>
</parent>
- <version>
1.0.1
</version>
+ <version>
6.0.0-SNAPSHOT
</version>
<artifactId>oclip-grpc</artifactId>
<packaging>pom</packaging>
<name>oclip/grpc</name>
<artifactId>oclip-grpc</artifactId>
<packaging>pom</packaging>
<name>oclip/grpc</name>
@@
-31,15
+31,17
@@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <grpc.version>1.
8
.0</grpc.version>
+ <grpc.version>1.
29
.0</grpc.version>
</properties>
<dependencies>
</properties>
<dependencies>
+<!-- netty-codec-http2 excluded due to Security Issues:- CVE-2019-9512,CVE-2019-9514,CVE-2019-9515,CVE-2019-9518,CVE-2019-16869
+ and added invulnerable netty-codec-http2 4.1.46.Final -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
- <dependency>
+
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
@@
-60,6
+62,11
@@
<artifactId>proto-google-common-protos</artifactId>
<version>0.1.9</version>
</dependency>
<artifactId>proto-google-common-protos</artifactId>
<version>0.1.9</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
</dependencies>
<build>
<extensions>
</dependencies>
<build>
<extensions>
@@
-88,24
+95,6
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireUpperBoundDeps/>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin> -->
</plugins>
<pluginManagement>
<plugins>
</plugins>
<pluginManagement>
<plugins>
@@
-165,4
+154,4
@@
</plugins>
</pluginManagement>
</build>
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>