Skip to content

Commit

Permalink
Merge branch 'develop' into feature/add-auxiliary-repository-view
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonEntholzer authored Oct 18, 2024
2 parents f3aa1b8 + b52e25e commit 0b8eec9
Show file tree
Hide file tree
Showing 4 changed files with 424 additions and 258 deletions.
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ dependencies {
exclude module: "jaxb-api"
}

implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.5"
implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.6"

implementation "de.jplag:jplag:${jplag_version}"

Expand Down Expand Up @@ -329,7 +329,7 @@ dependencies {
// implementation "org.springdoc:springdoc-openapi-ui:1.8.0"

// use the latest version to avoid security vulnerabilities
implementation "org.springframework:spring-webmvc:6.1.13"
implementation "org.springframework:spring-webmvc:6.1.14"

implementation "com.vdurmont:semver4j:3.1.0"

Expand All @@ -345,7 +345,7 @@ dependencies {

implementation "tech.jhipster:jhipster-framework:${jhipster_dependencies_version}"
implementation "org.springframework.boot:spring-boot-starter-cache:${spring_boot_version}"
implementation "io.micrometer:micrometer-registry-prometheus:1.13.5"
implementation "io.micrometer:micrometer-registry-prometheus:1.13.6"
implementation "net.logstash.logback:logstash-logback-encoder:8.0"

// Defines low-level streaming API, and includes JSON-specific implementations
Expand Down Expand Up @@ -397,8 +397,8 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-oauth2-client:${spring_boot_version}"

implementation "org.springframework.ldap:spring-ldap-core:3.2.6"
implementation "org.springframework.data:spring-data-ldap:3.3.4"
implementation "org.springframework.ldap:spring-ldap-core:3.2.7"
implementation "org.springframework.data:spring-data-ldap:3.3.5"

implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.3") {
// NOTE: these modules contain security vulnerabilities and are not needed
Expand All @@ -409,8 +409,8 @@ dependencies {
implementation "org.springframework.cloud:spring-cloud-commons:4.1.4"

implementation "io.netty:netty-all:4.1.114.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.22"
implementation "org.springframework:spring-messaging:6.1.13"
implementation "io.projectreactor.netty:reactor-netty:1.1.23"
implementation "org.springframework:spring-messaging:6.1.14"
implementation "org.springframework.retry:spring-retry:2.0.9"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
Expand Down Expand Up @@ -440,7 +440,7 @@ dependencies {
implementation "org.bouncycastle:bcpkix-jdk18on:1.78.1"
implementation "org.bouncycastle:bcprov-jdk18on:1.78.1"

implementation "com.mysql:mysql-connector-j:9.0.0"
implementation "com.mysql:mysql-connector-j:9.1.0"
implementation "org.postgresql:postgresql:42.7.4"

implementation "org.zalando:problem-spring-web:0.29.1"
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ slf4j_version=2.0.16
sentry_version=7.15.0
liquibase_version=4.29.2
docker_java_version=3.4.0
logback_version=1.5.10
logback_version=1.5.11
java_parser_version=3.26.2
byte_buddy_version=1.15.4
byte_buddy_version=1.15.5

# testing
# make sure both versions are compatible
junit_version=5.11.0
junit_platform_version=1.11.2
mockito_version=5.14.1
mockito_version=5.14.2


# gradle plugin version
Expand Down
Loading

0 comments on commit 0b8eec9

Please sign in to comment.