Merge from base #26

andersjaensson · 2023-03-06T11:15:35Z

update branch from base

Bumps [spring-boot-starter-webflux](https://github.com/spring-projects/spring-boot) from 2.6.4 to 2.6.6. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.6.4...v2.6.6) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-webflux dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>

[maven-scm] copy for tag 2.4.2 * tag '2.4.2': Release 2.4.2 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.5.0 * tag '2.5.0': Release 2.5.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.6.0 * tag '2.6.0': Release 2.6.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.6.1 * tag '2.6.1': Release 2.6.1 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.6.2 * tag '2.6.2': Release 2.6.2 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.7.0 * tag '2.7.0': Release 2.7.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.8.0 * tag '2.8.0': Release 2.8.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.9.0 * tag '2.9.0': Release 2.9.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.10.0 * tag '2.10.0': Release 2.10.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.11.0 * tag '2.11.0': Release 2.11.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-httpclient5/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.12.0 * tag '2.12.0': Release 2.12.0 Increased timeout # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-httpclient5/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-ktor-client/pom.xml # logbook-ktor-common/pom.xml # logbook-ktor-server/pom.xml # logbook-ktor/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.13.0 * tag '2.13.0': Release 2.13.0 # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-httpclient5/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-ktor-client/pom.xml # logbook-ktor-common/pom.xml # logbook-ktor-server/pom.xml # logbook-ktor/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

[maven-scm] copy for tag 2.14.0 * tag '2.14.0': Release 2.14.0 Added nexus plugin to root # Conflicts: # logbook-api/pom.xml # logbook-bom/pom.xml # logbook-common/pom.xml # logbook-core/pom.xml # logbook-httpclient/pom.xml # logbook-httpclient5/pom.xml # logbook-jaxrs/pom.xml # logbook-jmh/pom.xml # logbook-json/pom.xml # logbook-ktor-client/pom.xml # logbook-ktor-common/pom.xml # logbook-ktor-server/pom.xml # logbook-ktor/pom.xml # logbook-logstash/pom.xml # logbook-netty/pom.xml # logbook-okhttp/pom.xml # logbook-okhttp2/pom.xml # logbook-openfeign/pom.xml # logbook-parent/pom.xml # logbook-servlet/pom.xml # logbook-spring-boot-autoconfigure/pom.xml # logbook-spring-boot-starter/pom.xml # logbook-spring-boot-webflux-autoconfigure/pom.xml # logbook-spring-webflux/pom.xml # logbook-spring/pom.xml # logbook-test/pom.xml # pom.xml

…che.maven.plugins-maven-shade-plugin-3.4.1 Bump maven-shade-plugin from 3.2.4 to 3.4.1

Java 17 compiler support while keeping source/target levels intact

…endency Fix coveralls plugin dependency

…gument Fix deprecated kotlin maven plugin argument

Bumps [Paguro](https://github.com/GlenKPeterson/Paguro) from 3.1.4 to 3.10.3. - [Release notes](https://github.com/GlenKPeterson/Paguro/releases) - [Commits](https://github.com/GlenKPeterson/Paguro/commits/3.10.3) --- updated-dependencies: - dependency-name: org.organicdesign:Paguro dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…anicdesign-Paguro-3.10.3 Bump Paguro from 3.1.4 to 3.10.3

Bumps `mockito.version` from 4.11.0 to 5.1.1. Updates `mockito-core` from 4.11.0 to 5.1.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v4.11.0...v5.1.1) Updates `mockito-junit-jupiter` from 4.11.0 to 5.1.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v4.11.0...v5.1.1) Updates `mockito-inline` from 4.11.0 to 5.1.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v4.11.0...v5.1.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.mockito:mockito-inline dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

….version-5.1.1 Bump mockito.version from 4.11.0 to 5.1.1

* using profile while processing coverage data with coveralls

…gate

Add Coverage Profile To Reactor Pom

