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

chore: spring 6, springboot 3 #3303

Merged
merged 172 commits into from
Feb 8, 2024
Merged

chore: spring 6, springboot 3 #3303

merged 172 commits into from
Feb 8, 2024

Conversation

achmelo
Copy link
Member

@achmelo achmelo commented Jan 31, 2024 •
edited
Loading

Description

Upgrade spring dependencies to (currently) the latest version together with transitive dependencies, e.g. Apache HTTP client. More info in the linked issues.

Linked to #2959
Part of the #3113

Type of change

Please delete options that are not relevant.

  • fix: Bug fix (non-breaking change which fixes an issue)
  • feat: New feature (non-breaking change which adds functionality)
  • docs: Change in a documentation
  • refactor: Refactor the code
  • chore: Chore, repository cleanup, updates the dependencies.
  • BREAKING CHANGE or !: Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the style guidelines of this project
  • PR title conforms to commit message guideline ## Commit Message Structure Guideline
  • I have commented my code, particularly in hard-to-understand areas. In JS I did provide JSDoc
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • The java tests in the area I was working on leverage @nested annotations
  • Any dependent changes have been merged and published in downstream modules

For more details about how should the code look like read the Contributing guideline

weinfurt and others added 30 commits January 10, 2024 15:47
@weinfurt
Upgrade gradle-git-properties plugin
963981b 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Resolve reflection issues for tomcat-common tests.
5b799b4 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Resolve reflection issues for discovery-service tests.
99d0ec7 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Api-layer built successfully with Java 17
3b50fec 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Update the source and target compatibility to Java 17
32e5bde 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@taban03
move workflow to java17
87b6c60 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@taban03
fix unit test
eddc786 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@taban03
add add-opens prop to all the tests gradle tasks
91df14a 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@weinfurt
Fix test syntetic to invoke jacocoInit() method
e4073e5 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@taban03
fix WebSocketRoutedSessionTest test
acba10a 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@taban03
fix unit test
3c97e48 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@taban03
fixed remaining tests
8c672d2 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@weinfurt
Add JVM args to npm run scripts
7ff4c61 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Add JVM args to start.sh scripts
22f686a 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@weinfurt
Define jvmArgs differently for integration tests.
8109aff 
Signed-off-by: Petr Weinfurt <petr.weinfurt@broadcom.com>
@taban03
attempt
4cae4f7 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@taban03
attempt
fa39a27 
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
@JirkaAichler
Do not read :-)
363f8f1 
Signed-off-by: Jiri Aichler <jiri.aichler@broadcom.com>
@achmelo
change deprecated calls
17821de 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@JirkaAichler
Eureka starts
06d6353 
Signed-off-by: Jiri Aichler <jiri.aichler@broadcom.com>
@JirkaAichler
Merge remote-tracking branch 'origin/v3.x.x' into apiml/spring-boot-3
8498080 
# Conflicts:
#	api-catalog-package/src/main/resources/bin/start.sh
#	caching-service-package/src/main/resources/bin/start.sh
#	cloud-gateway-package/src/main/resources/bin/start.sh
#	config/zowe-api-dev/alternative_start.sh
#	discovery-package/src/main/resources/bin/start.sh
#	gateway-package/src/main/resources/bin/start.sh
#	gradle/jib.gradle
#	metrics-service-package/src/main/resources/bin/start.sh
#	package.json
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
41d595c 
…spring-boot-3
@achmelo
vorking version of SCG
f1cfff3 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@JirkaAichler
Fix
64db5b1 
Signed-off-by: Jiri Aichler <jiri.aichler@broadcom.com>
@achmelo
fix additional registration
94cdead 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
aa77ed7 
…spring-boot-3
@JirkaAichler
Fix Catalog
94b545a 
Signed-off-by: Jiri Aichler <jiri.aichler@broadcom.com>
@JirkaAichler
Fix Mock
9b7a952 
Signed-off-by: Jiri Aichler <jiri.aichler@broadcom.com>
@achmelo
passing SCG unit tests
76a45ed 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
70a1b32 
…spring-boot-3

# Conflicts:
#	common-service-core/src/main/java/org/zowe/apiml/security/HttpsFactory.java
achmelo and others added 15 commits February 6, 2024 15:52
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
9aa0474 
…spring-boot-3
update coverage settings (remove metrics service)
f2824d0 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
fix warnings, coverage error fix
bfc751d 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
@achmelo
package v2 gateway, run gateway jar from package locationm
3067572 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
b902839 
…spring-boot-3
skip cloud gateway package in sonar
2cd71b3 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Merge branch 'apiml/spring-boot-3' of https://github.com/zowe/api-layer…
63b92c7 
… into apiml/spring-boot-3
ignore gateway-package in sonar
4fbe288 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
strict stubbing in GatewaySecurityServiceTest
13c371c 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
spaces
5af713b 
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
@achmelo
revert zuul gateway changes
e50b6ad 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
remove commented code
c9d4f59 
Signed-off-by: achmelo <a.chmelo@gmail.com>
Merge branch 'apiml/spring-boot-3' of https://github.com/zowe/api-layer…
b3418ba 
… into apiml/spring-boot-3
@achmelo
remove missed files from zuul gateway changes
27c8536 
Signed-off-by: achmelo <a.chmelo@gmail.com>
Merge branch 'apiml/spring-boot-3' of https://github.com/zowe/api-layer…
03b6180 
… into apiml/spring-boot-3
@achmelo
update RefreshablePeerEurekaNodes with changes from origin(Spring)
54ca557 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
remove unused eureka client builder
33cdace 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
Merge remote-tracking branch 'origin/apiml/spring-boot-3' into apiml/…
92c66ea 
…spring-boot-3
@achmelo
replace mock with arraylist to avoid null
acf550b 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo achmelo marked this pull request as ready for review February 7, 2024 12:27
@achmelo
use latest v2 zuul gateway
0f675df 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
remove comments, align amount with original
a57e9f0 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
remove invalid code comments
346267d 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
resttemplate unit test
e973155 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@achmelo
add license
6fc34fd 
Signed-off-by: achmelo <a.chmelo@gmail.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Feb 8, 2024

Quality Gate Passed Quality Gate passed

Issues
51 New issues

Measures
0 Security Hotspots
83.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@achmelo achmelo merged commit 7b5019e into v3.x.x Feb 8, 2024
31 checks passed
@delete-merged-branch delete-merged-branch bot deleted the apiml/spring-boot-3 branch February 8, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablocarle pablocarle pablocarle approved these changes

Assignees
No one assigned
Labels
Sensitive Sensitive change that requires peer review size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@achmelo @pablocarle @weinfurt @taban03 @JirkaAichler @pj892031