Skip to content

chore: Update all non-major dependencies (v3.x.x) #4049

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.

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

Merged
merged 8 commits into from
Apr 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 5 deletions .github/actions/dump-jacoco/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ runs:
- name: Dump jacoco result
shell: bash
run: |
java -jar ./scripts/jacococli.jar dump --address zaas-service --port 6301 --destfile ./results/zaas-service.exec
java -jar ./scripts/jacococli.jar dump --address gateway-service --port 6300 --destfile ./results/gateway-service.exec
java -jar ./scripts/jacococli.jar dump --address caching-service --port 6306 --destfile ./results/caching-service.exec
java -jar ./scripts/jacococli.jar dump --address discovery-service --port 6302 --destfile ./results/discovery-service.exec
java -jar ./scripts/jacococli.jar dump --address api-catalog-services --port 6304 --destfile ./results/api-catalog-services.exec
java -jar ./scripts/jacococli.jar dump --retry 1 --address zaas-service --port 6301 --destfile ./results/zaas-service.exec || echo "ZAAS is not available to obtain JaCoCo report at the moment"
java -jar ./scripts/jacococli.jar dump --retry 1 --address gateway-service --port 6300 --destfile ./results/gateway-service.exec || echo "Gateway is not available to obtain JaCoCo report at the moment"
java -jar ./scripts/jacococli.jar dump --retry 1 --address caching-service --port 6306 --destfile ./results/caching-service.exec || echo "Caching service is not available to obtain JaCoCo report at the moment"
java -jar ./scripts/jacococli.jar dump --retry 1 --address discovery-service --port 6302 --destfile ./results/discovery-service.exec || echo "Discovery service is not available to obtain JaCoCo report at the moment"
java -jar ./scripts/jacococli.jar dump --retry 1 --address api-catalog-services --port 6304 --destfile ./results/api-catalog-services.exec || echo "API Catalog is not available to obtain JaCoCo report at the moment"
1 change: 1 addition & 0 deletions api-catalog-services/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ springBoot {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
1,015 changes: 509 additions & 506 deletions api-catalog-ui/frontend/package-lock.json

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions api-catalog-ui/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@emotion/is-prop-valid": "1.3.1",
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.0",
"@eslint/migrate-config": "1.3.1",
"@eslint/migrate-config": "1.4.0",
"@jest/globals": "29.7.0",
"@material-ui/core": "4.12.4",
"@material-ui/icons": "4.11.3",
Expand All @@ -17,14 +17,14 @@
"@react-loadable/revised": "1.5.0",
"@types/enzyme": "3.10.18",
"@types/jest": "29.5.14",
"@types/react": "18.3.18",
"@types/react": "18.3.20",
"agentkeepalive": "4.6.0",
"buffer": "6.0.3",
"emotion-theming": "11.0.0",
"exception-formatter": "2.1.2",
"graphiql": "3.8.3",
"graphql": "16.10.0",
"graphql-ws": "5.16.0",
"graphql-ws": "5.16.2",
"history": "5.3.0",
"htmr": "1.0.2",
"immutable": "^3.8.1 || ^4.0.0-rc.1",
Expand All @@ -37,9 +37,9 @@
"react-app-polyfill": "3.0.0",
"react-dom": "18.3.1",
"react-error-boundary": "5.0.0",
"react-hook-form": "7.54.2",
"react-hook-form": "7.55.0",
"react-redux": "9.2.0",
"react-router": "7.1.3",
"react-router": "7.4.1",
"react-toastify": "10.0.6",
"redux": "5.0.1",
"redux-catch": "1.3.1",
Expand All @@ -48,10 +48,10 @@
"redux-persist": "6.0.0",
"redux-persist-transform-filter": "0.0.22",
"redux-thunk": "3.1.0",
"rxjs": "7.8.1",
"sass": "1.84.0",
"rxjs": "7.8.2",
"sass": "1.86.0",
"stream": "0.0.3",
"swagger-ui-react": "5.18.3",
"swagger-ui-react": "5.20.3",
"url": "0.11.4",
"util": "0.12.5",
"uuid": "10.0.0"
Expand Down Expand Up @@ -81,41 +81,41 @@
"includeFailureMsg": true
},
"devDependencies": {
"@babel/core": "7.26.8",
"@babel/eslint-parser": "7.26.8",
"@babel/core": "7.26.10",
"@babel/eslint-parser": "7.27.0",
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@babel/preset-env": "7.26.8",
"@babel/preset-env": "7.26.9",
"@babel/preset-react": "7.26.3",
"@cfaester/enzyme-adapter-react-18": "0.8.0",
"@eslint/compat": "1.2.6",
"@eslint/js": "9.20.0",
"@eslint/compat": "1.2.7",
"@eslint/js": "9.23.0",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.2.0",
"@testing-library/user-event": "14.6.1",
"@reduxjs/toolkit": "2.5.0",
"@reduxjs/toolkit": "2.6.1",
"ajv": "8.17.1",
"ansi-regex": "6.1.0",
"body-parser": "1.20.3",
"caniuse-lite": "1.0.30001699",
"caniuse-lite": "1.0.30001707",
"concurrently": "9.1.2",
"cors": "2.8.5",
"cross-env": "7.0.3",
"cypress": "13.17.0",
"cypress-file-upload": "5.0.8",
"enzyme": "3.11.0",
"eslint": "9.20.0",
"eslint": "9.23.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-cypress": "4.2.0",
"eslint-plugin-flowtype": "8.0.3",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.2.3",
"eslint-plugin-prettier": "5.2.5",
"eslint-plugin-react": "7.37.4",
"express": "4.21.2",
"globals": "15.14.0",
"globals": "15.15.0",
"html-loader": "5.1.0",
"jest": "29.7.0",
"jest-environment-enzyme": "7.1.2",
Expand All @@ -128,36 +128,36 @@
"mini-css-extract-plugin": "2.9.2",
"nodemon": "3.1.9",
"nth-check": "2.1.1",
"prettier": "3.5.0",
"prettier": "3.5.3",
"prop-types": "15.8.1",
"querystring-es3": "0.2.1",
"react-app-rewired": "2.2.1",
"react-error-overlay": "6.0.11",
"react-error-overlay": "6.1.0",
"react-scripts": "5.0.1",
"redux-mock-store": "1.5.5",
"rimraf": "6.0.1",
"source-map-explorer": "2.5.3",
"start-server-and-test": "2.0.10",
"start-server-and-test": "2.0.11",
"tmpl": "1.0.5",
"undici": "6.19.8",
"yaml": "2.7.0"
"yaml": "2.7.1"
},
"overrides": {
"nth-check": "2.1.1",
"jsdom": "16.7.0",
"got": "14.4.6",
"react-error-overlay": "6.0.11",
"tough-cookie": "5.1.1",
"react-error-overlay": "6.1.0",
"tough-cookie": "5.1.2",
"@braintree/sanitize-url": "7.1.1",
"resolve-url-loader": "5.0.0",
"lodash": "4.17.21",
"semver": "7.7.1",
"@babel/traverse": "7.26.8",
"axios": "1.7.9"
"@babel/traverse": "7.27.0",
"axios": "1.8.4"
},
"engines": {
"npm": "=10.9.2",
"node": "=20.18.3"
"node": "=20.19.0"
},
"browserslist": [
">0.2%",
Expand Down
1 change: 1 addition & 0 deletions apiml-sample-extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ normalization {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ buildscript {
classpath libs.gradle.jib.plugin
classpath libs.apache.compress
}

}


Expand Down
1 change: 1 addition & 0 deletions caching-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ springBoot {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
1 change: 1 addition & 0 deletions discoverable-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ bootRun {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
1 change: 1 addition & 0 deletions discovery-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ springBoot {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
1 change: 1 addition & 0 deletions gateway-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ springBoot {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/code-quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ allprojects {

configurations.checkstyle {
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
select("com.google.guava:guava:33.4.0-jre")
select("com.google.guava:guava:33.4.6-jre")
}
}

Expand Down
72 changes: 36 additions & 36 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,40 @@ dependencyResolutionManagement {
version('projectNode', '20.14.0')
version('projectNpm', '10.7.0')

version('springBoot', '3.4.2')
version('springBootGraphQl', '3.4.2')
version('springCloudNetflix', '4.2.0')
version('springCloudCommons', '4.2.0')
version('springCloudCB', '3.2.0')
version('springCloudGateway', '4.2.0')
version('springFramework', '6.2.2')
version('springBoot', '3.4.4')
version('springBootGraphQl', '3.4.4')
version('springCloudNetflix', '4.2.1')
version('springCloudCommons', '4.2.1')
version('springCloudCB', '3.2.1')
version('springCloudGateway', '4.2.1')
version('springFramework', '6.2.5')
version('springRetry', '2.0.11')

version('glassfishHk2', '3.1.1')
version('zosUtils', '2.0.6')
version('aws', '1.12.780')
version('awaitility', '4.2.2')
version('aws', '1.12.782')
version('awaitility', '4.3.0')
version('bouncyCastle', '1.80')
version('caffeine', '3.2.0')
version('checkerQual', '3.49.0')
version('checkerQual', '3.49.1')
version('commonsLang3', '3.17.0')
version('commonsLogging', '1.3.5')
version('commonsText', '1.13.0')
version('commonsIo', '2.18.0')
version('ehCache', '3.10.8')
version('eureka', '2.0.4')
version('netflixServo', '0.13.2')
version('googleErrorprone', '2.36.0')
version('gradleGitProperties', '2.4.2') // Used in classpath dependencies
version('googleErrorprone', '2.37.0')
version('gradleGitProperties', '2.5.0') // Used in classpath dependencies
version('googleGson', '2.12.1')
version('guava', '33.4.0-jre')
version('guava', '33.4.6-jre')
version('hamcrest', '3.0')
version('httpClient4', '4.5.14')
version('httpClient5', '5.4.2')
version('infinispan', '15.1.5.Final')
version('jacksonCore', '2.18.2')
version('jacksonDatabind', '2.18.2')
version('jacksonDataformatYaml', '2.18.2')
version('httpClient5', '5.4.3')
version('infinispan', '15.2.0.Final')
version('jacksonCore', '2.18.3')
version('jacksonDatabind', '2.18.3')
version('jacksonDataformatYaml', '2.18.3')
version('janino', '3.1.12')
version('jakartaValidation', '3.1.1')
version('jakartaInject', '2.0.1')
Expand All @@ -54,49 +54,49 @@ dependencyResolutionManagement {
}
version('jbossLogging', '3.6.1.Final')
version('jerseySun', '1.19.4')
version('jettyWebSocketClient', '12.0.16')
version('jettyWebSocketClient', '12.0.18')
version('jettison', '1.5.4')
//0.12.x version contains breaking changes
version('jjwt', '0.12.6')
version('jodaTime', '2.13.1')
version('jodaTime', '2.14.0')
version('jsonPath', '2.9.0')
version('jsonSmart', '2.5.2')
version('junitJupiter', '5.11.4')
version('junitPlatform', '1.11.4')
version('lettuce', '6.5.3.RELEASE')
version('junitJupiter', '5.12.1')
version('junitPlatform', '1.12.1')
version('lettuce', '6.5.5.RELEASE')
// force version in build.gradle file - compatibility with Slf4j
version('log4j', '2.24.3')
version('lombok', '1.18.36')
version('netty', '4.1.118.Final')
version('netty', '4.1.119.Final')
// netty reactor contains a bug: https://github.com/reactor/reactor-netty/issues/3559 > https://github.com/reactor/reactor-netty/pull/3581
version('nettyReactor', '1.2.2')
version('nettyReactor', '1.2.4')
version('nimbusJoseJwt', '9.48')
version('openApiDiff', '2.0.1')
version('picocli', '4.7.6')

version('reactor', '3.7.2')
version('restAssured', '5.5.0')
version('reactor', '3.7.4')
version('restAssured', '5.5.1')
version('rhino', '1.8.0')
version('springDoc', '2.8.4')
version('swaggerCore', '2.2.28')
version('springDoc', '2.8.6')
version('swaggerCore', '2.2.29')
version('swaggerInflector', '2.0.12')
version('swagger2Parser', '1.0.73')
version('swagger3Parser', '2.1.25')
version('swagger3Parser', '2.1.26')
version('thymeleaf', '3.1.3.RELEASE')
version('velocity', '2.4.1')
version('woodstoxCore', '7.1.0')
version('jgit', '7.1.0.202411261347-r')
version('jgit', '7.2.0.202503040940-r')
version('gradleNode', '7.1.0')
version('sonarGradlePlugin', '5.1.0.4882')
version('gradleRelease', '3.1.0')
version('gradleLicencer', '0.6.1')
version('gradleJibPlugin', '3.4.4')
version('gradleJibPlugin', '3.4.5')
version('reactorBom', '2023.0')
version('gradleTestLogger', '4.0.0')
version('testLogger', '4.0.0')
version('micronautPlatform', '4.6.1')
version('micronaut', '4.8.1')
version('micronautPlugin', '4.4.5')
version('micronaut', '4.8.9')
version('micronautPlugin', '4.5.1')
version('shadow', '8.1.1')
version('checkstyle', '10.17.0')
version('jacoco', '0.8.11')
Expand Down Expand Up @@ -256,8 +256,8 @@ dependencyResolutionManagement {
plugin('micronaut_library', 'io.micronaut.library').versionRef('micronautPlugin')

// Pure Java dependencies - do not use in Spring unless really necessary
version('logback', '1.5.16')
version('mockitoCore', '5.15.2')
version('logback', '1.5.18')
version('mockitoCore', '5.16.1')
version('mockitoInline', '5.2.0')

library('logback_classic', 'ch.qos.logback', 'logback-classic').versionRef('logback')
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ configurations.all {
dependencies {
testImplementation project(':apiml-security-common')
testImplementation project(':zaas-client')
testImplementation group: 'org.springframework.graphql', name: 'spring-graphql-test', version: '1.3.3'
testImplementation group: 'org.springframework.graphql', name: 'spring-graphql-test', version: '1.3.4'


testImplementation libs.spring.boot.starter.actuator
Expand Down
1 change: 1 addition & 0 deletions mock-services/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ bootRun {
}

gitProperties {
dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git")
gitPropertiesDir = new File("${project.rootDir}/${name}/build/resources/main/META-INF")
}

Expand Down
Loading
Loading