Fix flaky by akib6075 · Pull Request #1202 · SAP/cloud-security-services-integration-library

akib6075 · 2023-05-15T15:26:14Z

No description provided.

* bump spring-boot from 2.7.8 to 2.7.9 * bump spring-security from 5.8.1 to 5.8.2

* set the logback scope to test to fix regression * comment out impsort to fix the build pipeline

Bumps [spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.7.3.0 to 4.7.3.2. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](spotbugs/spotbugs-maven-plugin@spotbugs-maven-plugin-4.7.3.0...spotbugs-maven-plugin-4.7.3.2) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 8.1.0 to 8.1.2. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](jeremylong/DependencyCheck@v8.1.0...v8.1.2) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* bump org.json to 20230227

cla-assistant · 2023-05-15T15:26:31Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ akib6075
✅ finkmanAtSap
✅ liga-oz
✅ nenaraab
✅ beckermarc
❌ KaziAkibJaved
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

akib6075

compareObjects can not compare the different order of the properties of same two object. This change can resolve this flaky.

* remove httpclient caching from DefaultHttpClientFactory Signed-off-by: liga-oz <liga.ozolina@sap.com> * remove logcaptor Signed-off-by: liga-oz <liga.ozolina@sap.com> --------- Signed-off-by: liga-oz <liga.ozolina@sap.com>

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.24.2...assertj-build-3.25.1) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…AP#1337) Bumps [org.apache.maven.plugins:maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.21.0 to 3.21.2. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](apache/maven-pmd-plugin@maven-pmd-plugin-3.21.0...maven-pmd-plugin-3.21.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Līga <72249435+liga-oz@users.noreply.github.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

* Avoid warn messages in case there is no service configuration * fix fragile test * make the class fields more restrictive Signed-off-by: liga-oz <liga.ozolina@sap.com> --------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Co-authored-by: liga-oz <liga.ozolina@sap.com>

cleanup not used dependencies Signed-off-by: liga-oz <liga.ozolina@sap.com>

* make the generated attributes to be in the same order --------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

Signed-off-by: liga-oz <liga.ozolina@sap.com>

Bumps `slf4j.api.version` from 2.0.10 to 2.0.11. Updates `org.slf4j:slf4j-api` from 2.0.10 to 2.0.11 Updates `org.slf4j:slf4j-simple` from 2.0.10 to 2.0.11 --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 9.0.7 to 9.0.8. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](jeremylong/DependencyCheck@v9.0.7...v9.0.8) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps `spring.core.version` from 6.1.2 to 6.1.3. Updates `org.springframework:spring-core` from 6.1.2 to 6.1.3 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.2...v6.1.3) Updates `org.springframework:spring-web` from 6.1.2 to 6.1.3 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.2...v6.1.3) Updates `org.springframework:spring-aop` from 6.1.2 to 6.1.3 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.2...v6.1.3) Updates `org.springframework:spring-beans` from 6.1.2 to 6.1.3 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.1.2...v6.1.3) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-aop dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

