From a9f4417b2d854a207320090c8c32d2b3771e765e Mon Sep 17 00:00:00 2001 From: Lukas Niemeier Date: Fri, 2 Jun 2023 12:19:20 +0200 Subject: [PATCH 1/6] Synchronize SPI decorator loading * eagerly load decorators obtained via SPI to avoid exceptions in high-concurrency setups * instances of `ServiceLoader` are not thread-safe, iterating on the `Iterable` may yield exceptions if done concurrently * eager loading prevents any reloading functionality of `ServiceLoader` to work (acceptable) --- .../opentracing/span/ServiceLoaderSpanDecorator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java index d00d0898e..086715e50 100644 --- a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java +++ b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java @@ -2,9 +2,11 @@ import org.apiguardian.api.API; +import java.util.List; import java.util.ServiceLoader; import static java.util.ServiceLoader.load; +import static java.util.stream.StreamSupport.stream; import static org.apiguardian.api.API.Status.EXPERIMENTAL; import static org.zalando.riptide.opentracing.span.CompositeSpanDecorator.composite; @@ -15,7 +17,11 @@ public final class ServiceLoaderSpanDecorator extends ForwardingSpanDecorator { public ServiceLoaderSpanDecorator() { - super(composite(load(SpanDecorator.class))); + super(composite(loadDecorators())); + } + + private static synchronized List loadDecorators() { + return stream(load(SpanDecorator.class).spliterator(), false).toList(); } } From d3a627ee988ca28fb2dcafa2cbf7aaa9942e7ec9 Mon Sep 17 00:00:00 2001 From: Roman Romanchuk Date: Mon, 5 Jun 2023 13:38:14 +0200 Subject: [PATCH 2/6] Use JDK8 functionality for list creation --- .../riptide/opentracing/span/ServiceLoaderSpanDecorator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java index 086715e50..0d57f7bd9 100644 --- a/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java +++ b/riptide-opentracing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.ServiceLoader; +import java.util.stream.Collectors; import static java.util.ServiceLoader.load; import static java.util.stream.StreamSupport.stream; @@ -21,7 +22,7 @@ public ServiceLoaderSpanDecorator() { } private static synchronized List loadDecorators() { - return stream(load(SpanDecorator.class).spliterator(), false).toList(); + return stream(load(SpanDecorator.class).spliterator(), false).collect(Collectors.toList()); } } From 49408d8a5914cf2ff4548427b65ce1db6d0094fb Mon Sep 17 00:00:00 2001 From: Roman Romanchuk Date: Mon, 5 Jun 2023 13:38:23 +0200 Subject: [PATCH 3/6] Spring update --- cve-suppressions.xml | 1 + pom.xml | 2 +- riptide-parent/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cve-suppressions.xml b/cve-suppressions.xml index 8a47242c2..a03e9fec0 100644 --- a/cve-suppressions.xml +++ b/cve-suppressions.xml @@ -34,6 +34,7 @@ CVE-2021-4277 CVE-2022-3064 CVE-2021-4235 + CVE-2022-45688 diff --git a/pom.xml b/pom.xml index f75e117ea..286f2af9b 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.8 1.8 - 5.3.24 + 5.3.27 diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml index 7ff149b0b..76064d644 100644 --- a/riptide-parent/pom.xml +++ b/riptide-parent/pom.xml @@ -25,7 +25,7 @@ 4.11.0 0.27.1 1.7.36 - 2.7.7 + 2.7.12 @@ -159,7 +159,7 @@ com.google.guava guava - 31.1-jre + 32.0.0-jre org.projectlombok From b2f4580dcd26d556c2591322851a8cf8e9a5e947 Mon Sep 17 00:00:00 2001 From: Roman Romanchuk Date: Mon, 5 Jun 2023 13:39:53 +0200 Subject: [PATCH 4/6] Change version to SNAPSHOT --- pom.xml | 2 +- riptide-auth/pom.xml | 2 +- riptide-bom/pom.xml | 40 +++++++++++------------ riptide-capture/pom.xml | 2 +- riptide-chaos/pom.xml | 2 +- riptide-compatibility/pom.xml | 2 +- riptide-compression/pom.xml | 2 +- riptide-concurrent/pom.xml | 2 +- riptide-core/pom.xml | 2 +- riptide-failsafe/pom.xml | 2 +- riptide-faults/pom.xml | 2 +- riptide-httpclient/pom.xml | 2 +- riptide-idempotency/pom.xml | 2 +- riptide-logbook/pom.xml | 2 +- riptide-micrometer/pom.xml | 2 +- riptide-opentelemetry/pom.xml | 2 +- riptide-opentracing/pom.xml | 2 +- riptide-parent/pom.xml | 2 +- riptide-problem/pom.xml | 2 +- riptide-soap/pom.xml | 2 +- riptide-spring-boot-autoconfigure/pom.xml | 2 +- riptide-spring-boot-starter/pom.xml | 2 +- riptide-stream/pom.xml | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index 286f2af9b..551bf0821 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.zalando riptide - 3.3.0 + 3.4.0-SNAPSHOT pom Riptide diff --git a/riptide-auth/pom.xml b/riptide-auth/pom.xml index d4ddfe91c..638ff9921 100644 --- a/riptide-auth/pom.xml +++ b/riptide-auth/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-bom/pom.xml b/riptide-bom/pom.xml index 5c81e605e..b2a82ffe2 100644 --- a/riptide-bom/pom.xml +++ b/riptide-bom/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.3.0 + 3.4.0-SNAPSHOT riptide-bom @@ -21,97 +21,97 @@ org.zalando riptide-auth - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-capture - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-chaos - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-compatibility - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-concurrent - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-core - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-failsafe - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-faults - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-httpclient - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-idempotency - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-logbook - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-micrometer - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-opentracing - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-opentelemetry - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-problem - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-soap - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-spring-boot-autoconfigure - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-spring-boot-starter - 3.3.0 + 3.4.0-SNAPSHOT org.zalando riptide-stream - 3.3.0 + 3.4.0-SNAPSHOT diff --git a/riptide-capture/pom.xml b/riptide-capture/pom.xml index e4376f8fb..f9d6c25b0 100644 --- a/riptide-capture/pom.xml +++ b/riptide-capture/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-chaos/pom.xml b/riptide-chaos/pom.xml index 1876aafd3..9d2c159bf 100644 --- a/riptide-chaos/pom.xml +++ b/riptide-chaos/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-compatibility/pom.xml b/riptide-compatibility/pom.xml index 3922e7c9d..21f6c0433 100644 --- a/riptide-compatibility/pom.xml +++ b/riptide-compatibility/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-compression/pom.xml b/riptide-compression/pom.xml index 5ed7d2d3b..c063decf8 100644 --- a/riptide-compression/pom.xml +++ b/riptide-compression/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-concurrent/pom.xml b/riptide-concurrent/pom.xml index 7f188b104..d8d41bd05 100644 --- a/riptide-concurrent/pom.xml +++ b/riptide-concurrent/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-core/pom.xml b/riptide-core/pom.xml index b2a6b9e3d..d4073d79d 100644 --- a/riptide-core/pom.xml +++ b/riptide-core/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-failsafe/pom.xml b/riptide-failsafe/pom.xml index 16adf4312..4e24924ce 100644 --- a/riptide-failsafe/pom.xml +++ b/riptide-failsafe/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-faults/pom.xml b/riptide-faults/pom.xml index 54803ef0b..d1580d036 100644 --- a/riptide-faults/pom.xml +++ b/riptide-faults/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-httpclient/pom.xml b/riptide-httpclient/pom.xml index 950f237b3..3f2689bcd 100644 --- a/riptide-httpclient/pom.xml +++ b/riptide-httpclient/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-idempotency/pom.xml b/riptide-idempotency/pom.xml index 1ab089f27..8021c69b3 100644 --- a/riptide-idempotency/pom.xml +++ b/riptide-idempotency/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-logbook/pom.xml b/riptide-logbook/pom.xml index 782bde061..9efdcb3e8 100644 --- a/riptide-logbook/pom.xml +++ b/riptide-logbook/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-micrometer/pom.xml b/riptide-micrometer/pom.xml index 189a6ec8d..4b4f02d2b 100644 --- a/riptide-micrometer/pom.xml +++ b/riptide-micrometer/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-opentelemetry/pom.xml b/riptide-opentelemetry/pom.xml index 4ca1dde2b..967386c1f 100644 --- a/riptide-opentelemetry/pom.xml +++ b/riptide-opentelemetry/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-opentracing/pom.xml b/riptide-opentracing/pom.xml index 3ee5fc381..3ef37f7dc 100644 --- a/riptide-opentracing/pom.xml +++ b/riptide-opentracing/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml index 76064d644..9ead96548 100644 --- a/riptide-parent/pom.xml +++ b/riptide-parent/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.3.0 + 3.4.0-SNAPSHOT riptide-parent diff --git a/riptide-problem/pom.xml b/riptide-problem/pom.xml index 88ef47935..c2fe1b39b 100644 --- a/riptide-problem/pom.xml +++ b/riptide-problem/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-soap/pom.xml b/riptide-soap/pom.xml index 68f249f82..de2a066ec 100644 --- a/riptide-soap/pom.xml +++ b/riptide-soap/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-spring-boot-autoconfigure/pom.xml b/riptide-spring-boot-autoconfigure/pom.xml index 86793acba..3539d98a4 100644 --- a/riptide-spring-boot-autoconfigure/pom.xml +++ b/riptide-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-spring-boot-starter/pom.xml b/riptide-spring-boot-starter/pom.xml index 4199dc77e..142cb15da 100644 --- a/riptide-spring-boot-starter/pom.xml +++ b/riptide-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent diff --git a/riptide-stream/pom.xml b/riptide-stream/pom.xml index defe2facd..318564aaa 100644 --- a/riptide-stream/pom.xml +++ b/riptide-stream/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.3.0 + 3.4.0-SNAPSHOT ../riptide-parent From 901535737f6a58b4044cd7fd5f21c8a1fed447a0 Mon Sep 17 00:00:00 2001 From: Roman Romanchuk Date: Mon, 5 Jun 2023 13:40:32 +0200 Subject: [PATCH 5/6] Release 3.4.0 --- pom.xml | 2 +- riptide-auth/pom.xml | 2 +- riptide-bom/pom.xml | 40 +++++++++++------------ riptide-capture/pom.xml | 2 +- riptide-chaos/pom.xml | 2 +- riptide-compatibility/pom.xml | 2 +- riptide-compression/pom.xml | 2 +- riptide-concurrent/pom.xml | 2 +- riptide-core/pom.xml | 2 +- riptide-failsafe/pom.xml | 2 +- riptide-faults/pom.xml | 2 +- riptide-httpclient/pom.xml | 2 +- riptide-idempotency/pom.xml | 2 +- riptide-logbook/pom.xml | 2 +- riptide-micrometer/pom.xml | 2 +- riptide-opentelemetry/pom.xml | 2 +- riptide-opentracing/pom.xml | 2 +- riptide-parent/pom.xml | 2 +- riptide-problem/pom.xml | 2 +- riptide-soap/pom.xml | 2 +- riptide-spring-boot-autoconfigure/pom.xml | 2 +- riptide-spring-boot-starter/pom.xml | 2 +- riptide-stream/pom.xml | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index 551bf0821..983b55a23 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.zalando riptide - 3.4.0-SNAPSHOT + 3.4.0 pom Riptide diff --git a/riptide-auth/pom.xml b/riptide-auth/pom.xml index 638ff9921..b76289156 100644 --- a/riptide-auth/pom.xml +++ b/riptide-auth/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-bom/pom.xml b/riptide-bom/pom.xml index b2a82ffe2..6d60da907 100644 --- a/riptide-bom/pom.xml +++ b/riptide-bom/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.4.0-SNAPSHOT + 3.4.0 riptide-bom @@ -21,97 +21,97 @@ org.zalando riptide-auth - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-capture - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-chaos - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-compatibility - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-concurrent - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-core - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-failsafe - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-faults - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-httpclient - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-idempotency - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-logbook - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-micrometer - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-opentracing - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-opentelemetry - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-problem - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-soap - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-spring-boot-autoconfigure - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-spring-boot-starter - 3.4.0-SNAPSHOT + 3.4.0 org.zalando riptide-stream - 3.4.0-SNAPSHOT + 3.4.0 diff --git a/riptide-capture/pom.xml b/riptide-capture/pom.xml index f9d6c25b0..e6fe31db2 100644 --- a/riptide-capture/pom.xml +++ b/riptide-capture/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-chaos/pom.xml b/riptide-chaos/pom.xml index 9d2c159bf..2dd96f7a1 100644 --- a/riptide-chaos/pom.xml +++ b/riptide-chaos/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-compatibility/pom.xml b/riptide-compatibility/pom.xml index 21f6c0433..63f9c59fc 100644 --- a/riptide-compatibility/pom.xml +++ b/riptide-compatibility/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-compression/pom.xml b/riptide-compression/pom.xml index c063decf8..e6b8fcb33 100644 --- a/riptide-compression/pom.xml +++ b/riptide-compression/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-concurrent/pom.xml b/riptide-concurrent/pom.xml index d8d41bd05..e26704392 100644 --- a/riptide-concurrent/pom.xml +++ b/riptide-concurrent/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-core/pom.xml b/riptide-core/pom.xml index d4073d79d..ca20046f6 100644 --- a/riptide-core/pom.xml +++ b/riptide-core/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-failsafe/pom.xml b/riptide-failsafe/pom.xml index 4e24924ce..914e4a571 100644 --- a/riptide-failsafe/pom.xml +++ b/riptide-failsafe/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-faults/pom.xml b/riptide-faults/pom.xml index d1580d036..586a3b63b 100644 --- a/riptide-faults/pom.xml +++ b/riptide-faults/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-httpclient/pom.xml b/riptide-httpclient/pom.xml index 3f2689bcd..d037ec4b6 100644 --- a/riptide-httpclient/pom.xml +++ b/riptide-httpclient/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-idempotency/pom.xml b/riptide-idempotency/pom.xml index 8021c69b3..de210ae1f 100644 --- a/riptide-idempotency/pom.xml +++ b/riptide-idempotency/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-logbook/pom.xml b/riptide-logbook/pom.xml index 9efdcb3e8..9ba2b832e 100644 --- a/riptide-logbook/pom.xml +++ b/riptide-logbook/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-micrometer/pom.xml b/riptide-micrometer/pom.xml index 4b4f02d2b..41bbc45c4 100644 --- a/riptide-micrometer/pom.xml +++ b/riptide-micrometer/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-opentelemetry/pom.xml b/riptide-opentelemetry/pom.xml index 967386c1f..1cf807c43 100644 --- a/riptide-opentelemetry/pom.xml +++ b/riptide-opentelemetry/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-opentracing/pom.xml b/riptide-opentracing/pom.xml index 3ef37f7dc..726888839 100644 --- a/riptide-opentracing/pom.xml +++ b/riptide-opentracing/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml index 9ead96548..a8f12a8d7 100644 --- a/riptide-parent/pom.xml +++ b/riptide-parent/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.4.0-SNAPSHOT + 3.4.0 riptide-parent diff --git a/riptide-problem/pom.xml b/riptide-problem/pom.xml index c2fe1b39b..7fa92adcd 100644 --- a/riptide-problem/pom.xml +++ b/riptide-problem/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-soap/pom.xml b/riptide-soap/pom.xml index de2a066ec..1d8e2f3b2 100644 --- a/riptide-soap/pom.xml +++ b/riptide-soap/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-spring-boot-autoconfigure/pom.xml b/riptide-spring-boot-autoconfigure/pom.xml index 3539d98a4..df5412932 100644 --- a/riptide-spring-boot-autoconfigure/pom.xml +++ b/riptide-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-spring-boot-starter/pom.xml b/riptide-spring-boot-starter/pom.xml index 142cb15da..084e059f6 100644 --- a/riptide-spring-boot-starter/pom.xml +++ b/riptide-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent diff --git a/riptide-stream/pom.xml b/riptide-stream/pom.xml index 318564aaa..7ea8b8ebc 100644 --- a/riptide-stream/pom.xml +++ b/riptide-stream/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0-SNAPSHOT + 3.4.0 ../riptide-parent From f61aa8f9c60b46899ee7cd8d410509ad61d26eed Mon Sep 17 00:00:00 2001 From: Roman Romanchuk Date: Mon, 5 Jun 2023 13:46:15 +0200 Subject: [PATCH 6/6] Development 3.4.1-SNAPSHOT --- pom.xml | 2 +- riptide-auth/pom.xml | 2 +- riptide-bom/pom.xml | 40 +++++++++++------------ riptide-capture/pom.xml | 2 +- riptide-chaos/pom.xml | 2 +- riptide-compatibility/pom.xml | 2 +- riptide-compression/pom.xml | 2 +- riptide-concurrent/pom.xml | 2 +- riptide-core/pom.xml | 2 +- riptide-failsafe/pom.xml | 2 +- riptide-faults/pom.xml | 2 +- riptide-httpclient/pom.xml | 2 +- riptide-idempotency/pom.xml | 2 +- riptide-logbook/pom.xml | 2 +- riptide-micrometer/pom.xml | 2 +- riptide-opentelemetry/pom.xml | 2 +- riptide-opentracing/pom.xml | 2 +- riptide-parent/pom.xml | 2 +- riptide-problem/pom.xml | 2 +- riptide-soap/pom.xml | 2 +- riptide-spring-boot-autoconfigure/pom.xml | 2 +- riptide-spring-boot-starter/pom.xml | 2 +- riptide-stream/pom.xml | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index 983b55a23..7f99d6dee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.zalando riptide - 3.4.0 + 3.4.1-SNAPSHOT pom Riptide diff --git a/riptide-auth/pom.xml b/riptide-auth/pom.xml index b76289156..3055f7622 100644 --- a/riptide-auth/pom.xml +++ b/riptide-auth/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-bom/pom.xml b/riptide-bom/pom.xml index 6d60da907..df8da5b7d 100644 --- a/riptide-bom/pom.xml +++ b/riptide-bom/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.4.0 + 3.4.1-SNAPSHOT riptide-bom @@ -21,97 +21,97 @@ org.zalando riptide-auth - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-capture - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-chaos - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-compatibility - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-concurrent - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-core - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-failsafe - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-faults - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-httpclient - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-idempotency - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-logbook - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-micrometer - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-opentracing - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-opentelemetry - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-problem - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-soap - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-spring-boot-autoconfigure - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-spring-boot-starter - 3.4.0 + 3.4.1-SNAPSHOT org.zalando riptide-stream - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/riptide-capture/pom.xml b/riptide-capture/pom.xml index e6fe31db2..f5ad289b8 100644 --- a/riptide-capture/pom.xml +++ b/riptide-capture/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-chaos/pom.xml b/riptide-chaos/pom.xml index 2dd96f7a1..924efdb56 100644 --- a/riptide-chaos/pom.xml +++ b/riptide-chaos/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-compatibility/pom.xml b/riptide-compatibility/pom.xml index 63f9c59fc..d622e03f2 100644 --- a/riptide-compatibility/pom.xml +++ b/riptide-compatibility/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-compression/pom.xml b/riptide-compression/pom.xml index e6b8fcb33..78bdc6475 100644 --- a/riptide-compression/pom.xml +++ b/riptide-compression/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-concurrent/pom.xml b/riptide-concurrent/pom.xml index e26704392..7fd936662 100644 --- a/riptide-concurrent/pom.xml +++ b/riptide-concurrent/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-core/pom.xml b/riptide-core/pom.xml index ca20046f6..b04663c04 100644 --- a/riptide-core/pom.xml +++ b/riptide-core/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-failsafe/pom.xml b/riptide-failsafe/pom.xml index 914e4a571..1b110deaf 100644 --- a/riptide-failsafe/pom.xml +++ b/riptide-failsafe/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-faults/pom.xml b/riptide-faults/pom.xml index 586a3b63b..fd99a96b6 100644 --- a/riptide-faults/pom.xml +++ b/riptide-faults/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-httpclient/pom.xml b/riptide-httpclient/pom.xml index d037ec4b6..751f6676b 100644 --- a/riptide-httpclient/pom.xml +++ b/riptide-httpclient/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-idempotency/pom.xml b/riptide-idempotency/pom.xml index de210ae1f..68a5dac9a 100644 --- a/riptide-idempotency/pom.xml +++ b/riptide-idempotency/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-logbook/pom.xml b/riptide-logbook/pom.xml index 9ba2b832e..e08edf0bc 100644 --- a/riptide-logbook/pom.xml +++ b/riptide-logbook/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-micrometer/pom.xml b/riptide-micrometer/pom.xml index 41bbc45c4..4ef134add 100644 --- a/riptide-micrometer/pom.xml +++ b/riptide-micrometer/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-opentelemetry/pom.xml b/riptide-opentelemetry/pom.xml index 1cf807c43..d9d0c783c 100644 --- a/riptide-opentelemetry/pom.xml +++ b/riptide-opentelemetry/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-opentracing/pom.xml b/riptide-opentracing/pom.xml index 726888839..539c187a3 100644 --- a/riptide-opentracing/pom.xml +++ b/riptide-opentracing/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml index a8f12a8d7..7b8f36cf7 100644 --- a/riptide-parent/pom.xml +++ b/riptide-parent/pom.xml @@ -6,7 +6,7 @@ org.zalando riptide - 3.4.0 + 3.4.1-SNAPSHOT riptide-parent diff --git a/riptide-problem/pom.xml b/riptide-problem/pom.xml index 7fa92adcd..b69fdfefb 100644 --- a/riptide-problem/pom.xml +++ b/riptide-problem/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-soap/pom.xml b/riptide-soap/pom.xml index 1d8e2f3b2..daf12edaa 100644 --- a/riptide-soap/pom.xml +++ b/riptide-soap/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-spring-boot-autoconfigure/pom.xml b/riptide-spring-boot-autoconfigure/pom.xml index df5412932..94b4468d9 100644 --- a/riptide-spring-boot-autoconfigure/pom.xml +++ b/riptide-spring-boot-autoconfigure/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-spring-boot-starter/pom.xml b/riptide-spring-boot-starter/pom.xml index 084e059f6..6c3193dd3 100644 --- a/riptide-spring-boot-starter/pom.xml +++ b/riptide-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent diff --git a/riptide-stream/pom.xml b/riptide-stream/pom.xml index 7ea8b8ebc..b5d0484e3 100644 --- a/riptide-stream/pom.xml +++ b/riptide-stream/pom.xml @@ -7,7 +7,7 @@ org.zalando riptide-parent - 3.4.0 + 3.4.1-SNAPSHOT ../riptide-parent