Skip to content

Commit

Permalink
chore: Upgrade dependencies V1 (#3128)
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Jareš <[email protected]>
  • Loading branch information
pj892031 authored Oct 10, 2023
1 parent 695fb4c commit 7b50e3e
Show file tree
Hide file tree
Showing 10 changed files with 1,141 additions and 1,302 deletions.
179 changes: 23 additions & 156 deletions api-catalog-ui/frontend/package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions api-catalog-ui/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"loglevel": "1.6.1",
"mineral-ui": "0.58.0",
"mineral-ui-icons": "0.5.0",
"ramda": "0.28.0",
"ramda": "0.29.1",
"react": "16.14.0",
"react-app-polyfill": "0.1.3",
"react-dom": "16.14.0",
Expand Down Expand Up @@ -50,7 +50,9 @@
"react-error-overlay": "6.0.9",
"fast-json-patch": "3.1.1",
"isomorphic-fetch": "1.7.0",
"semver": "7.5.4"
"semver": "7.5.4",
"tough-cookie": "4.1.3",
"@braintree/sanitize-url": "6.0.4"
},
"scripts": {
"lint": "eslint \"src/**/*.{js,jsx}\"",
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ allprojects {
// versions are clashing - Micronaut enabler requires both versions, Gradle as default selected newer one
//substitute(module('javax.inject:javax.inject:1')).using(module('jakarta.inject:jakarta.inject-api:1.0.5'))
substitute(module('javax.activation:javax.activation-api:1.0')).using(module('jakarta.activation:jakarta.activation-api:1.2.2'))

// upgrade Bouncy Castle from 1.5 to 1.8
substitute(module('org.bouncycastle:bcprov-jdk15on')).using(module("org.bouncycastle:bcprov-jdk18on:${bouncyCastleVersion}"))
substitute(module('org.bouncycastle:bcpkix-jdk15on')).using(module("org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}"))
}

resolutionStrategy.force "org.slf4j:slf4j-api:${slf4jVersion}"
Expand Down
27 changes: 0 additions & 27 deletions caching-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,6 @@ dependencies {
implementation libraries.jackson_core
implementation libraries.jackson_databind

implementation libraries.netty
implementation libraries.netty_buffer
implementation libraries.netty_codec
implementation libraries.netty_codec_dns
implementation libraries.netty_codec_haproxy
implementation libraries.netty_codec_http
implementation libraries.netty_codec_http2
implementation libraries.netty_codec_memcache
implementation libraries.netty_codec_mqtt
implementation libraries.netty_codec_redis
implementation libraries.netty_codec_socks
implementation libraries.netty_codec_smtp
implementation libraries.netty_codec_stomp
implementation libraries.netty_codec_xml
implementation libraries.netty_common
implementation libraries.netty_handler
implementation libraries.netty_handler_proxy
implementation libraries.netty_resolver
implementation libraries.netty_resolver_dns
implementation libraries.netty_resolver_dns_native_macos
implementation libraries.netty_transport
implementation libraries.netty_transport_native_epoll
implementation libraries.netty_transport_native_kqueue
implementation libraries.netty_transport_native_unix_common
implementation libraries.netty_transport_rxtx
implementation libraries.netty_transport_sctp
implementation libraries.netty_transport_udt
implementation libraries.logback_core
implementation libraries.logback_classic

Expand Down
27 changes: 0 additions & 27 deletions gateway-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,33 +116,6 @@ dependencies {
implementation libraries.jetty_websocket_api
implementation libraries.jjwt
implementation libraries.nimbusJoseJwt
implementation libraries.netty
implementation libraries.netty_buffer
implementation libraries.netty_codec
implementation libraries.netty_codec_dns
implementation libraries.netty_codec_haproxy
implementation libraries.netty_codec_http
implementation libraries.netty_codec_http2
implementation libraries.netty_codec_memcache
implementation libraries.netty_codec_mqtt
implementation libraries.netty_codec_redis
implementation libraries.netty_codec_socks
implementation libraries.netty_codec_smtp
implementation libraries.netty_codec_stomp
implementation libraries.netty_codec_xml
implementation libraries.netty_common
implementation libraries.netty_handler
implementation libraries.netty_handler_proxy
implementation libraries.netty_resolver
implementation libraries.netty_resolver_dns
implementation libraries.netty_resolver_dns_native_macos
implementation libraries.netty_transport
implementation libraries.netty_transport_native_epoll
implementation libraries.netty_transport_native_kqueue
implementation libraries.netty_transport_native_unix_common
implementation libraries.netty_transport_rxtx
implementation libraries.netty_transport_sctp
implementation libraries.netty_transport_udt
implementation libraries.thymeleaf
implementation libraries.thymeleafSpring
implementation libraries.logback_core
Expand Down
18 changes: 9 additions & 9 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ ext {
springCloudCommonsVersion = '2.2.9.RELEASE'
springCloudLoadBalancerVersion = '2.2.9.RELEASE'
springCloudVersion3 = '3.1.7'
springSecurityVersion = '5.7.10'
springFrameworkVersion = '5.3.29'
springSecurityVersion = '5.7.11'
springFrameworkVersion = '5.3.30'
springRetryVersion = '1.2.5.RELEASE'
springWebTestClientVersion = '4.4.0'

attlsVersion = '1.21.3'
awaitilityVersion = '3.0.0'
awsSdkVersion = '1.12.482'
bouncyCastleVersion = '1.70'
awsSdkVersion = '1.12.565'
bouncyCastleVersion = '1.76'
bootstrapVersion = '4.3.1'
commonsCodecVersion = '1.15'
commonsLang3Version = '3.12.0'
Expand All @@ -27,7 +27,7 @@ ext {
hamcrestVersion = '1.3'
httpClientVersion = '4.5.14'
httpCoreVersion = '4.4.16'
infinispanVersion = '13.0.17.Final'
infinispanVersion = '13.0.18.Final'
jacksonCoreVersion = '2.15.1'
jacksonDatabindVersion = '2.15.2'
jacksonDataformatYamlVersion = '2.15.2'
Expand All @@ -37,7 +37,7 @@ ext {
javaxServletApiVersion = '4.0.1'
jaxbApiVersion = '2.3.1'
jerseyVersion = '2.26'
jettyWebSocketClientVersion = '9.4.51.v20230217'
jettyWebSocketClientVersion = '9.4.52.v20230823'
jettisonVersion = '1.5.4'
jjwtVersion = '0.11.5'
jjwtFullVersion = '0.9.1'
Expand All @@ -55,7 +55,7 @@ ext {
lombokVersion = '1.18.28'
mockitoCoreVersion = '4.9.0'
netflixServoVersion = '0.13.2'
nettyVersion = '4.1.96.Final'
nettyVersion = '4.1.99.Final'
nimbusJoseJwtVersion = '8.21.1'
openApiDiffVersion = '2.0.1'
reactorTestVersion = '3.5.0'
Expand Down Expand Up @@ -134,8 +134,8 @@ ext {
apache_velocity : "org.apache.velocity:velocity-engine-core:${velocityVersion}",
awaitility : "org.awaitility:awaitility:${awaitilityVersion}",
aws_sdk_core : "com.amazonaws:aws-java-sdk-core:${awsSdkVersion}",
bcprov : "org.bouncycastle:bcprov-jdk15on:${bouncyCastleVersion}",
bcpkix : "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}",
bcprov : "org.bouncycastle:bcprov-jdk18on:${bouncyCastleVersion}",
bcpkix : "org.bouncycastle:bcpkix-jdk18on:${bouncyCastleVersion}",
bootstrap : "org.webjars:bootstrap:${bootstrapVersion}",
commons_io : "commons-io:commons-io:${commonsIoVersion}",
eh_cache : "org.ehcache:ehcache:${ehCacheVersion}",
Expand Down
47 changes: 17 additions & 30 deletions metrics-service-ui/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion metrics-service-ui/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"nth-check": "2.0.1",
"jsdom": "16.6.0",
"got": "12.1.0",
"semver": "7.5.4"
"semver": "7.5.4",
"tough-cookie": "4.1.3"
},
"scripts": {
"lint": "eslint \"src/**/*.{js,jsx}\"",
Expand Down
Loading

0 comments on commit 7b50e3e

Please sign in to comment.