….5 (SAP#1424) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.3...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [io.projectreactor:reactor-test](https://github.com/reactor/reactor-core) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.6.1...v3.6.2) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](reactor/reactor-core@v3.6.1...v3.6.2) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

--------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Signed-off-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

…n_in_config Remove uppercasing of service plan property when building OAuth2ServiceConfiguration from service bindings

…ndingMapper

Change fallback plan from "APPLICATION" to "application"

…1431) Bumps [uk.org.webcompere:system-stubs-jupiter](https://github.com/webcompere/system-stubs) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/webcompere/system-stubs/releases) - [Changelog](https://github.com/webcompere/system-stubs/blob/main/History.md) - [Commits](webcompere/system-stubs@system-stubs-parent-2.1.5...system-stubs-parent-2.1.6) --- updated-dependencies: - dependency-name: uk.org.webcompere:system-stubs-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

SAP#1432) Bumps [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.8.2.0 to 4.8.3.0. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](spotbugs/spotbugs-maven-plugin@spotbugs-maven-plugin-4.8.2.0...spotbugs-maven-plugin-4.8.3.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.8.0 to 5.9.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.8.0...v5.9.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: Līga <72249435+liga-oz@users.noreply.github.com>

Bumps [com.sap.cloud.environment.servicebinding:java-bom](https://github.com/SAP/btp-environment-variable-access) from 0.10.1 to 0.10.2. - [Release notes](https://github.com/SAP/btp-environment-variable-access/releases) - [Commits](SAP/btp-environment-variable-access@0.10.1...0.10.2) --- updated-dependencies: - dependency-name: com.sap.cloud.environment.servicebinding:java-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 9.0.8 to 9.0.9. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](jeremylong/DependencyCheck@v9.0.8...v9.0.9) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps `spring.boot.version` from 3.2.1 to 3.2.2. Updates `org.springframework.boot:spring-boot-dependencies` from 3.2.1 to 3.2.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.2.1...v3.2.2) Updates `org.springframework.boot:spring-boot-starter-test` from 3.2.1 to 3.2.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.2.1...v3.2.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 9.0.2 to 9.0.6. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](jeremylong/DependencyCheck@v9.0.2...v9.0.6) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update README.md --------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Signed-off-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.2. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.25.1...assertj-build-3.25.2) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…AP#1445) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.3 to 5.3.1. - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.3.1/RELEASE_NOTES.txt) - [Commits](apache/httpcomponents-client@rel/v5.3...rel/v5.3.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

finkmanAtSap and others added 13 commits February 21, 2023 09:30

Add maven-build-2.x.yml

7e6cf23

remove space from end of README to test Github workflow

a49bb07

remove old maven build Github workflow

0a26ad4

Bump version to 2.13.6 (SAP#1095)

c8dd76b

* bump spring-boot from 2.7.8 to 2.7.9 * bump spring-security from 5.8.1 to 5.8.2

Revert slf4j 2.x upgrade (SAP#1096)

a8080ec

Update Migration_JavaContainerSecurityProjects.md

b466eee

Update Migration_JavaContainerSecurityProjects.md

36e86fc

Fix token client logback scope (SAP#1105)

4662d6b

* set the logback scope to test to fix regression * comment out impsort to fix the build pipeline

Bump version 2.13.7 (SAP#1108)

2a8dedf

* bump org.json to 20230227

Create first_test.yml

e9f58e9

potentially fixed the flaky issue

fcce3bd

akib6075 commented May 28, 2023

View reviewed changes

KaziAkibJaved and others added 15 commits May 29, 2023 21:43

work-flow removed

34c680e

remove jetty bom and define dependencies explicitly

87022be

cleanup not used dependencies Signed-off-by: liga-oz <liga.ozolina@sap.com>

Make generated jwt attributes in a predictable order (SAP#1403)

6aaf717

* make the generated attributes to be in the same order --------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

cleanup dependencies

6067844

Signed-off-by: liga-oz <liga.ozolina@sap.com>

Use jetty-ee10 instead of jetty-ee9 (SAP#1418)

59b45df

bump version to 3.3.3 (SAP#1419)

2430469

Signed-off-by: liga-oz <liga.ozolina@sap.com>

apply formatter

e8607e7

Signed-off-by: liga-oz <liga.ozolina@sap.com>

dependabot bot and others added 23 commits January 11, 2024 16:01

remove toUpperCase() for service plan property in ServiceBindingMapper

3d59b16

remove line break

75fc213

fix weird white space

72defbc

bump version to 3.3.4 (SAP#1426)

ec10df5

--------- Signed-off-by: liga-oz <liga.ozolina@sap.com> Signed-off-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com>

Merge pull request SAP#1427 from SAP/fix/do_not_uppercase_service_pla…

dab6574

…n_in_config Remove uppercasing of service plan property when building OAuth2ServiceConfiguration from service bindings

change fallback plan from "APPLICATION" to "application" in ServiceBi…

6317163

…ndingMapper

Merge pull request SAP#1430 from SAP/fix/lowercase_fallback_service_plan

43beab4

Change fallback plan from "APPLICATION" to "application"

Update README.md

b89f98b

Signed-off-by: Līga <72249435+liga-oz@users.noreply.github.com>

Merge branch 'fix-flaky'

3cc2a16

akib6075 marked this pull request as ready for review January 28, 2024 17:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix flaky#1202

Fix flaky#1202
akib6075 wants to merge 51 commits intoSAP:mainfrom
akib6075:fix-flaky

akib6075 commented May 15, 2023

Uh oh!

cla-assistant bot commented May 15, 2023 •

edited

Loading

Uh oh!

akib6075 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

akib6075 commented May 15, 2023

Uh oh!

cla-assistant bot commented May 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akib6075 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cla-assistant bot commented May 15, 2023 •

edited

Loading