From b77f4e5713ce070cb7b08088cda297ad10af65e7 Mon Sep 17 00:00:00 2001 From: Karina Cadette Date: Fri, 4 Feb 2022 00:31:57 +0000 Subject: [PATCH 1/4] Squashed commit of the following commit fac8925e Author: David Diederich Date: Wed Feb 02 2022 11:21:29 GMT-0600 (Central Standard Time) Update version of default branch to 0.14.0-SNAPSHOT commit 432b83e9 Author: Alok Joshi Date: Tue Feb 01 2022 15:24:10 GMT-0600 (Central Standard Time) Merge branch 'json_smart_fix' into 'master' Upgrade json-smart See merge request osdu/platform/system/notification!179 commit 528f4079 Author: David Diederich Date: Fri Jan 28 2022 09:16:54 GMT-0600 (Central Standard Time) Merge branch 'upgrade-log4j-2.17.1' into 'master' Upgrade Log4J to 2.17.1 Closes #38 See merge request osdu/platform/system/notification!174 commit d7d0491b Author: Alok Joshi Date: Tue Feb 01 2022 14:17:02 GMT-0600 (Central Standard Time) update NOTICE commit 9574ec7e Author: Yunhua Koglin Date: Thu Jan 27 2022 15:15:27 GMT-0600 (Central Standard Time) Merge branch 'aws-integration' into 'master' Changes for m10 See merge request osdu/platform/system/notification!176 commit 6e480f17 Author: David Diederich Date: Fri Jan 28 2022 07:51:16 GMT-0600 (Central Standard Time) Updating NOTICE commit b9c04c85 Author: Alok Joshi Date: Tue Feb 01 2022 13:31:17 GMT-0600 (Central Standard Time) upgrade json-smart commit 7a05afe9 Author: David Diederich Date: Fri Jan 28 2022 06:22:14 GMT-0600 (Central Standard Time) Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1 commit d4ce607b Author: David Diederich Date: Wed Jan 26 2022 03:43:07 GMT-0600 (Central Standard Time) Updating NOTICE commit 9625c972 Author: David Diederich Date: Tue Jan 25 2022 12:04:24 GMT-0600 (Central Standard Time) Upgrading explicit Log4J version commit 3432a41f Author: David Diederich Date: Tue Jan 25 2022 10:47:00 GMT-0600 (Central Standard Time) Upgrade core library dependencies This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832 --- NOTICE | 86 +++++++++++++------------ notification-core/pom.xml | 6 +- pom.xml | 14 ++-- provider/notification-aws/pom.xml | 8 +-- provider/notification-azure/pom.xml | 10 +-- provider/notification-gcp/pom.xml | 10 +-- provider/notification-ibm/pom.xml | 8 +-- provider/notification-reference/pom.xml | 10 ++- testing/notification-test-aws/pom.xml | 6 +- testing/notification-test-azure/pom.xml | 6 +- testing/notification-test-core/pom.xml | 4 +- testing/notification-test-gcp/pom.xml | 6 +- testing/notification-test-ibm/pom.xml | 8 +-- testing/pom.xml | 2 +- 14 files changed, 95 insertions(+), 89 deletions(-) diff --git a/NOTICE b/NOTICE index 3475af8e..dc8b4a89 100644 --- a/NOTICE +++ b/NOTICE @@ -34,7 +34,9 @@ The following software have components provided under the terms of this license: - Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/) +- Apache Commons IO (from http://commons.apache.org/io/, https://commons.apache.org/proper/commons-io/, https://repo1.maven.org/maven2/commons-io/commons-io) - Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) +- Apache Commons Logging (from http://commons.apache.org/logging/, http://commons.apache.org/proper/commons-logging/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) - Apache Groovy (from http://groovy-lang.org, http://groovy.codehaus.org/, https://groovy-lang.org) - Apache HTTP transport v2 for the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2) @@ -60,14 +62,12 @@ The following software have components provided under the terms of this license: - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) -- Cloud Key Management Service (KMS) API v1-rev20200131-1.30.8 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) -- Cloud Storage API v1-rev28-1.20.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) -- Commons IO (from http://commons.apache.org/io/, https://repo1.maven.org/maven2/commons-io/commons-io) -- Commons Logging (from http://commons.apache.org/logging/) +- Cloud Key Management Service (KMS) API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) +- Cloud Storage JSON API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Elastic JNA Distribution (from https://github.com/java-native-access/jna) -- Expression Language 3.0 (from http://el-spec.java.net) +- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson) - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) @@ -89,6 +89,7 @@ The following software have components provided under the terms of this license: - HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- Hop (from https://github.com/rabbitmq/hop, https://www.rabbitmq.com) - HttpClient (from http://hc.apache.org/httpcomponents-client) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) @@ -120,13 +121,12 @@ The following software have components provided under the terms of this license: - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) -- Jakarta Expression Language 4.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Java Servlet 4.0 API - Java UUID Generator (from http://wiki.fasterxml.com/JugHome) -- Java client for the RabbitMQ HTTP API (from https://github.com/rabbitmq/hop) - Javassist (from http://www.javassist.org/) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) - Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/) @@ -141,16 +141,15 @@ The following software have components provided under the terms of this license: - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) -- Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) -- Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) -- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) +- Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) +- Lucene Highlighter (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) +- Lucene Join (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) - Lucene Memory (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs, https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Queries (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) - Lucene QueryParsers (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser) - Lucene Sandbox (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox) -- Lucene Spatial (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial) -- Lucene Spatial 3D (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d) +- Lucene Spatial 3D (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d) - Lucene Spatial Extras (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial-extras) - Lucene Suggest (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest) - MapStruct Core (from http://mapstruct.org/mapstruct/, https://repo1.maven.org/maven2/org/mapstruct/mapstruct) @@ -164,7 +163,6 @@ The following software have components provided under the terms of this license: - Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito) - MongoDB Driver (from http://www.mongodb.org) - MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org) -- MongoDB Java Driver Core (from http://www.mongodb.org) - Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer) - Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec) - Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns) @@ -194,6 +192,7 @@ The following software have components provided under the terms of this license: - Okio (from https://github.com/square/okio/, https://repo1.maven.org/maven2/com/squareup/okio/okio) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) +- PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito) - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) - Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client) @@ -203,14 +202,15 @@ The following software have components provided under the terms of this license: - SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org) - Spring AMQP Core (from https://github.com/spring-projects/spring-amqp, https://projects.spring.io/spring-amqp) - Spring AOP (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-aop) -- Spring Beans (from https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-beans) +- Spring Beans (from http://www.springframework.org, https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-beans) - Spring Boot (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot, https://spring.io/projects/spring-boot) +- Spring Boot AMPQ Starter (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-amqp, https://spring.io/projects/spring-boot) - Spring Boot AOP Starter (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot) -- Spring Boot Actuator (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator, https://spring.io/projects/spring-boot) +- Spring Boot Actuator (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot) - Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure, https://spring.io/projects/spring-boot) - Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot) - Spring Boot AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-autoconfigure, https://spring.io/projects/spring-boot) -- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot) +- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#, https://spring.io/projects/spring-boot) - Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json, https://spring.io/projects/spring-boot) - Spring Boot Log4j 2 Starter (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2, https://spring.io/projects/spring-boot) - Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-logging, https://spring.io/projects/spring-boot) @@ -226,8 +226,8 @@ The following software have components provided under the terms of this license: - Spring Boot Web Starter (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot) - Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux, https://spring.io/projects/spring-boot) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Context (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-context) -- Spring Core (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) +- Spring Context (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-context) +- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) - Spring Expression Language (SpEL) (from https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-expression) @@ -280,7 +280,7 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java) - io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java) - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) -- ion-java (from https://github.com/amzn/ion-java/) +- ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/) - jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) @@ -288,7 +288,7 @@ The following software have components provided under the terms of this license: - jose4j (from https://bitbucket.org/b_c/jose4j/) - json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath) - lang-mustache (from https://github.com/elastic/elasticsearch) -- lettuce (from http://github.com/lettuce-io/lettuce-core, http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki) +- lettuce (from http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki) - mapper-extras (from https://github.com/elastic/elasticsearch) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) @@ -300,11 +300,10 @@ The following software have components provided under the terms of this license: - perfmark:perfmark-api (from https://github.com/perfmark/perfmark) - powermock-api-mockito2 (from https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito2) - powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-core (from http://www.powermock.org) - powermock-module-junit4 (from http://www.powermock.org) - powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) - powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) -- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1, https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-datastore-v1) +- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1) - proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1, https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-iamcredentials-v1) - proto-google-cloud-logging-v2 (from https://github.com/googleapis/java-logging/proto-google-cloud-logging-v2, https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-logging-v2) - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) @@ -315,7 +314,6 @@ The following software have components provided under the terms of this license: - rest (from https://github.com/elastic/elasticsearch) - rest-high-level (from https://github.com/elastic/elasticsearch) - rxjava (from https://github.com/ReactiveX/RxJava) -- spring-boot-starter-amqp (from https://spring.io/projects/spring-boot) - springfox-bean-validators (from https://github.com/springfox/springfox) - springfox-boot-starter (from https://github.com/springfox/springfox) - springfox-core (from https://github.com/springfox/springfox) @@ -346,6 +344,7 @@ The following software have components provided under the terms of this license: - GAX (Google Api eXtensions) (from https://github.com/googleapis, https://github.com/googleapis/gax-java) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) +- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - Reflections (from http://code.google.com/p/reflections/, http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) @@ -357,6 +356,7 @@ BSD-3-Clause The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java) +- ASM Core (from http://asm.ow2.io/, http://asm.ow2.org/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) - GAX (Google Api eXtensions) (from https://github.com/googleapis, https://github.com/googleapis/gax-java) @@ -365,6 +365,7 @@ The following software have components provided under the terms of this license: - Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) +- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) @@ -381,9 +382,8 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://code.google.com/p/reflections/, http://github.com/ronmamo/reflections) - SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org) -- Spring Core (from https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) +- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) - ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp) -- asm (from http://asm.ow2.io/, http://asm.ow2.org/) ======================================================================== CC-BY-2.5 @@ -392,7 +392,6 @@ The following software have components provided under the terms of this license: - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org) -- MongoDB Java Driver Core (from http://www.mongodb.org) ======================================================================== CC-BY-4.0 @@ -417,7 +416,7 @@ The following software have components provided under the terms of this license: - JavaBeans Activation Framework API jar - Old JAXB Core (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core) -- Old JAXB Runtime (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) +- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) ======================================================================== CDDL-1.1 @@ -425,9 +424,9 @@ CDDL-1.1 The following software have components provided under the terms of this license: - Common Annotations 1.2 API -- Expression Language 3.0 (from http://el-spec.java.net) +- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) -- Java Architecture for XML Binding (from http://jaxb.java.net/) +- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api) - Java Servlet 4.0 API - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec) - JavaBeans Activation Framework @@ -457,7 +456,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 4.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) - Java Servlet 4.0 API @@ -485,7 +484,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 4.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) - Java Servlet 4.0 API @@ -496,14 +495,14 @@ GPL-2.0-only ======================================================================== The following software have components provided under the terms of this license: -- Expression Language 3.0 (from http://el-spec.java.net) +- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) -- Java Architecture for XML Binding (from http://jaxb.java.net/) +- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api) - Java Servlet 4.0 API - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec) - JavaBeans Activation Framework - Old JAXB Core (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core) -- Old JAXB Runtime (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) +- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -521,18 +520,18 @@ GPL-2.0-with-classpath-exception The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) -- Expression Language 3.0 (from http://el-spec.java.net) +- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net) - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 4.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) -- Java Architecture for XML Binding (from http://jaxb.java.net/) +- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api) - Java Servlet 4.0 API - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec) - JavaBeans Activation Framework - Old JAXB Core (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core) -- Old JAXB Runtime (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) +- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -544,12 +543,12 @@ The following software have components provided under the terms of this license: - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 4.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from http://servlet-spec.java.net, https://projects.eclipse.org/projects/ee4j.servlet) - Java Servlet 4.0 API - Java(TM) API for WebSocket (from https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec) - Old JAXB Core (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core) -- Old JAXB Runtime (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) +- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) - Project Lombok (from http://projectlombok.org, https://projectlombok.org) ======================================================================== @@ -609,7 +608,7 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - ClassGraph (from https://github.com/classgraph/classgraph) - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) -- JOpt Simple (from http://jopt-simple.github.io/jopt-simple) +- JOpt Simple (from http://jopt-simple.github.io/jopt-simple, http://pholser.github.io/jopt-simple) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt) @@ -626,12 +625,14 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for Service Bus (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for eventgrid (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) +- Microsoft Azure client library for File Storage Data Lake (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for KeyVault Keys (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java) - Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito) +- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - Project Lombok (from http://projectlombok.org, https://projectlombok.org) @@ -678,7 +679,7 @@ Public-Domain The following software have components provided under the terms of this license: - Old JAXB Core (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core) -- Old JAXB Runtime (from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) +- Old JAXB Runtime (from https://eclipse-ee4j.github.io/jaxb-ri/, https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== @@ -710,6 +711,7 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) +- Microsoft Azure client library for File Storage Data Lake (from https://github.com/Azure/azure-sdk-for-java) - Project Lombok (from http://projectlombok.org, https://projectlombok.org) - RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com) - Spring Web (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-web) diff --git a/notification-core/pom.xml b/notification-core/pom.xml index 10e72d72..426625a7 100644 --- a/notification-core/pom.xml +++ b/notification-core/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.opengroup.osdu notification-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-core Core module for the notification service jar @@ -27,7 +27,7 @@ org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml @@ -39,7 +39,7 @@ 4.1.70.Final 2.1.7.Final 5.3.0 - 2.17.0 + 2.17.1 diff --git a/pom.xml b/pom.xml index 2d56e6da..67f98603 100644 --- a/pom.xml +++ b/pom.xml @@ -18,16 +18,17 @@ 4.0.0 org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT Root Notification Service project 8 ${java.version} ${java.version} - 0.13.0-rc4 - 2.17.0 - 3.0.0 + 0.13.0 + 2.17.1 + 3.0.0 + 2.4.7 @@ -91,6 +92,11 @@ log4j-api ${log4j2.version} + + net.minidev + json-smart + ${json-smart.version} + diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index 90342866..e2a6e712 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.opengroup.osdu notification-aws - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-aws AWS implementation for Notification service jar @@ -27,7 +27,7 @@ org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../../pom.xml @@ -70,7 +70,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.13.0-rc3 + 0.13.0 @@ -83,7 +83,7 @@ org.opengroup.osdu notification-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml index b5a5f73f..4d446b81 100644 --- a/provider/notification-azure/pom.xml +++ b/provider/notification-azure/pom.xml @@ -18,7 +18,7 @@ 4.0.0 notification-azure - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-azure Azure implementation for Notification service jar @@ -26,7 +26,7 @@ org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../../pom.xml @@ -35,12 +35,12 @@ ${java.version} ${java.version} 0.8.2 - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT 4.3.0.RELEASE 0.11.0.RELEASE 3.3.0.RELEASE - 0.13.0-rc6 - 0.13.0-rc4 + 0.13.0 + 0.13.0 5.6.0 3.8.1 2.23.0 diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gcp/pom.xml index c3ded0db..0cf8e34d 100644 --- a/provider/notification-gcp/pom.xml +++ b/provider/notification-gcp/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu notification-gcp - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-gcp GCP implementation for Notification service jar @@ -26,7 +26,7 @@ org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../../pom.xml @@ -40,7 +40,7 @@ org.opengroup.osdu oqm - 0.13.0-SNAPSHOT + 0.13.0 @@ -50,13 +50,13 @@ org.opengroup.osdu core-lib-gcp - 0.13.0-rc4 + 0.13.0 org.opengroup.osdu notification-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml index daa6e0a5..f2ce87b2 100644 --- a/provider/notification-ibm/pom.xml +++ b/provider/notification-ibm/pom.xml @@ -16,7 +16,7 @@ 4.0.0 org.opengroup.osdu notification-ibm - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-ibm IBM implementation for Notification service jar @@ -24,7 +24,7 @@ org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../../pom.xml @@ -44,7 +44,7 @@ org.opengroup.osdu os-core-lib-ibm - 0.13.0-rc6 + 0.13.0 org.apache.lucene @@ -69,7 +69,7 @@ org.opengroup.osdu notification-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT io.netty diff --git a/provider/notification-reference/pom.xml b/provider/notification-reference/pom.xml index 9204b87b..85e5f7f2 100644 --- a/provider/notification-reference/pom.xml +++ b/provider/notification-reference/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.opengroup.osdu os-notification - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../../pom.xml org.opengroup.osdu notification-reference - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT jar @@ -37,7 +35,7 @@ org.opengroup.osdu notification-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index ba1f44a5..2c0894d1 100644 --- a/testing/notification-test-aws/pom.xml +++ b/testing/notification-test-aws/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml org.opengroup.osdu notification-test-aws - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-test-aws AWS Integration tests for Notification Service jar @@ -52,7 +52,7 @@ org.opengroup.osdu.notification notification-test-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT org.opengroup.osdu diff --git a/testing/notification-test-azure/pom.xml b/testing/notification-test-azure/pom.xml index 729b7014..b02c0a05 100644 --- a/testing/notification-test-azure/pom.xml +++ b/testing/notification-test-azure/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml org.opengroup.osdu notification-test-azure - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-test-azure Integration tests Azure for notification jar @@ -42,7 +42,7 @@ org.opengroup.osdu.notification notification-test-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml index 496c3ad8..a94a6288 100644 --- a/testing/notification-test-core/pom.xml +++ b/testing/notification-test-core/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml org.opengroup.osdu.notification notification-test-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-test-core Integration tests core for notification jar diff --git a/testing/notification-test-gcp/pom.xml b/testing/notification-test-gcp/pom.xml index e770b4d5..f073cbff 100644 --- a/testing/notification-test-gcp/pom.xml +++ b/testing/notification-test-gcp/pom.xml @@ -21,12 +21,12 @@ org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml notification-test-gcp - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-test-gcp Integration tests GCP for notification jar @@ -41,7 +41,7 @@ org.opengroup.osdu.notification notification-test-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT org.opengroup.osdu diff --git a/testing/notification-test-ibm/pom.xml b/testing/notification-test-ibm/pom.xml index b8c016fe..40c003fe 100644 --- a/testing/notification-test-ibm/pom.xml +++ b/testing/notification-test-ibm/pom.xml @@ -18,13 +18,13 @@ org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT ../pom.xml org.opengroup.osdu notification-test-ibm - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT notification-test-ibm Integration tests IBM for notification jar @@ -33,7 +33,7 @@ 8 ${java.version} ${java.version} - 0.13.0-SNAPSHOT + 0.13.0 @@ -45,7 +45,7 @@ org.opengroup.osdu.notification notification-test-core - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT org.opengroup.osdu diff --git a/testing/pom.xml b/testing/pom.xml index de0c48f8..64e4f441 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu os-notification-testing - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT Root Notification Service project pom -- GitLab From 7e767948329bf760e60c486d34667e65445a0faf Mon Sep 17 00:00:00 2001 From: Yifei Xu Date: Fri, 25 Mar 2022 18:51:39 +0000 Subject: [PATCH 2/4] Update os-core-lib-aws version to 0.14.0-rc2 --- provider/notification-aws/pom.xml | 2 +- testing/notification-test-aws/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index c3b4f887..b7f22f4f 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -70,7 +70,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.13.0 + 0.14.0-rc2 diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index 2c0894d1..f1e8111f 100644 --- a/testing/notification-test-aws/pom.xml +++ b/testing/notification-test-aws/pom.xml @@ -42,7 +42,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.3.16 + 0.14.0-rc2 com.amazonaws -- GitLab From 3f3db46a953d554380bc9d7cc349088d8144234c Mon Sep 17 00:00:00 2001 From: Morris Estepa Date: Fri, 10 Jun 2022 22:28:39 +0000 Subject: [PATCH 3/4] Squashed commit of the following: commit 8b6db733872aed0414afab9e35725f075912e90f Author: Morris Estepa Date: 1654888498 -0500 jackson version update. --- notification-core/pom.xml | 18 ++++++++++++++++++ provider/notification-aws/pom.xml | 18 ++++++++++++++++++ testing/notification-test-aws/pom.xml | 17 +++++++++++++++++ testing/notification-test-core/pom.xml | 14 +++++++++++++- 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/notification-core/pom.xml b/notification-core/pom.xml index 838addd6..efb0b259 100644 --- a/notification-core/pom.xml +++ b/notification-core/pom.xml @@ -40,6 +40,8 @@ 2.1.7.Final 5.3.0 2.17.1 + 2.13.2.2 + 2.13.2 @@ -283,6 +285,22 @@ undertow-websockets-jsr ${undertow.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index ca41e3ee..52f70689 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -38,6 +38,8 @@ 1.11.1018 2.17.1 0.14.0 + 2.13.2.2 + 2.13.2 @@ -117,6 +119,22 @@ test + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index f3ae1bfb..83323dde 100644 --- a/testing/notification-test-aws/pom.xml +++ b/testing/notification-test-aws/pom.xml @@ -36,6 +36,8 @@ 8 ${java.version} ${java.version} + 2.13.2.2 + 2.13.2 @@ -60,6 +62,21 @@ 0.3.6 + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + junit diff --git a/testing/notification-test-core/pom.xml b/testing/notification-test-core/pom.xml index a8967879..0a4e23c2 100644 --- a/testing/notification-test-core/pom.xml +++ b/testing/notification-test-core/pom.xml @@ -36,6 +36,8 @@ 8 ${java.version} ${java.version} + 2.13.2.2 + 2.13.2 @@ -74,10 +76,20 @@ javax.json-api 1.1.2 + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + com.fasterxml.jackson.core jackson-databind - 2.10.3 + ${jackson-databind.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} org.glassfish -- GitLab From ce3d4649acad49fcb2e7087b3177881d77e01ab8 Mon Sep 17 00:00:00 2001 From: Morris Estepa Date: Fri, 29 Jul 2022 15:56:17 +0000 Subject: [PATCH 4/4] Squashed commit of the following commit 8875a529 Author: Morris Estepa Date: Thu Jul 28 2022 17:47:11 GMT-0500 (Central Daylight Time) spring-webmvc upgrade --- provider/notification-aws/pom.xml | 7 +++++++ provider/notification-azure/pom.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index ddbc7390..10044013 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -40,6 +40,7 @@ 0.14.0 2.13.2.2 2.13.2 + 5.3.22 @@ -93,6 +94,12 @@ spring-boot-starter-actuator + + org.springframework + spring-webmvc + ${spring-webmvc.version} + + org.powermock diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml index ab56aba3..a345b6f9 100644 --- a/provider/notification-azure/pom.xml +++ b/provider/notification-azure/pom.xml @@ -52,6 +52,7 @@ 5.3.0 2.13.2.2 2.13.2 + 5.3.22 @@ -149,6 +150,12 @@ ${jackson.version} + + org.springframework + spring-webmvc + ${spring-webmvc.version} + + io.micrometer micrometer-registry-prometheus -- GitLab