Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release refs/heads/release/3.4.0 #1464

Merged
merged 7 commits into from
Jun 5, 2023
Merged

Release refs/heads/release/3.4.0 #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9f4417
Synchronize SPI decorator loading
lukasniemeier-zalando Jun 2, 2023
d3a627e
Use JDK8 functionality for list creation
fatroom Jun 5, 2023
49408d8
Spring update
fatroom Jun 5, 2023
b2f4580
Change version to SNAPSHOT
fatroom Jun 5, 2023
9015357
Release 3.4.0
fatroom Jun 5, 2023
f61aa8f
Development 3.4.1-SNAPSHOT
fatroom Jun 5, 2023
9894d6a
Merged master
fatroom Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cve-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<cve>CVE-2022-38750</cve>
<cve>CVE-2022-25857</cve>
<cve>CVE-2022-38749</cve>
<cve>CVE-2021-37533</cve>
<cve>CVE-2022-41854</cve>
<cve>CVE-2022-1471</cve>
<cve>CVE-2021-4277</cve>
<cve>CVE-2022-3064</cve>
<cve>CVE-2021-4235</cve>
<cve>CVE-2022-45688</cve>
<cve>CVE-2021-37533</cve>
<cve>CVE-2022-41854</cve>
<cve>CVE-2022-1471</cve>
<cve>CVE-2021-4277</cve>
<cve>CVE-2022-3064</cve>
<cve>CVE-2021-4235</cve>
<cve>CVE-2022-45688</cve>
<cve>CVE-2020-8908</cve>
</suppress>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.zalando</groupId>
<artifactId>riptide</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Riptide</name>
Expand Down
2 changes: 1 addition & 1 deletion riptide-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
40 changes: 20 additions & 20 deletions riptide-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</parent>

<artifactId>riptide-bom</artifactId>
Expand All @@ -21,97 +21,97 @@
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-auth</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-capture</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-chaos</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-compatibility</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-concurrent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-core</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-failsafe</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-faults</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-httpclient</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-idempotency</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-logbook</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-micrometer</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-opentracing</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-opentelemetry</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-problem</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-soap</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-spring-boot-autoconfigure</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-spring-boot-starter</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-stream</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion riptide-capture/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-chaos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-compatibility/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-compression/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-concurrent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-failsafe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-faults/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-httpclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-idempotency/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-logbook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-micrometer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-opentelemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-opentracing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
1 change: 1 addition & 0 deletions ...racing/src/main/java/org/zalando/riptide/opentracing/span/ServiceLoaderSpanDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion riptide-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
</parent>

<artifactId>riptide-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion riptide-problem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-soap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-stream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down