diff options
4 files changed, 35 insertions, 15 deletions
diff --git a/grpc/pom.xml b/grpc/pom.xml index 6ad4a47a..dbef4b00 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -35,7 +35,7 @@ </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.42.Final --> + and added invulnerable netty-codec-http2 4.1.46.Final --> <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-netty</artifactId> @@ -47,21 +47,13 @@ </exclusion> </exclusions> </dependency> - <!-- excluded netty-codec-http and added invulnerable version --> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http2</artifactId> - <version>4.1.42.Final</version> - <exclusions><exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - </exclusion></exclusions> + <version>4.1.46.Final</version> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>4.1.45.Final</version> - </dependency> + <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-protobuf</artifactId> diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml index 0a81b0f1..5ef857f9 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml @@ -48,6 +48,20 @@ parameters: long_option: artifact-name short_option: b is_optional: false + - name: artifact-label + description: Artifact Label + type: string + long_option: artifact-label + short_option: l + default_value: artifactLabel + is_optional: false + - name: artifact-group-type + description: Upload Artifact Group Type + type: string + long_option: artifact-group-type + short_option: g + default_value: INFORMATIONAL + is_optional: true - name: user-id description: Designer user id type: string @@ -67,6 +81,6 @@ http: headers: Content-MD5: $s{md5:__body__} USER_ID: ${user-id} - body: '{"payloadData":"${artifact}","artifactDisplayName":"${artifact-name}","artifactType":"OTHER","description":"${remarks}","artifactName":"${artifact-name}", "artifactLabel":"${artifact-name}","artifactGroupType":"INFORMATIONAL", artifactChecksum="$s{md5:artifact}"}' + body: '{"payloadData":"${artifact}","artifactDisplayName":"${artifact-name}","artifactType":"OTHER","description":"${remarks}","artifactName":"${artifact-name}", "artifactLabel":"${artifact-label}","artifactGroupType":"${artifact-group-type}", artifactChecksum="$s{md5:artifact}"}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-elalto.yaml index 5bd2fad6..f3daaf60 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-elalto.yaml @@ -48,6 +48,20 @@ parameters: long_option: artifact-name short_option: b is_optional: false + - name: artifact-label + description: Artifact Label + type: string + long_option: artifact-label + short_option: l + default_value: artifactLabel + is_optional: false + - name: artifact-group-type + description: Upload Artifact Group Type + type: string + long_option: artifact-group-type + short_option: g + default_value: INFORMATIONAL + is_optional: true - name: user-id description: Designer user id type: string @@ -67,6 +81,6 @@ http: headers: Content-MD5: $s{md5:__body__} USER_ID: ${user-id} - body: '{"payloadData":"${artifact}","artifactDisplayName":"${artifact-name}","artifactType":"OTHER","description":"${remarks}","artifactName":"${artifact-name}", "artifactLabel":"${artifact-name}","artifactGroupType":"INFORMATIONAL", artifactChecksum="$s{md5:artifact}"}' + body: '{"payloadData":"${artifact}","artifactDisplayName":"${artifact-name}","artifactType":"OTHER","description":"${remarks}","artifactName":"${artifact-name}", "artifactLabel":"${artifact-label}","artifactGroupType":"${artifact-group-type}", artifactChecksum="$s{md5:artifact}"}' success_codes: - 200 diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml index 3410b634..2c1b39a2 100644 --- a/profiles/http/pom.xml +++ b/profiles/http/pom.xml @@ -115,7 +115,7 @@ Excluded commons-codec vulnerable version and added invulnerable version <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> - <version>4.1.45.Final</version> + <version>4.1.46.Final</version> </dependency> <dependency> <groupId>junit</groupId> |