Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into chore/communicatio…
Browse files Browse the repository at this point in the history
…n/update-jacoco-class-count
  • Loading branch information
PaRangger committed Jan 22, 2025
2 parents 33af879 + 8c26290 commit 36ab855
Show file tree
Hide file tree
Showing 183 changed files with 2,722 additions and 1,266 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
id "io.spring.dependency-management" version "1.1.7"
id "nebula.lint" version "20.5.5"
id "org.liquibase.gradle" version "${liquibase_plugin_version}"
id "org.owasp.dependencycheck" version "12.0.0"
id "org.owasp.dependencycheck" version "12.0.1"
id "org.springframework.boot" version "${spring_boot_version}"
}

Expand Down Expand Up @@ -205,7 +205,7 @@ dependencies {
implementation "org.apache.sshd:sshd-sftp:${sshd_version}"

// https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
implementation "net.sourceforge.plantuml:plantuml:1.2024.8"
implementation "net.sourceforge.plantuml:plantuml:1.2025.0"
implementation "me.xdrop:fuzzywuzzy:1.4.0"
implementation("org.yaml:snakeyaml") {
version {
Expand Down Expand Up @@ -410,7 +410,7 @@ dependencies {
testImplementation "org.springframework.boot:spring-boot-starter-test:${spring_boot_version}"
testImplementation "org.springframework.security:spring-security-test:${spring_security_version}"
testImplementation "org.springframework.boot:spring-boot-test:${spring_boot_version}"
testImplementation "org.assertj:assertj-core:3.27.2"
testImplementation "org.assertj:assertj-core:3.27.3"
testImplementation "org.mockito:mockito-core:${mockito_version}"
testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"

Expand Down Expand Up @@ -497,7 +497,7 @@ tasks.named("dependencyUpdates").configure {
// 2c) Run tests for modules: ./gradlew test -DincludeModules=athena,atlas -x webapp (executes all tests in directories ./src/main/test/.../athena and ./src/main/test/.../atlas) + ArchitectureTests
// 2d) Execute tests with Postgres container: SPRING_PROFILES_INCLUDE=postgres ./gradlew test -x webapp
// 2e) Execute tests with MySQL container: SPRING_PROFILES_INCLUDE=mysql ./gradlew test -x webapp
// 3) Verify code coverage (after tests): ./gradlew jacocoTestCoverageVerification
// 3) Verify code coverage (after tests): ./gradlew jacocoTestCoverageVerification -x webapp
// 4) Check Java code format: ./gradlew spotlessCheck -x webapp
// 5) Apply Java code formatter: ./gradlew spotlessApply -x webapp
// 6) Find dependency updates: ./gradlew dependencyUpdates -Drevision=release
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jplag_version=5.1.0
# 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.0
sentry_version=7.20.1
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.15.11
byte_buddy_version=1.16.1
netty_version=4.1.115.Final
mysql_version=9.1.0

Expand All @@ -48,7 +48,7 @@ testcontainer_version=1.20.4
gradle_node_plugin_version=7.1.0
apt_plugin_version=0.21
liquibase_plugin_version=3.0.1
modernizer_plugin_version=1.10.0
modernizer_plugin_version=1.11.0
spotless_plugin_version=7.0.2

org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
Expand Down
4 changes: 2 additions & 2 deletions gradle/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ ext {
],
"fileupload" : [
"INSTRUCTION": 0.906,
"CLASS": 0
"CLASS": 1
],
"iris" : [
"INSTRUCTION": 0.794,
"INSTRUCTION": 0.792,
"CLASS": 17
],
"lecture" : [
Expand Down
Loading

0 comments on commit 36ab855

Please sign in to comment.