Skip to content

Commit

Permalink
Merge branch 'develop' into feature/development/improveEndpointAnalysis
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan-Thurner authored Aug 21, 2024
2 parents 7a69122 + 4dc60a8 commit 9eea8d1
Show file tree
Hide file tree
Showing 29 changed files with 727 additions and 710 deletions.
26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ dependencies {
implementation "com.github.docker-java:docker-java-transport-httpclient5:${docker_java_version}"

// use newest version of commons-compress to avoid security issues through outdated dependencies
implementation "org.apache.commons:commons-compress:1.27.0"
implementation "org.apache.commons:commons-compress:1.27.1"


// import JHipster dependencies BOM
Expand Down Expand Up @@ -373,8 +373,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.4"
implementation "org.springframework.data:spring-data-ldap:3.3.2"
implementation "org.springframework.ldap:spring-ldap-core:3.2.6"
implementation "org.springframework.data:spring-data-ldap:3.3.3"

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 @@ -385,9 +385,9 @@ dependencies {
implementation "org.springframework.cloud:spring-cloud-commons:4.1.4"

implementation "io.netty:netty-all:4.1.112.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.21"
implementation "org.springframework:spring-messaging:6.1.11"
implementation "org.springframework.retry:spring-retry:2.0.7"
implementation "io.projectreactor.netty:reactor-netty:1.1.22"
implementation "org.springframework:spring-messaging:6.1.12"
implementation "org.springframework.retry:spring-retry:2.0.8"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
implementation "org.springframework.security:spring-security-data:${spring_security_version}"
Expand Down Expand Up @@ -427,7 +427,7 @@ dependencies {
implementation "org.zalando:jackson-datatype-problem:0.27.1"
implementation "com.ibm.icu:icu4j-charset:75.1"
implementation "com.github.seancfoley:ipaddress:5.5.0"
implementation "org.apache.maven:maven-model:3.9.8"
implementation "org.apache.maven:maven-model:3.9.9"
// NOTE: 3.0.2 is broken for splitting lecture specific PDFs
implementation "org.apache.pdfbox:pdfbox:3.0.1"
implementation "org.apache.commons:commons-csv:1.11.0"
Expand All @@ -436,7 +436,7 @@ dependencies {
implementation "net.lingala.zip4j:zip4j:2.11.5"
implementation "org.jgrapht:jgrapht-core:1.5.2"
// use newest version of guava to avoid security issues through outdated dependencies
implementation "com.google.guava:guava:33.2.1-jre"
implementation "com.google.guava:guava:33.3.0-jre"
implementation "com.sun.activation:jakarta.activation:2.0.1"

// use newest version of gson to avoid security issues through outdated dependencies
Expand Down Expand Up @@ -470,11 +470,11 @@ dependencies {
testImplementation "org.assertj:assertj-core:3.26.3"
testImplementation "org.mockito:mockito-core:${mockito_version}"
testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
testImplementation "io.github.classgraph:classgraph:4.8.174"
testImplementation "io.github.classgraph:classgraph:4.8.175"
testImplementation "org.awaitility:awaitility:4.2.2"
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
testImplementation "org.gradle:gradle-tooling-api:8.9"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.3.1"
testImplementation "org.gradle:gradle-tooling-api:8.10"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.4.0"
testImplementation "com.opencsv:opencsv:5.9"
testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
exclude group: "org.testcontainers", module: "mariadb"
Expand All @@ -486,7 +486,7 @@ dependencies {
}
testImplementation("net.bytebuddy:byte-buddy") {
version {
strictly "1.14.18"
strictly "1.14.19"
}
}
// cannot update due to "Syntax error in SQL statement "WITH ids_to_delete"
Expand Down Expand Up @@ -558,7 +558,7 @@ tasks.withType(Test).configureEach {
}

wrapper {
gradleVersion = "8.9"
gradleVersion = "8.10"
}

tasks.register("stage") {
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ npm_version=10.7.0
# Dependency versions
jhipster_dependencies_version=8.6.0
spring_boot_version=3.3.2
spring_security_version=6.3.1
spring_security_version=6.3.2
# TODO: before we upgrade to 6.5.x, we need to make sure that there are no performance issues with empty sets or lists
hibernate_version=6.4.9.Final
# TODO: can we update to 5.x?
Expand All @@ -25,10 +25,11 @@ sshd_version=2.13.2
checkstyle_version=10.17.0
jplag_version=5.1.0
slf4j_version=2.0.16
sentry_version=7.13.0
sentry_version=7.14.0
liquibase_version=4.29.1
docker_java_version=3.4.0
logback_version=1.5.6
logback_version=1.5.7
java_parser_version=3.26.1

# gradle plugin version
gradle_node_plugin_version=7.0.2
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.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
Loading

0 comments on commit 9eea8d1

Please sign in to comment.