Skip to content

Commit

Permalink
Merge branch 'develop' into feature/programming-exercises/ruby-template
Browse files Browse the repository at this point in the history
  • Loading branch information
magaupp authored Jan 28, 2025
2 parents dd52d3d + c8c93d2 commit 00d7c71
Show file tree
Hide file tree
Showing 67 changed files with 671 additions and 875 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ plugins {
id "com.adarshr.test-logger" version "4.0.0"
id "com.diffplug.spotless" version "${spotless_plugin_version}"
id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
id "com.github.ben-manes.versions" version "0.51.0"
id "com.github.ben-manes.versions" version "0.52.0"
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
id "com.google.cloud.tools.jib" version "3.4.4"
id "com.gorylenko.gradle-git-properties" version "2.4.2"
id "io.spring.dependency-management" version "1.1.7"
id "nebula.lint" version "20.5.5"
id "nebula.lint" version "20.5.6"
id "org.liquibase.gradle" version "${liquibase_plugin_version}"
id "org.owasp.dependencycheck" version "12.0.1"
id "org.springframework.boot" version "${spring_boot_version}"
Expand Down Expand Up @@ -225,7 +225,7 @@ dependencies {
implementation "org.apache.santuario:xmlsec:4.0.3"

implementation "org.jsoup:jsoup:1.18.3"
implementation "commons-codec:commons-codec:1.17.2" // needed for spring security saml2
implementation "commons-codec:commons-codec:1.18.0" // needed for spring security saml2

// use the latest version to avoid security vulnerabilities
implementation "org.springframework:spring-webmvc:${spring_framework_version}"
Expand Down Expand Up @@ -352,7 +352,7 @@ dependencies {

// used for testing and Java Template Upgrade Service
implementation "org.apache.maven:maven-model:3.9.9"
implementation "org.apache.pdfbox:pdfbox:3.0.3"
implementation "org.apache.pdfbox:pdfbox:3.0.4"
implementation "org.apache.commons:commons-csv:1.13.0"
implementation "org.commonmark:commonmark:0.24.0"
implementation "commons-fileupload:commons-fileupload:1.5"
Expand Down
2 changes: 0 additions & 2 deletions docker/test-server-multi-node-postgresql-localci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ services:
artemis-app-node-3:
condition: service_started
restart: always
command:
- rm -rf /var/log/nginx
volumes:
- ./nginx/artemis-upstream-multi-node.conf:/etc/nginx/includes/artemis-upstream.conf:ro
- ./nginx/artemis-ssh-upstream-multi-node.conf:/etc/nginx/includes/artemis-ssh-upstream.conf:ro
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ npm_version=10.9.0

# Dependency versions
jhipster_dependencies_version=8.8.0
spring_boot_version=3.4.1
spring_boot_version=3.4.2
spring_framework_version=6.2.2
spring_cloud_version=4.2.0
spring_security_version=6.4.2
Expand All @@ -22,20 +22,20 @@ fasterxml_version=2.18.2
# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update
jgit_version=7.0.0.202409031743-r
sshd_version=2.14.0
checkstyle_version=10.21.1
checkstyle_version=10.21.2
jplag_version=5.1.0
# not really used in Artemis, nor JPlag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerability warnings
# NOTE: we cannot need to use the latest version 9.x or 10.x here as long as Stanford CoreNLP does not reference it
lucene_version=8.11.4
slf4j_version=2.0.16
sentry_version=7.20.1
sentry_version=8.0.0
liquibase_version=4.31.0
docker_java_version=3.4.1
logback_version=1.5.16
java_parser_version=3.26.2
byte_buddy_version=1.16.1
netty_version=4.1.115.Final
mysql_version=9.1.0
mysql_version=9.2.0
micrometer_version=1.14.3

# testing
Expand Down
2 changes: 1 addition & 1 deletion gradle/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ext {
"CLASS": 2
],
"atlas" : [
"INSTRUCTION": 0.860,
"INSTRUCTION": 0.850,
"CLASS": 12
],
"buildagent" : [
Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 88.75,
branches: 74.31,
functions: 82.93,
lines: 88.77,
statements: 88.84,
branches: 74.47,
functions: 83.03,
lines: 88.86,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Loading

0 comments on commit 00d7c71

Please sign in to comment.