Skip to content

Commit

Permalink
Merge branch 'develop' into feature/auxiliary-repositories/enable-in-…
Browse files Browse the repository at this point in the history
…edit-in-editor
  • Loading branch information
SimonEntholzer authored Oct 25, 2024
2 parents 42ad8a3 + 142c0f1 commit 91dbd62
Show file tree
Hide file tree
Showing 70 changed files with 2,142 additions and 1,477 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):

```shell
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.3.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.4.war
```

## Architecture
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ plugins {
id "jacoco"
id "org.springframework.boot" version "${spring_boot_version}"
id "io.spring.dependency-management" version "1.1.6"
id "com.google.cloud.tools.jib" version "3.4.3"
id "com.google.cloud.tools.jib" version "3.4.4"
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
id "com.diffplug.spotless" version "6.25.0"
// this allows us to find outdated dependencies via ./gradlew dependencyUpdates
id "com.github.ben-manes.versions" version "0.51.0"
id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
id "com.gorylenko.gradle-git-properties" version "2.4.2"
id "org.owasp.dependencycheck" version "10.0.4"
id "org.owasp.dependencycheck" version "11.0.0"
id "com.adarshr.test-logger" version "4.0.0"
}

group = "de.tum.cit.aet.artemis"
version = "7.6.3"
version = "7.6.4"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down Expand Up @@ -264,7 +264,7 @@ dependencies {
implementation "org.apache.lucene:lucene-queryparser:${lucene_version}"
implementation "org.apache.lucene:lucene-core:${lucene_version}"
implementation "org.apache.lucene:lucene-analyzers-common:${lucene_version}"
implementation "com.google.protobuf:protobuf-java:4.28.2"
implementation "com.google.protobuf:protobuf-java:4.28.3"

// we have to override those values to use the latest version
implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
Expand Down Expand Up @@ -413,7 +413,7 @@ dependencies {
implementation "io.netty:netty-all:4.1.114.Final"
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.retry:spring-retry:2.0.10"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
implementation "org.springframework.security:spring-security-data:${spring_security_version}"
Expand Down Expand Up @@ -452,7 +452,7 @@ dependencies {
implementation "org.apache.maven:maven-model:3.9.9"
implementation "org.apache.pdfbox:pdfbox:3.0.3"
implementation "org.apache.commons:commons-csv:1.12.0"
implementation "org.commonmark:commonmark:0.23.0"
implementation "org.commonmark:commonmark:0.24.0"
implementation "commons-fileupload:commons-fileupload:1.5"
implementation "net.lingala.zip4j:zip4j:2.11.5"

Expand All @@ -468,7 +468,7 @@ dependencies {
implementation "com.google.code.gson:gson:2.11.0"


implementation "com.google.errorprone:error_prone_annotations:2.33.0"
implementation "com.google.errorprone:error_prone_annotations:2.34.0"

// NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
implementation("net.bytebuddy:byte-buddy") {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ npm_version=10.8.0

# Dependency versions
jhipster_dependencies_version=8.7.1
spring_boot_version=3.3.4
spring_security_version=6.3.3
spring_boot_version=3.3.5
spring_security_version=6.3.4
# TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
hibernate_version=6.4.10.Final
# TODO: can we update to 5.x?
Expand All @@ -25,17 +25,17 @@ jplag_version=5.1.0
# NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it
lucene_version=8.11.4
slf4j_version=2.0.16
sentry_version=7.15.0
sentry_version=7.16.0
liquibase_version=4.29.2
docker_java_version=3.4.0
logback_version=1.5.11
java_parser_version=3.26.2
byte_buddy_version=1.15.5
byte_buddy_version=1.15.7

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


Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 87.39,
branches: 73.60,
functions: 81.97,
lines: 87.45,
statements: 87.52,
branches: 73.63,
functions: 82.15,
lines: 87.58,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Loading

0 comments on commit 91dbd62

Please sign in to comment.