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

Migration to Spring Boot 3 #1471

Merged
merged 32 commits into from
Jun 23, 2023
Merged

Migration to Spring Boot 3 #1471

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6badfd5
Apply patch received from Christoph
cberg-zalando Jun 12, 2023
3741be9
Fix failsafe tests
msdousti Jun 12, 2023
1602549
Fix Micrometer tests
msdousti Jun 12, 2023
029071c
Fix OpenTracing tests
msdousti Jun 12, 2023
8107912
Fix OpenTelemetry tests
msdousti Jun 12, 2023
8c6dc4b
Fix SOAP tests
msdousti Jun 12, 2023
4b7b741
Fix test compilation issues - wip
msdousti Jun 12, 2023
3c8f8d5
Fix imports for riptide-spring-boot-autoconfigure
msdousti Jun 12, 2023
7374312
WIP - Initial changes to Spring Boot module
msdousti Jun 13, 2023
58d7747
Fix Tracer and Flow auto-configurations
msdousti Jun 17, 2023
1799299
Make tests more robust by accepting both localhost and 127.0.0.1
msdousti Jun 17, 2023
6d01005
Fix vulnerabilities and cve-suppressions.xml
msdousti Jun 17, 2023
0c890ee
Optimize imports
msdousti Jun 17, 2023
7eea501
Replace deprecated getRawStatusCode()
msdousti Jun 17, 2023
7d984bd
Fix coverage for riptide-core
msdousti Jun 17, 2023
51c0266
Fix coverage for riptide-httpclient
msdousti Jun 17, 2023
e45679e
Fix coverage for riptide-chaos
msdousti Jun 17, 2023
a7437ba
Fix coverage for riptide-idempotency
msdousti Jun 17, 2023
6964228
Use better test name
msdousti Jun 17, 2023
b1b25e5
Fix coverage for riptide-failsafe
msdousti Jun 17, 2023
8e98d15
Fix coverage for riptide-logbook
msdousti Jun 17, 2023
f3f9f23
Use executeOpen()
msdousti Jun 17, 2023
97ff505
Remove some warnings
msdousti Jun 17, 2023
f05fcb7
Fix typo
msdousti Jun 17, 2023
47a3ec8
Update maven to 3.9+ and enable cache-extension
msdousti Jun 17, 2023
408a766
Update maven wrapper to check build cache
msdousti Jun 17, 2023
7052bff
Bump dependencies
msdousti Jun 17, 2023
47ced1a
Bump Logbook version
msdousti Jun 19, 2023
f0c2f73
Apply changes to Auto-configuration
msdousti Jun 19, 2023
7194c0c
Add new lines at the end of all files
msdousti Jun 20, 2023
135147d
Use non-milestone version for junit-jupiter
msdousti Jun 20, 2023
6973029
Described removal of classes due to Spring 6 not supporting them anymore
cberg-zalando Jun 22, 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
10 changes: 10 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">

<extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.0.0</version>
</extension>

</extensions>
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file
Open in desktop

This file was deleted.

20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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
#
# https://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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
63 changes: 3 additions & 60 deletions cve-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
msdousti marked this conversation as resolved.
Show resolved Hide resolved
<gav>org.slf4j:slf4j-api:1.7.25</gav>
<cve>CVE-2018-8088</cve>
</suppress>

<suppress>
<packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.+@.*$</packageUrl>
<vulnerabilityName>CVE-2015-3192</vulnerabilityName>
<vulnerabilityName>CVE-2015-5211</vulnerabilityName>
<cve>CVE-2016-5007</cve>
<cve>CVE-2018-1270</cve>
<cve>CVE-2018-1271</cve>
<cve>CVE-2018-1272</cve>
</suppress>

<suppress>
<cve>CVE-2016-1000027</cve>
<cve>CVE-2019-12814</cve>
<cve>CVE-2020-5421</cve>
<cve>CVE-2020-7712</cve>
<cve>CVE-2020-9488</cve>
<cve>CVE-2020-10663</cve>
<cve>CVE-2022-22965</cve>
<cve>CVE-2022-38752</cve>
<cve>CVE-2022-38751</cve>
<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-2020-8908</cve>
</suppress>

<!-- https://github.com/jeremylong/DependencyCheck/issues/1921 -->
<suppress>
<gav regex="true">org\.springframework\.boot:.+:2\.1\.5\.RELEASE</gav>
<cve>CVE-2011-2730</cve>
<cve>CVE-2013-4152</cve>
<cve>CVE-2013-6429</cve>
<cve>CVE-2013-7315</cve>
<cve>CVE-2014-0054</cve>
</suppress>

<!-- https://spring.io/blog/2021/12/10/log4j2-vulnerability-and-spring-boot -->
<suppress>
<cve>CVE-2021-44228</cve>
<cve>CVE-2021-45105</cve>
<cve>CVE-2021-45046</cve>
<cve>CVE-2021-44832</cve>
</suppress>
<!-- Please add CPE or link for each CVE you add -->

<!--TODO: disabled temporary to fix the build-->
<suppress>
<cve>CVE-2023-20860</cve>
<cve>CVE-2023-20861</cve>
<cve>CVE-2023-20863</cve>
<cve>CVE-2023-1370</cve>
<cve>CVE-2023-20873</cve>
<!-- https://github.com/FasterXML/jackson-databind/issues/3972 -->
<cve>CVE-2023-35116</cve>
</suppress>
</suppressions>
Loading