Skip to content

Commit

Permalink
Merge branch 'develop' into chore/lectures/remove-competency-redundan…
Browse files Browse the repository at this point in the history
…cy-lecture-creation
  • Loading branch information
N0W0RK authored Sep 2, 2024
2 parents 8add121 + b164fba commit 99f820b
Show file tree
Hide file tree
Showing 349 changed files with 7,100 additions and 6,337 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/analysis-of-endpoint-connections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ name: Analysis of Endpoint Connections

on:
workflow_dispatch:
push:
pull_request:
types:
- opened
- synchronize
paths:
- 'src/main/java/**'
- 'src/main/webapp/**'

# Keep in sync with build.yml and test.yml and codeql-analysis.yml
env:
Expand All @@ -20,7 +26,7 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 21
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '${{ env.java }}'
Expand Down Expand Up @@ -59,7 +65,7 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 21
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand Down
2 changes: 0 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"builder": "@angular-devkit/build-angular:application",
"options": {
"allowedCommonJsDependencies": [
"brace",
"brace/mode/java",
"clone-deep",
"crypto-js",
"crypto",
Expand Down
25 changes: 17 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ plugins {
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.3"
id "org.owasp.dependencycheck" version "10.0.4"
id "com.adarshr.test-logger" version "4.0.0"
}

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

// https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
implementation "net.sourceforge.plantuml:plantuml:1.2024.6"
implementation "net.sourceforge.plantuml:plantuml:1.2024.5"
implementation "org.jasypt:jasypt:1.9.3"
implementation "me.xdrop:fuzzywuzzy:1.4.0"
implementation("org.yaml:snakeyaml") {
version {
strictly "2.2"
strictly "2.3"
// needed to reduce the number of vulnerabilities, also see https://mvnrepository.com/artifact/org.yaml/snakeyaml
}
}
Expand Down Expand Up @@ -330,7 +330,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.12.6"
implementation "io.micrometer:micrometer-registry-prometheus:1.13.3"
implementation "net.logstash.logback:logstash-logback-encoder:8.0"

// Defines low-level streaming API, and includes JSON-specific implementations
Expand All @@ -349,13 +349,19 @@ dependencies {
implementation "com.hazelcast:hazelcast:${hazelcast_version}"
implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}"
implementation "com.hazelcast:hazelcast-hibernate53:5.2.0"

implementation "javax.cache:cache-api:1.1.1"
implementation "org.hibernate.orm:hibernate-core:${hibernate_version}"

implementation "com.zaxxer:HikariCP:5.1.0"

implementation "org.apache.commons:commons-text:1.12.0"
implementation "org.apache.commons:commons-math3:3.6.1"

implementation "javax.transaction:javax.transaction-api:1.3"

implementation "org.liquibase:liquibase-core:${liquibase_version}"

implementation "org.springframework.boot:spring-boot-starter-validation:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-loader-tools:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-mail:${spring_boot_version}"
Expand Down Expand Up @@ -421,12 +427,12 @@ dependencies {
}
implementation "io.springfox:springfox-bean-validators:3.0.0"
implementation "com.mysql:mysql-connector-j:9.0.0"
implementation "org.postgresql:postgresql:42.7.3"
implementation "org.postgresql:postgresql:42.7.4"

implementation "org.zalando:problem-spring-web:0.29.1"
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 "com.github.seancfoley:ipaddress:5.5.1"
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"
Expand All @@ -442,6 +448,9 @@ dependencies {
// use newest version of gson to avoid security issues through outdated dependencies
implementation "com.google.code.gson:gson:2.11.0"


implementation "com.google.errorprone:error_prone_annotations:2.31.0"

annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
annotationProcessor("org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}") {
exclude group: "jakarta.ws.rs", module: "jsr311-api"
Expand Down Expand Up @@ -474,7 +483,7 @@ dependencies {
testImplementation "org.awaitility:awaitility:4.2.2"
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
testImplementation "org.gradle:gradle-tooling-api:8.10"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.4.0"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.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 +495,7 @@ dependencies {
}
testImplementation("net.bytebuddy:byte-buddy") {
version {
strictly "1.14.19"
strictly "1.15.1"
}
}
// cannot update due to "Syntax error in SQL statement "WITH ids_to_delete"
Expand Down
4 changes: 4 additions & 0 deletions docs/user/exercises/programming-exercise-features.inc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------+---------+
| OCaml | yes | no |
+----------------------+----------+---------+
| Rust | yes | yes |
+----------------------+----------+---------+

- Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup.
Depending on the feature set, some options might not be available during the creation of the programming exercise.
Expand Down Expand Up @@ -63,6 +65,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
| OCaml | no | no | no | no | n/a | yes | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
| Rust | no | no | no | no | n/a | no | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+

- *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand.
- *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools.
Expand Down
17 changes: 8 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,22 @@ node_version=20.14.0
npm_version=10.7.0

# Dependency versions
jhipster_dependencies_version=8.6.0
spring_boot_version=3.3.2
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
jhipster_dependencies_version=8.7.0
spring_boot_version=3.3.3
spring_security_version=6.3.3
# 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?
opensaml_version=4.3.2
jwt_version=0.12.6
jaxb_runtime_version=4.0.5
# TODO: we cannot update to 5.5.0 because we currently use the CP Subsystem for fenced locks, however CP Subsystem is only available to Enterprise customers
hazelcast_version=5.4.0
hazelcast_version=5.5.0
junit_version=5.10.2
mockito_version=5.12.0
mockito_version=5.13.0
fasterxml_version=2.17.2
jgit_version=6.10.0.202406032230-r
sshd_version=2.13.2
checkstyle_version=10.17.0
checkstyle_version=10.18.1
jplag_version=5.1.0
slf4j_version=2.0.16
sentry_version=7.14.0
Expand Down
Loading

0 comments on commit 99f820b

Please sign in to comment.