* Added support for Extend Log File Format * Update dependencies to fix build * Revert "Update dependencies to fix build" This reverts commit 944df6f. * Update according to comments remove unnecessary comments and add final to variables * Encapsulate local variable logic into enum lambda * Suppress CVE-2022-45688 This relates to jeremylong/DependencyCheck#5502.

# Conflicts: # .github/CODEOWNERS # .github/workflows/build.yaml # logbook-parent/pom.xml # pom.xml # release.sh

whiskeysierra and others added 30 commits February 2, 2021 22:49

Release 2.5.0

0ee4904

Release 2.4.2

94525b1

Release 2.6.0

ee00ea3

Release 2.6.1

dd9f0a4

Release 2.6.2

b308e52

Release 2.7.0

5c8e2f8

Release 2.8.0

4660a15

Release 2.9.0

79c3656

Release 2.10.0

451f543

Release 2.11.0

311d074

Increased timeout

bca8e07

Release 2.12.0

d783701

Release 2.13.0

afe8933

Added nexus plugin to root

4df4094

Release 2.14.0

841d124

Updated CHANGELOG

0c1455f

msdousti and others added 23 commits February 24, 2023 11:21

Merge pull request zalando#1433 from zalando/dependabot/maven/org.apa…

c410454

…che.maven.plugins-maven-shade-plugin-3.4.1 Bump maven-shade-plugin from 3.2.4 to 3.4.1

Update compiler to java 17

f27584b

Copy compiler settings to top-level

5278e2d

Remove compiler settings from logbook-parent

f95ec8e

Merge pull request zalando#1434 from zalando/java_17_support

ebaa589

Java 17 compiler support while keeping source/target levels intact

Add jaxb-api dependency to coveralls-maven-plugin

52f7f3a

Temporarily enable coveralls for pull requests

2579ac8

Move coveralls plugin to proper location

a2915b3

Fix coveralls:report to run the local version

3414192

revert: temporarily enable coveralls for pull requests

d871806

Merge pull request zalando#1435 from zalando/fix_coveralls_plugin_dep…

eed608c

…endency Fix coveralls plugin dependency

Fix deprecated kotlin maven plugin argument

6e574d7

Merge pull request zalando#1437 from zalando/fix_deprecated_kotlin_ar…

ece2258

…gument Fix deprecated kotlin maven plugin argument

Merge pull request zalando#1409 from zalando/dependabot/maven/org.org…

0b17c1b

…anicdesign-Paguro-3.10.3 Bump Paguro from 3.1.4 to 3.10.3

Merge pull request zalando#1402 from zalando/dependabot/maven/mockito…

825d740

….version-5.1.1 Bump mockito.version from 4.11.0 to 5.1.1

* added coverage profile to reactor pom

b226da8

* using profile while processing coverage data with coveralls

suppressing CVE-2022-45688 as there are no bugfixes ready yet to miti…

c8665a0

…gate

Merge pull request zalando#1441 from zalando/add_coverage_profile

527253d

Add Coverage Profile To Reactor Pom

fixed RemoteResponseTest (zalando#1436)

1b00c7e

Merge branch 'main' of https://github.com/zalando/logbook

8947a7f

# Conflicts: # .github/CODEOWNERS # .github/workflows/build.yaml # logbook-parent/pom.xml # pom.xml # release.sh

andersjaensson requested review from brahmdev, sverdlovka and PatrykDagielSmartbear as code owners March 6, 2023 11:15

fix: corrected parent

e739be8

andersjaensson force-pushed the merge-from-base branch from cc93ae0 to e739be8 Compare March 6, 2023 11:19

andersjaensson merged commit a49abe3 into main Mar 6, 2023

andersjaensson deleted the merge-from-base branch March 6, 2023 12:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge from base #26

Merge from base #26

andersjaensson commented Mar 6, 2023

Merge from base #26

Merge from base #26

Conversation

andersjaensson commented Mar 6, 2023