From 830760a4ba73a84fda9f80abd313c96322842706 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 15:49:51 +0200 Subject: [PATCH 01/10] Bump to 2.4.0 (#472) Signed-off-by: GitHub Co-authored-by: pierDipi --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- docs/amqp-proton.md | 2 +- docs/api.md | 2 +- docs/core.md | 2 +- docs/http-basic.md | 2 +- docs/http-jakarta-restful-ws.md | 2 +- docs/http-vertx.md | 2 +- docs/json-jackson.md | 2 +- docs/kafka.md | 2 +- docs/protobuf.md | 2 +- docs/spring.md | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index cff9ac2d9..4d275e4db 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index 885668ba0..19bda2ed0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 5439585d5..0989de268 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index c7b6eaaff..d70745931 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index e037daa15..ad3447256 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-core diff --git a/docs/amqp-proton.md b/docs/amqp-proton.md index f6a456c04..59234b657 100644 --- a/docs/amqp-proton.md +++ b/docs/amqp-proton.md @@ -18,7 +18,7 @@ binding for CloudEvents: io.cloudevents cloudevents-amqp-proton - 2.3.0 + 2.4.0 ``` diff --git a/docs/api.md b/docs/api.md index 1de08596f..b9e60c488 100644 --- a/docs/api.md +++ b/docs/api.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-api - 2.3.0 + 2.4.0 ``` diff --git a/docs/core.md b/docs/core.md index fcafac13d..b6e003a31 100644 --- a/docs/core.md +++ b/docs/core.md @@ -16,7 +16,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-core - 2.3.0 + 2.4.0 ``` diff --git a/docs/http-basic.md b/docs/http-basic.md index f2cb67aa2..5e3c3ffa2 100644 --- a/docs/http-basic.md +++ b/docs/http-basic.md @@ -27,7 +27,7 @@ HTTP Transport: io.cloudevents cloudevents-http-basic - 2.3.0 + 2.4.0 ``` diff --git a/docs/http-jakarta-restful-ws.md b/docs/http-jakarta-restful-ws.md index a7f08fefb..4fb033d36 100644 --- a/docs/http-jakarta-restful-ws.md +++ b/docs/http-jakarta-restful-ws.md @@ -14,7 +14,7 @@ RESTful Web Services Binding: io.cloudevents cloudevents-http-restful-ws - 2.3.0 + 2.4.0 ``` diff --git a/docs/http-vertx.md b/docs/http-vertx.md index bdecc9a79..eadf6f700 100644 --- a/docs/http-vertx.md +++ b/docs/http-vertx.md @@ -14,7 +14,7 @@ HTTP Transport: io.cloudevents cloudevents-http-vertx - 2.3.0 + 2.4.0 ``` diff --git a/docs/json-jackson.md b/docs/json-jackson.md index 6bb2a7c6a..d27366d63 100644 --- a/docs/json-jackson.md +++ b/docs/json-jackson.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-json-jackson - 2.3.0 + 2.4.0 ``` diff --git a/docs/kafka.md b/docs/kafka.md index bcdeb80ae..363cb383f 100644 --- a/docs/kafka.md +++ b/docs/kafka.md @@ -17,7 +17,7 @@ For Maven based projects, use the following to configure the io.cloudevents cloudevents-kafka - 2.3.0 + 2.4.0 ``` diff --git a/docs/protobuf.md b/docs/protobuf.md index 64d7c4318..d2cf93a6a 100644 --- a/docs/protobuf.md +++ b/docs/protobuf.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-protobuf - 2.3.0 + 2.4.0 ``` diff --git a/docs/spring.md b/docs/spring.md index b9dab8ed4..0b22c6a56 100644 --- a/docs/spring.md +++ b/docs/spring.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-spring - 2.3.0 + 2.4.0 ``` diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index 5b888ae31..404bde074 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index 27b162cda..9cdfe31bf 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index f20ca8320..92d579323 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 9a7ee82be..15dda25f1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index c5c2e691c..15217e710 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index 9b5a25bd8..17f29121b 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index bd9c0ecb8..c11f7caa5 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index 06313d9ea..6fa78d8bb 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index 348b4ab64..8a2413947 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index 31d56c4a5..4c045b106 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index a1a8146e1..f5890f784 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index 0a8a2f7f8..bb04c30cd 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index 63cd764a9..6c9a98cf7 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index 8018ba56e..6bfec7ad8 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index 63a17aae0..5e2f7dbb9 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index cb5f2b84e..3d73cdc0e 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index f778f7fa2..906db8481 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index c9e329775..fe9893e9f 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index ce58fe5dc..5ac7a3369 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index be808981a..44440884c 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index a7caae6e5..7180e17dd 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-kafka diff --git a/pom.xml b/pom.xml index f63d8a47a..9a0b80862 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index 945554a87..bf314f147 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0-SNAPSHOT + 2.4.0 cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index 746f8a569..f67c8fe1c 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.0-SNAPSHOT + 2.4.0 4.0.0 From ada31a4c5321bfc8f889e958f10a9202a65992d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 18:51:40 +0200 Subject: [PATCH 02/10] Bump to 2.4.1-SNAPSHOT (#473) Signed-off-by: GitHub Co-authored-by: pierDipi --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index 4d275e4db..38fce47ed 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index 19bda2ed0..f4446b6d6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 0989de268..0a1c87ab8 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index d70745931..440d4a65d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index ad3447256..85c3120cf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-core diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index 404bde074..6bc60ba7d 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index 9cdfe31bf..de7a10d5f 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 92d579323..1f0c79ad2 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 15dda25f1..d7995403a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index 15217e710..d2b73eedb 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index 17f29121b..67a89bc76 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index c11f7caa5..e9eeba0bf 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index 6fa78d8bb..a20ad119c 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index 8a2413947..947a8c9b7 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index 4c045b106..fee3ae7bf 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index f5890f784..b28128427 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index bb04c30cd..b596be94b 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index 6c9a98cf7..41ef1a5f5 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index 6bfec7ad8..7c85fbd5e 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index 5e2f7dbb9..97d1c3827 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index 3d73cdc0e..56b4d7cdb 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index 906db8481..11a2c21f0 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index fe9893e9f..cc3eb95da 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index 5ac7a3369..5c3732d05 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 44440884c..399ebd195 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 7180e17dd..8bb00efc0 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-kafka diff --git a/pom.xml b/pom.xml index 9a0b80862..a62c3cfa7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index bf314f147..3036d69ea 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.0 + 2.4.1-SNAPSHOT cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index f67c8fe1c..b2a6c21a7 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 From 8cc50ea97b182b46bc08537a2e65be67263ab57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20D=C3=A9l=C3=A9champ?= Date: Wed, 12 Oct 2022 08:54:05 +0200 Subject: [PATCH 03/10] Strip parameters from data content types to assess if it's JSON format (#484) (#485) Signed-off-by: Frederic Delechamp --- .../io/cloudevents/jackson/JsonFormat.java | 2 +- .../cloudevents/jackson/JsonFormatTest.java | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonFormat.java b/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonFormat.java index 8454a5a22..542405894 100644 --- a/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonFormat.java +++ b/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonFormat.java @@ -47,7 +47,7 @@ public final class JsonFormat implements EventFormat { /** * JSON Data Content Type Discriminator */ - private static final Pattern JSON_CONTENT_TYPE_PATTERN = Pattern.compile("^(application|text)\\/([a-zA-Z]+\\+)?json$"); + private static final Pattern JSON_CONTENT_TYPE_PATTERN = Pattern.compile("^(application|text)\\/([a-zA-Z]+\\+)?json(;.*)*$"); private final ObjectMapper mapper; private final JsonFormatOptions options; diff --git a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java index 7e40fe98e..253e2fc89 100644 --- a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java +++ b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java @@ -47,6 +47,22 @@ class JsonFormatTest { private final ObjectMapper mapper = new ObjectMapper(); + @ParameterizedTest + @MethodSource("jsonContentTypes") + void isJsonContentType(String contentType) { + boolean json = JsonFormat.dataIsJsonContentType(contentType); + + assertThat(json).isTrue(); + } + + @ParameterizedTest + @MethodSource("wrongJsonContentTypes") + void isNotJsonContentType(String contentType) { + boolean json = JsonFormat.dataIsJsonContentType(contentType); + + assertThat(json).isFalse(); + } + @ParameterizedTest @MethodSource("serializeTestArgumentsDefault") void serialize(CloudEvent input, String outputFile) throws IOException { @@ -151,6 +167,39 @@ void verifyDeserializeError(String inputFile){ } + static Stream jsonContentTypes() { + return Stream.of( + Arguments.of("application/json"), + Arguments.of("application/json;charset=utf-8"), + Arguments.of("application/json;\tcharset = \"utf-8\""), + Arguments.of("application/cloudevents+json;charset=UTF-8"), + Arguments.of("text/json"), + Arguments.of("text/json;charset=utf-8"), + Arguments.of("text/cloudevents+json;charset=UTF-8"), + Arguments.of("text/json;\twhatever"), + Arguments.of("text/json; boundary=something"), + Arguments.of("text/json;foo=\"bar\""), + Arguments.of("text/json; charset = \"us-ascii\""), + Arguments.of("text/json; \t"), + Arguments.of("text/json;"), + //https://www.rfc-editor.org/rfc/rfc2045#section-5.1 + // any us-ascii char can be part of parameters (except CTRLs and tspecials) + Arguments.of("text/json; char-set = $!#$%&'*+.^_`|"), + Arguments.of((Object) null) + ); + } + + static Stream wrongJsonContentTypes() { + return Stream.of( + Arguments.of("applications/json"), + Arguments.of("application/jsom"), + Arguments.of("application/jsonwrong"), + Arguments.of("text/json "), + Arguments.of("text/json ;"), + Arguments.of("test/json") + ); + } + public static Stream serializeTestArgumentsDefault() { return Stream.of( Arguments.of(V03_MIN, "v03/min.json"), From 7ea9ca811282a5797ed22d45881629cf293e4add Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Tue, 10 Jan 2023 16:50:06 +0100 Subject: [PATCH 04/10] Run tests before deploy on Java 17 (#505) Signed-off-by: Pierangelo Di Pilato --- .github/workflows/branch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch.yaml b/.github/workflows/branch.yaml index 4c5f60743..36288590c 100644 --- a/.github/workflows/branch.yaml +++ b/.github/workflows/branch.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 8, 11 ] + java: [ 8, 11, 17 ] steps: - uses: actions/checkout@v2 - name: Setup java From 572eb97a73354b70ddedfec126e03405334e126f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:23:41 +0100 Subject: [PATCH 05/10] Bump to 2.4.1 (#509) Signed-off-by: GitHub --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- docs/amqp-proton.md | 2 +- docs/api.md | 2 +- docs/core.md | 2 +- docs/http-basic.md | 2 +- docs/http-jakarta-restful-ws.md | 2 +- docs/http-vertx.md | 2 +- docs/json-jackson.md | 2 +- docs/kafka.md | 2 +- docs/protobuf.md | 2 +- docs/spring.md | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index 38fce47ed..08b8c22b1 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index f4446b6d6..4a5bb337f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 0a1c87ab8..48a527785 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index 440d4a65d..15db2aca4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index 85c3120cf..b1155d408 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-core diff --git a/docs/amqp-proton.md b/docs/amqp-proton.md index 59234b657..dd3881a80 100644 --- a/docs/amqp-proton.md +++ b/docs/amqp-proton.md @@ -18,7 +18,7 @@ binding for CloudEvents: io.cloudevents cloudevents-amqp-proton - 2.4.0 + 2.4.1 ``` diff --git a/docs/api.md b/docs/api.md index b9e60c488..bda0d6f03 100644 --- a/docs/api.md +++ b/docs/api.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-api - 2.4.0 + 2.4.1 ``` diff --git a/docs/core.md b/docs/core.md index b6e003a31..fbb985a96 100644 --- a/docs/core.md +++ b/docs/core.md @@ -16,7 +16,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-core - 2.4.0 + 2.4.1 ``` diff --git a/docs/http-basic.md b/docs/http-basic.md index 5e3c3ffa2..e58dc3475 100644 --- a/docs/http-basic.md +++ b/docs/http-basic.md @@ -27,7 +27,7 @@ HTTP Transport: io.cloudevents cloudevents-http-basic - 2.4.0 + 2.4.1 ``` diff --git a/docs/http-jakarta-restful-ws.md b/docs/http-jakarta-restful-ws.md index 4fb033d36..80ff94e32 100644 --- a/docs/http-jakarta-restful-ws.md +++ b/docs/http-jakarta-restful-ws.md @@ -14,7 +14,7 @@ RESTful Web Services Binding: io.cloudevents cloudevents-http-restful-ws - 2.4.0 + 2.4.1 ``` diff --git a/docs/http-vertx.md b/docs/http-vertx.md index eadf6f700..4f08894f1 100644 --- a/docs/http-vertx.md +++ b/docs/http-vertx.md @@ -14,7 +14,7 @@ HTTP Transport: io.cloudevents cloudevents-http-vertx - 2.4.0 + 2.4.1 ``` diff --git a/docs/json-jackson.md b/docs/json-jackson.md index d27366d63..94800a36e 100644 --- a/docs/json-jackson.md +++ b/docs/json-jackson.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-json-jackson - 2.4.0 + 2.4.1 ``` diff --git a/docs/kafka.md b/docs/kafka.md index 363cb383f..4686ef927 100644 --- a/docs/kafka.md +++ b/docs/kafka.md @@ -17,7 +17,7 @@ For Maven based projects, use the following to configure the io.cloudevents cloudevents-kafka - 2.4.0 + 2.4.1 ``` diff --git a/docs/protobuf.md b/docs/protobuf.md index d2cf93a6a..e4997a8ee 100644 --- a/docs/protobuf.md +++ b/docs/protobuf.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-protobuf - 2.4.0 + 2.4.1 ``` diff --git a/docs/spring.md b/docs/spring.md index 0b22c6a56..22cba13bc 100644 --- a/docs/spring.md +++ b/docs/spring.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-spring - 2.4.0 + 2.4.1 ``` diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index 6bc60ba7d..d2249adc9 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index de7a10d5f..338f672cc 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 1f0c79ad2..2f6ba3f52 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index d7995403a..d478e46c3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index d2b73eedb..a870824fc 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index 67a89bc76..fb800f0b3 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index e9eeba0bf..d9fc7e617 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index a20ad119c..87e75984d 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index 947a8c9b7..4494b942d 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index fee3ae7bf..75b3fb03f 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index b28128427..5d7d172bf 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index b596be94b..8c21b410a 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index 41ef1a5f5..8d611a2d3 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index 7c85fbd5e..07392d721 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index 97d1c3827..cf2d664ab 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index 56b4d7cdb..8861378b6 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index 11a2c21f0..95a6e6ea7 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index cc3eb95da..941568d8f 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index 5c3732d05..e8a952467 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 399ebd195..19bdffbec 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 8bb00efc0..2ac2c0cfc 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-kafka diff --git a/pom.xml b/pom.xml index a62c3cfa7..ad862362d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index 3036d69ea..35cb097e6 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1-SNAPSHOT + 2.4.1 cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index b2a6c21a7..28591887b 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.1-SNAPSHOT + 2.4.1 4.0.0 From 7ccf46506a01558ef96547886570f287e13672e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 19:43:46 +0100 Subject: [PATCH 06/10] Bump to 2.4.2-SNAPSHOT (#511) Signed-off-by: GitHub --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index 08b8c22b1..81a0dce48 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index 4a5bb337f..9cf05ef04 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 48a527785..97c96ecda 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index 15db2aca4..8b4dfd192 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index b1155d408..9ca03aed2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-core diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index d2249adc9..9af02f380 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index 338f672cc..440f1b041 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 2f6ba3f52..880c73cf5 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index d478e46c3..b96967efd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index a870824fc..d3c3b3116 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index fb800f0b3..fdff04744 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index d9fc7e617..ecd385111 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index 87e75984d..da386a18b 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index 4494b942d..ac24402bf 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index 75b3fb03f..4986eeb91 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index 5d7d172bf..dff300139 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index 8c21b410a..af0a8f5c6 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index 8d611a2d3..a77fc7e3a 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index 07392d721..a960ec3ac 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index cf2d664ab..390dbf60b 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index 8861378b6..da590a2d9 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index 95a6e6ea7..c4b11a56a 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index 941568d8f..6ca577b32 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index e8a952467..503084360 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 19bdffbec..477e5a4e9 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 2ac2c0cfc..3cd3ffd00 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-kafka diff --git a/pom.xml b/pom.xml index ad862362d..307ee6626 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index 35cb097e6..e39a21ae2 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.1 + 2.4.2-SNAPSHOT cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index 28591887b..423ce8e91 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.1 + 2.4.2-SNAPSHOT 4.0.0 From 9d3ee7920fbedf63d2b2c944b053ffc5d7891fda Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Mon, 27 Feb 2023 18:07:57 +0100 Subject: [PATCH 07/10] Fixed Protobuf data corruption for CloudEvent serialized/deserialized several times (#524) (#525) Fixed issue where mutiple serialize/de-serialize operations would result in corrupted data if the data was a protobuf message object. - Introduced equality checks for ProtoDataWrapper. - Refactored and cleaned up data-wrappers. Fixes https://github.com/cloudevents/sdk-java/issues/523 Signed-off-by: Jem Day --- .../protobuf/ProtoDataWrapper.java | 48 +++++++ .../protobuf/ProtoDeserializer.java | 20 +-- .../cloudevents/protobuf/ProtoSerializer.java | 15 ++- .../io/cloudevents/protobuf/ProtoSupport.java | 14 ++ .../protobuf/ProtoDataWrapperTest.java | 98 ++++++++++++++ .../protobuf/ProtobufFormatTest.java | 121 ++++++++++++------ 6 files changed, 249 insertions(+), 67 deletions(-) create mode 100644 formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtoDataWrapperTest.java diff --git a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDataWrapper.java b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDataWrapper.java index f4b87f5ea..3316787fc 100644 --- a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDataWrapper.java +++ b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDataWrapper.java @@ -16,8 +16,11 @@ */ package io.cloudevents.protobuf; +import com.google.protobuf.Any; import com.google.protobuf.Message; +import java.util.Arrays; + class ProtoDataWrapper implements ProtoCloudEventData { private final Message protoMessage; @@ -35,4 +38,49 @@ public Message getMessage() { public byte[] toBytes() { return protoMessage.toByteArray(); } + + @Override + public boolean equals(Object obj) { + + if (this == obj) { + return (true); + } + + if (!(obj instanceof ProtoDataWrapper)) { + return (false); + } + + // Now compare the actual data + ProtoDataWrapper rhs = (ProtoDataWrapper) obj; + + if (this.getMessage() == rhs.getMessage()){ + return true; + } + + // This is split out for readability. + // Compare the content in terms onf an 'Any'. + // - Verify the types match + // - Verify the values match. + + final Any lhsAny = getAsAny(this.getMessage()); + final Any rhsAny = getAsAny(rhs.getMessage()); + + final boolean typesMatch = (ProtoSupport.extractMessageType(lhsAny).equals(ProtoSupport.extractMessageType(rhsAny))); + + if (typesMatch) { + return lhsAny.getValue().equals(rhsAny.getValue()); + } else { + return false; + } + } + + private Any getAsAny(Message m) { + + if (m instanceof Any) { + return (Any) m; + } + + return Any.pack(m); + + } } diff --git a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDeserializer.java b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDeserializer.java index dd55973d5..dc1f54c27 100644 --- a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDeserializer.java +++ b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoDeserializer.java @@ -105,7 +105,7 @@ public , R> R read( data = BytesCloudEventData.wrap(raw); break; case PROTO_DATA: - data = new ProtoAccessor(this.protoCe); + data = new ProtoDataWrapper(this.protoCe.getProtoData()); break; case DATA_NOT_SET: break; @@ -130,22 +130,4 @@ private OffsetDateTime covertProtoTimestamp(com.google.protobuf.Timestamp timest return instant.atOffset(ZoneOffset.UTC); } - private static class ProtoAccessor implements ProtoCloudEventData { - - private final Message message; - - ProtoAccessor(CloudEvent proto){ - this.message = proto.getProtoData(); - } - - @Override - public Message getMessage() { - return message; - } - - @Override - public byte[] toBytes() { - return message.toByteArray(); - } - } } diff --git a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSerializer.java b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSerializer.java index bc240d84d..2f76d81b8 100644 --- a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSerializer.java +++ b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSerializer.java @@ -16,11 +16,8 @@ */ package io.cloudevents.protobuf; -import com.google.protobuf.Any; -import com.google.protobuf.ByteString; +import com.google.protobuf.*; import com.google.protobuf.Descriptors.FieldDescriptor; -import com.google.protobuf.InvalidProtocolBufferException; -import com.google.protobuf.Timestamp; import io.cloudevents.CloudEventData; import io.cloudevents.SpecVersion; import io.cloudevents.core.CloudEventUtils; @@ -248,8 +245,14 @@ public CloudEvent end(CloudEventData data) throws CloudEventRWException { // If it's a proto message we can handle that directly. if (data instanceof ProtoCloudEventData) { final ProtoCloudEventData protoData = (ProtoCloudEventData) data; - if (protoData.getMessage() != null) { - protoBuilder.setProtoData(Any.pack(protoData.getMessage())); + final Message m = protoData.getMessage(); + if (m != null) { + // If it's already an 'Any' don't re-pack it. + if (m instanceof Any) { + protoBuilder.setProtoData((Any) m); + }else { + protoBuilder.setProtoData(Any.pack(m)); + } } } else { if (Objects.equals(dataContentType, PROTO_DATA_CONTENT_TYPE)) { diff --git a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSupport.java b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSupport.java index a2c079359..a4cf0ec1d 100644 --- a/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSupport.java +++ b/formats/protobuf/src/main/java/io/cloudevents/protobuf/ProtoSupport.java @@ -17,6 +17,8 @@ package io.cloudevents.protobuf; +import com.google.protobuf.Any; + /** * General support functions. */ @@ -44,4 +46,16 @@ static boolean isTextContent(String contentType) { || contentType.endsWith("+xml") ; } + + /** + * Extract the Protobuf message type from an 'Any' + * @param anyMessage + * @return + */ + static String extractMessageType(final Any anyMessage) { + final String typeUrl = anyMessage.getTypeUrl(); + final String[] parts = typeUrl.split("/"); + + return parts[parts.length -1]; + } } diff --git a/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtoDataWrapperTest.java b/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtoDataWrapperTest.java new file mode 100644 index 000000000..232af3209 --- /dev/null +++ b/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtoDataWrapperTest.java @@ -0,0 +1,98 @@ +/* + * Copyright 2018-Present The CloudEvents Authors + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package io.cloudevents.protobuf; + +import com.google.protobuf.Any; +import com.google.protobuf.Message; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; + +import static org.assertj.core.api.Assertions.assertThat; + +class ProtoDataWrapperTest { + + // == Closing Quotes for 2023/02/23 + private final Message quote1 = io.cloudevents.test.v1.proto.Test.Quote.newBuilder() + .setPrice(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(7519).build()) + .setHigh(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(7628).build()) + .setSymbol("PYPL") + .build(); + + private final Message quote2 = io.cloudevents.test.v1.proto.Test.Quote.newBuilder() + .setPrice(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(13097).build()) + .setHigh(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(13170).build()) + .setSymbol("IBM") + .build(); + + @Test + public void testBasic() { + + ProtoDataWrapper pdw = new ProtoDataWrapper(quote1); + + assertThat(pdw).isNotNull(); + assertThat(pdw.getMessage()).isNotNull(); + assertThat(pdw.toBytes()).withFailMessage("toBytes was NULL").isNotNull(); + assertThat(pdw.toBytes()).withFailMessage("toBytes[] returned empty array").hasSizeGreaterThan(0); + + // This is current behavior and will probably change in the next version. + assertThat(pdw.getMessage()).isInstanceOf(io.cloudevents.test.v1.proto.Test.Quote.class); + } + + @Test + public void testEquality() { + + ProtoDataWrapper pdw1 = new ProtoDataWrapper(quote1); + ProtoDataWrapper pdw2 = new ProtoDataWrapper(quote1); + + ProtoDataWrapper pdw3 = new ProtoDataWrapper(quote2); + + assertThat(pdw1).withFailMessage("Self Equality Failed - 1").isEqualTo(pdw1); + assertThat(pdw2).withFailMessage("Self Equality Failed - 2").isEqualTo(pdw2); + assertThat(pdw1).withFailMessage("Self Equality Failed - 3").isEqualTo(pdw2); + assertThat(pdw2).withFailMessage("Self Equality Failed - 4").isEqualTo(pdw1); + + assertThat(pdw1).withFailMessage("Non-Equality Failed - 1").isNotEqualTo(null); + assertThat(pdw1).withFailMessage("Non-Equality Failed - 2").isNotEqualTo(pdw3); + assertThat(pdw3).withFailMessage("Non-Equality Failed - 3").isNotEqualTo(pdw2); + + } + + /** + * Verify the generated bytes[] is correct + */ + @Test + public void testBytes() { + + // Our expected 'Any' + final Any expAny = Any.pack(quote1); + + // Our expected 'data' + final byte[] expData = expAny.toByteArray(); + + // Build the wrapper + final ProtoDataWrapper pdw = new ProtoDataWrapper(quote1); + + // Get the actual data + final byte[] actData = pdw.toBytes(); + + // Verify + Arrays.equals(expData, actData); + + } + +} diff --git a/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtobufFormatTest.java b/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtobufFormatTest.java index 539811e51..c611ce2bb 100644 --- a/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtobufFormatTest.java +++ b/formats/protobuf/src/test/java/io/cloudevents/protobuf/ProtobufFormatTest.java @@ -22,19 +22,20 @@ import io.cloudevents.core.format.EventFormat; import io.cloudevents.core.provider.EventFormatProvider; import io.cloudevents.v1.proto.CloudEvent; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.net.URI; +import java.net.URL; import java.time.OffsetDateTime; import java.time.ZoneId; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.net.URL; +import java.util.UUID; import java.util.stream.Stream; import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat; @@ -45,6 +46,46 @@ class ProtobufFormatTest { EventFormat format = new ProtobufFormat(); + public static Stream serializeTestArgumentsDefault() { + return Stream.of( + Arguments.of(V1_MIN, "v1/min.proto.json"), + Arguments.of(V1_WITH_JSON_DATA, "v1/json_data.proto.json"), + Arguments.of(V1_WITH_TEXT_DATA, "v1/text_data.proto.json"), + Arguments.of(V1_WITH_JSON_DATA_WITH_EXT, "v1/json_data_with_ext.proto.json"), + Arguments.of(V1_WITH_XML_DATA, "v1/xml_data.proto.json"), + Arguments.of(V1_WITH_BINARY_EXT, "v1/binary_ext.proto.json"), + + Arguments.of(V03_MIN, "v03/min.proto.json") + + ); + } + + public static Stream roundTripTestArguments() { + return Stream.of( + "v1/min.proto.json", + "v1/json_data.proto.json", + "v1/text_data.proto.json", + "v1/json_data_with_ext.proto.json", + "v1/xml_data.proto.json", + "v1/binary_ext.proto.json", + + "v03/min.proto.json" + ); + } + + private static Message loadProto(String filename) throws IOException { + CloudEvent.Builder b = CloudEvent.newBuilder(); + JsonFormat.parser().ignoringUnknownFields().merge(getReader(filename), b); + return b.build(); + } + + private static Reader getReader(String filename) throws IOException { + URL file = Thread.currentThread().getContextClassLoader().getResource(filename); + assertThat(file).isNotNull(); + File dataFile = new File(file.getFile()); + return new FileReader(dataFile); + } + @Test public void testRegistration() { EventFormat act = EventFormatProvider.getInstance().resolveFormat("application/cloudevents+protobuf"); @@ -90,6 +131,8 @@ public void serialize(io.cloudevents.CloudEvent input, String jsonFile) throws I } + // ---------------------------------------------------------------- + /** * RoundTrip Test *

@@ -131,46 +174,40 @@ public void roundTripTest(String filename) throws IOException { } - public static Stream serializeTestArgumentsDefault() { - return Stream.of( - Arguments.of(V1_MIN, "v1/min.proto.json"), - Arguments.of(V1_WITH_JSON_DATA, "v1/json_data.proto.json"), - Arguments.of(V1_WITH_TEXT_DATA, "v1/text_data.proto.json"), - Arguments.of(V1_WITH_JSON_DATA_WITH_EXT, "v1/json_data_with_ext.proto.json"), - Arguments.of(V1_WITH_XML_DATA, "v1/xml_data.proto.json"), - Arguments.of(V1_WITH_BINARY_EXT, "v1/binary_ext.proto.json"), - - Arguments.of(V03_MIN, "v03/min.proto.json") - - ); - } - - public static Stream roundTripTestArguments() { - return Stream.of( - "v1/min.proto.json", - "v1/json_data.proto.json", - "v1/text_data.proto.json", - "v1/json_data_with_ext.proto.json", - "v1/xml_data.proto.json", - "v1/binary_ext.proto.json", + /** + * This test verifies the fix for Issue #523 that reported the Data + * portion was being corrupted during multi-step round trips if the + * data was a Protobuf Message. + */ + @Test + public void verifyMultiRoundTrip() { + + io.cloudevents.CloudEvent event = CloudEventBuilder.v1() + .withId(UUID.randomUUID().toString()) + .withSource(SOURCE) + .withType(TYPE) + .withData(ProtoCloudEventData.wrap(io.cloudevents.test.v1.proto.Test.Quote.newBuilder() + .setHigh(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(4200).build()) + .setPrice(io.cloudevents.test.v1.proto.Test.Decimal.newBuilder().setScale(2).setUnscaled(1000).build()) + .setSymbol("PYPL") + .build())) + .build(); - "v03/min.proto.json" - ); - } + // 1st Round Trip + byte[] raw1 = format.serialize(event); + io.cloudevents.CloudEvent act1 = format.deserialize(raw1); + assertThat(event).withFailMessage("Mismatch on 1st round trip").isEqualTo(act1); - // ---------------------------------------------------------------- + // 2nd Round Trip + byte[] raw2 = format.serialize(act1); + io.cloudevents.CloudEvent act2 = format.deserialize(raw2); + assertThat(event).withFailMessage("Mismatch on 2nd round trip").isEqualTo(act2); - private static Message loadProto(String filename) throws IOException { - CloudEvent.Builder b = CloudEvent.newBuilder(); - JsonFormat.parser().ignoringUnknownFields().merge(getReader(filename), b); - return b.build(); - } + // 3rd Time's a charm + byte[] raw3 = format.serialize(act2); + io.cloudevents.CloudEvent act3 = format.deserialize(raw3); + assertThat(event).withFailMessage("Mismatch on 3rd round trip").isEqualTo(act3); - private static Reader getReader(String filename) throws IOException { - URL file = Thread.currentThread().getContextClassLoader().getResource(filename); - assertThat(file).isNotNull(); - File dataFile = new File(file.getFile()); - return new FileReader(dataFile); } private byte[] getProtoData(String filename) throws IOException { From 4bcaed9af2bb8089e507f0c435dd8f1345bacece Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Fri, 3 Mar 2023 11:49:29 +0100 Subject: [PATCH 08/10] Fix javadoc build (#529) Signed-off-by: Pierangelo Di Pilato --- .github/workflows/branch.yaml | 7 ++++--- .github/workflows/bump.yaml | 2 +- .github/workflows/pr.yaml | 5 +++-- pom.xml | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/branch.yaml b/.github/workflows/branch.yaml index 36288590c..06c75437b 100644 --- a/.github/workflows/branch.yaml +++ b/.github/workflows/branch.yaml @@ -20,8 +20,9 @@ jobs: with: java-version: ${{ matrix.java }} - run: | - mvn clean install -DskipTests -B - mvn verify -B + ./mvnw clean install -DskipTests -B + ./mvnw verify -B + deploy: runs-on: ubuntu-latest name: Deploy @@ -38,7 +39,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish to Apache Maven Central - run: mvn clean deploy -Drelease -DskipTests -B + run: ./mvnw clean deploy -Drelease -DskipTests -B env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml index 3636cb5b2..86ca4215b 100644 --- a/.github/workflows/bump.yaml +++ b/.github/workflows/bump.yaml @@ -19,7 +19,7 @@ jobs: with: java-version: 8 - name: Bump version using Maven - run: 'mvn versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -B' + run: './mvnw versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -B' - name: Bump version in docs if: ${{ !endsWith(github.event.inputs.version, 'SNAPSHOT') }} run: 'find . -type f -name "*.md" -exec sed -i -e "s+[a-zA-Z0-9.-]*<\/version>+$NEW_VERSION+g" {} +' diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 57780b56f..2f808c92b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -22,5 +22,6 @@ jobs: java-version: ${{ matrix.java }} distribution: 'temurin' - run: | - mvn clean install -DskipTests -B - mvn verify -B + ./mvnw clean install -DskipTests -B + ./mvnw verify -B + ./mvnw javadoc:javadoc diff --git a/pom.xml b/pom.xml index 307ee6626..c92632ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,7 @@ https://qpid.apache.org/releases/qpid-proton-j-0.33.7/api/ https://fasterxml.github.io/jackson-databind/javadoc/2.10/ + 8 From 90c85418e7c39b476eff96967061c0f6fab22116 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 12:00:49 +0100 Subject: [PATCH 09/10] Bump to 2.4.2 (#526) Signed-off-by: GitHub --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- docs/amqp-proton.md | 2 +- docs/api.md | 2 +- docs/core.md | 2 +- docs/http-basic.md | 2 +- docs/http-jakarta-restful-ws.md | 2 +- docs/http-vertx.md | 2 +- docs/json-jackson.md | 2 +- docs/kafka.md | 2 +- docs/protobuf.md | 2 +- docs/spring.md | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index 81a0dce48..6deedb7e9 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index 9cf05ef04..a32c9fa66 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 97c96ecda..22a515279 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index 8b4dfd192..cf556dd35 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index 9ca03aed2..94df134e6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-core diff --git a/docs/amqp-proton.md b/docs/amqp-proton.md index dd3881a80..c2bc150cc 100644 --- a/docs/amqp-proton.md +++ b/docs/amqp-proton.md @@ -18,7 +18,7 @@ binding for CloudEvents: io.cloudevents cloudevents-amqp-proton - 2.4.1 + 2.4.2 ``` diff --git a/docs/api.md b/docs/api.md index bda0d6f03..66dbf2ba7 100644 --- a/docs/api.md +++ b/docs/api.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-api - 2.4.1 + 2.4.2 ``` diff --git a/docs/core.md b/docs/core.md index fbb985a96..36be5efb8 100644 --- a/docs/core.md +++ b/docs/core.md @@ -16,7 +16,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-core - 2.4.1 + 2.4.2 ``` diff --git a/docs/http-basic.md b/docs/http-basic.md index e58dc3475..2b58934a6 100644 --- a/docs/http-basic.md +++ b/docs/http-basic.md @@ -27,7 +27,7 @@ HTTP Transport: io.cloudevents cloudevents-http-basic - 2.4.1 + 2.4.2 ``` diff --git a/docs/http-jakarta-restful-ws.md b/docs/http-jakarta-restful-ws.md index 80ff94e32..1fa123e3a 100644 --- a/docs/http-jakarta-restful-ws.md +++ b/docs/http-jakarta-restful-ws.md @@ -14,7 +14,7 @@ RESTful Web Services Binding: io.cloudevents cloudevents-http-restful-ws - 2.4.1 + 2.4.2 ``` diff --git a/docs/http-vertx.md b/docs/http-vertx.md index 4f08894f1..494b88840 100644 --- a/docs/http-vertx.md +++ b/docs/http-vertx.md @@ -14,7 +14,7 @@ HTTP Transport: io.cloudevents cloudevents-http-vertx - 2.4.1 + 2.4.2 ``` diff --git a/docs/json-jackson.md b/docs/json-jackson.md index 94800a36e..1aac7c33a 100644 --- a/docs/json-jackson.md +++ b/docs/json-jackson.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-json-jackson - 2.4.1 + 2.4.2 ``` diff --git a/docs/kafka.md b/docs/kafka.md index 4686ef927..48fe54d8c 100644 --- a/docs/kafka.md +++ b/docs/kafka.md @@ -17,7 +17,7 @@ For Maven based projects, use the following to configure the io.cloudevents cloudevents-kafka - 2.4.1 + 2.4.2 ``` diff --git a/docs/protobuf.md b/docs/protobuf.md index e4997a8ee..902c68a93 100644 --- a/docs/protobuf.md +++ b/docs/protobuf.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-protobuf - 2.4.1 + 2.4.2 ``` diff --git a/docs/spring.md b/docs/spring.md index 22cba13bc..89381b607 100644 --- a/docs/spring.md +++ b/docs/spring.md @@ -17,7 +17,7 @@ For Maven based projects, use the following dependency: io.cloudevents cloudevents-spring - 2.4.1 + 2.4.2 ``` diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index 9af02f380..82ebff5e7 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index 440f1b041..d46781836 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 880c73cf5..83a62a897 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index b96967efd..cddda25cd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index d3c3b3116..d1d095ae9 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index fdff04744..decabf0eb 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index ecd385111..74cbe9939 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index da386a18b..5d7c98790 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index ac24402bf..b11bf75ee 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index 4986eeb91..8ac789327 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index dff300139..bd4f94f0d 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index af0a8f5c6..55f1b0289 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index a77fc7e3a..8b8d450f1 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index a960ec3ac..ca3ee0ead 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index 390dbf60b..01587cc2d 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index da590a2d9..047ce580d 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index c4b11a56a..5e3cf03f7 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index 6ca577b32..93c6a9501 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index 503084360..bdd589eef 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 477e5a4e9..05bcbdf09 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 3cd3ffd00..8930f6ee7 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-kafka diff --git a/pom.xml b/pom.xml index c92632ea9..b1e2912cb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index e39a21ae2..bbdd700f7 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2-SNAPSHOT + 2.4.2 cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index 423ce8e91..86c74a783 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.2-SNAPSHOT + 2.4.2 4.0.0 From 62e9f22c85ed15e7494145f5df3f486da609aa83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 18:12:15 +0100 Subject: [PATCH 10/10] Bump to 2.4.3-SNAPSHOT (#531) Signed-off-by: GitHub --- amqp/pom.xml | 2 +- api/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bom/pom.xml | 2 +- core/pom.xml | 2 +- examples/amqp-proton/pom.xml | 2 +- examples/basic-http/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- examples/pom.xml | 2 +- examples/restful-ws-quarkus/pom.xml | 2 +- examples/restful-ws-spring-boot/pom.xml | 2 +- examples/spring-function/pom.xml | 2 +- examples/spring-reactive/pom.xml | 2 +- examples/spring-rsocket/pom.xml | 2 +- examples/vertx/pom.xml | 2 +- formats/json-jackson/pom.xml | 2 +- formats/protobuf/pom.xml | 2 +- http/basic/pom.xml | 2 +- http/restful-ws-integration-tests/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-common/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-jersey/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml | 2 +- http/restful-ws-integration-tests/restful-ws-spring/pom.xml | 2 +- http/restful-ws/pom.xml | 2 +- http/vertx/pom.xml | 2 +- kafka/pom.xml | 2 +- pom.xml | 2 +- spring/pom.xml | 2 +- sql/pom.xml | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index 6deedb7e9..ce8248b51 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -6,7 +6,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-amqp-proton diff --git a/api/pom.xml b/api/pom.xml index a32c9fa66..0c54d7b32 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-api diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 22a515279..4661dcfd3 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-benchmarks diff --git a/bom/pom.xml b/bom/pom.xml index cf556dd35..fb7326dcf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-bom diff --git a/core/pom.xml b/core/pom.xml index 94df134e6..35f9c2643 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-core diff --git a/examples/amqp-proton/pom.xml b/examples/amqp-proton/pom.xml index 82ebff5e7..0a0177f6f 100644 --- a/examples/amqp-proton/pom.xml +++ b/examples/amqp-proton/pom.xml @@ -3,7 +3,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/basic-http/pom.xml b/examples/basic-http/pom.xml index d46781836..7fbb38045 100644 --- a/examples/basic-http/pom.xml +++ b/examples/basic-http/pom.xml @@ -21,7 +21,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index 83a62a897..4098bfeae 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index cddda25cd..3534c038a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml index d1d095ae9..d9f77ab3f 100644 --- a/examples/restful-ws-quarkus/pom.xml +++ b/examples/restful-ws-quarkus/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 cloudevents-restful-ws-quarkus-example diff --git a/examples/restful-ws-spring-boot/pom.xml b/examples/restful-ws-spring-boot/pom.xml index decabf0eb..b26966e35 100644 --- a/examples/restful-ws-spring-boot/pom.xml +++ b/examples/restful-ws-spring-boot/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/spring-function/pom.xml b/examples/spring-function/pom.xml index 74cbe9939..3608ca042 100644 --- a/examples/spring-function/pom.xml +++ b/examples/spring-function/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/spring-reactive/pom.xml b/examples/spring-reactive/pom.xml index 5d7c98790..5da76d433 100644 --- a/examples/spring-reactive/pom.xml +++ b/examples/spring-reactive/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/spring-rsocket/pom.xml b/examples/spring-rsocket/pom.xml index b11bf75ee..1660bfa39 100644 --- a/examples/spring-rsocket/pom.xml +++ b/examples/spring-rsocket/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/examples/vertx/pom.xml b/examples/vertx/pom.xml index 8ac789327..132b2fa28 100644 --- a/examples/vertx/pom.xml +++ b/examples/vertx/pom.xml @@ -5,7 +5,7 @@ cloudevents-examples io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 diff --git a/formats/json-jackson/pom.xml b/formats/json-jackson/pom.xml index bd4f94f0d..9262d30ca 100644 --- a/formats/json-jackson/pom.xml +++ b/formats/json-jackson/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml diff --git a/formats/protobuf/pom.xml b/formats/protobuf/pom.xml index 55f1b0289..a7b223087 100644 --- a/formats/protobuf/pom.xml +++ b/formats/protobuf/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml diff --git a/http/basic/pom.xml b/http/basic/pom.xml index 8b8d450f1..975bc0da1 100644 --- a/http/basic/pom.xml +++ b/http/basic/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml diff --git a/http/restful-ws-integration-tests/pom.xml b/http/restful-ws-integration-tests/pom.xml index ca3ee0ead..ce0ecba1f 100644 --- a/http/restful-ws-integration-tests/pom.xml +++ b/http/restful-ws-integration-tests/pom.xml @@ -22,7 +22,7 @@ cloudevents-parent io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-common/pom.xml b/http/restful-ws-integration-tests/restful-ws-common/pom.xml index 01587cc2d..8329eb7e0 100644 --- a/http/restful-ws-integration-tests/restful-ws-common/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-common/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml index 047ce580d..76cb0cfb4 100644 --- a/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-jersey/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml index 5e3cf03f7..e7dabc1d0 100644 --- a/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-resteasy/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml index 93c6a9501..10686acff 100644 --- a/http/restful-ws-integration-tests/restful-ws-spring/pom.xml +++ b/http/restful-ws-integration-tests/restful-ws-spring/pom.xml @@ -22,7 +22,7 @@ cloudevents-http-restful-ws-integration-tests io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT ../ 4.0.0 diff --git a/http/restful-ws/pom.xml b/http/restful-ws/pom.xml index bdd589eef..ad960cf87 100644 --- a/http/restful-ws/pom.xml +++ b/http/restful-ws/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml diff --git a/http/vertx/pom.xml b/http/vertx/pom.xml index 05bcbdf09..246d2ac4d 100644 --- a/http/vertx/pom.xml +++ b/http/vertx/pom.xml @@ -22,7 +22,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT ../../pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 8930f6ee7..cc17f7641 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-kafka diff --git a/pom.xml b/pom.xml index b1e2912cb..32e3f3cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT pom CloudEvents diff --git a/spring/pom.xml b/spring/pom.xml index bbdd700f7..ec31b0c63 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -23,7 +23,7 @@ io.cloudevents cloudevents-parent - 2.4.2 + 2.4.3-SNAPSHOT cloudevents-spring diff --git a/sql/pom.xml b/sql/pom.xml index 86c74a783..92c153cd5 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -5,7 +5,7 @@ cloudevents-parent io.cloudevents - 2.4.2 + 2.4.3-SNAPSHOT 4.0.0 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy