Skip to content

Commit

Permalink
Development: Update tooling and dependencies to latest useful versions (
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Krusche authored Feb 17, 2023
1 parent a14eb97 commit 61bcea0
Show file tree
Hide file tree
Showing 17 changed files with 1,126 additions and 820 deletions.
36 changes: 18 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ plugins {
id "io.spring.dependency-management" version "1.1.0"
id "com.google.cloud.tools.jib" version "3.3.1"
id "com.github.node-gradle.node" version "3.5.1"
id "com.diffplug.spotless" version "6.13.0"
id "com.diffplug.spotless" version "6.15.0"
// this allows us to find outdated dependencies via ./gradlew dependencyUpdates
id "com.github.ben-manes.versions" version "0.44.0"
id "com.github.ben-manes.versions" version "0.45.0"
id "com.github.andygoossens.modernizer" version "1.7.0"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
id "info.solidsoft.pitest" version "1.9.11"
id "org.owasp.dependencycheck" version "8.0.1"
id "org.owasp.dependencycheck" version "8.1.0"
id "com.adarshr.test-logger" version "3.2.0"
}

Expand Down Expand Up @@ -198,14 +198,14 @@ dependencies {
implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}"
implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.apache:${jgit_version}"
// https://search.maven.org/artifact/net.sourceforge.plantuml/plantuml
implementation "net.sourceforge.plantuml:plantuml:1.2022.14"
implementation "net.sourceforge.plantuml:plantuml:1.2023.1"
implementation "org.imsglobal:basiclti-util:1.2.0"
implementation "org.jasypt:jasypt:1.9.3"
implementation "me.xdrop:fuzzywuzzy:1.4.0"
implementation "com.atlassian.bamboo:bamboo-specs:8.2.5"
implementation "com.thoughtworks.qdox:qdox:2.0.3"
implementation "io.sentry:sentry-logback:6.12.1"
implementation "io.sentry:sentry-spring-boot-starter:6.12.1"
implementation "io.sentry:sentry-logback:6.14.0"
implementation "io.sentry:sentry-spring-boot-starter:6.14.0"
implementation "org.jsoup:jsoup:1.15.3"
implementation "commons-codec:commons-codec:1.15" // needed for spring security saml2

Expand All @@ -217,7 +217,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.10.3"
implementation "io.micrometer:micrometer-registry-prometheus:1.10.4"
implementation "net.logstash.logback:logstash-logback-encoder:7.2"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:${fasterxml_version}"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${fasterxml_version}"
Expand All @@ -226,7 +226,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-databind:${fasterxml_version}"
implementation "com.hazelcast:hazelcast:${hazelcast_version}"
implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}"
implementation "com.hazelcast:hazelcast-hibernate53:2.3.0"
implementation "com.hazelcast:hazelcast-hibernate53:5.0.0"
implementation "javax.cache:cache-api:1.1.1"
implementation "org.hibernate:hibernate-core:${hibernate_version}"
implementation "com.zaxxer:HikariCP:5.0.1"
Expand Down Expand Up @@ -257,8 +257,8 @@ dependencies {
implementation "org.springframework.cloud:spring-cloud-starter-config:3.1.5"
implementation "org.springframework.boot:spring-boot-starter-cloud-connectors:2.2.13.RELEASE"

implementation "io.netty:netty-all:4.1.87.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.2"
implementation "io.netty:netty-all:4.1.89.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.3"
implementation "org.springframework:spring-messaging:5.3.23"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
Expand All @@ -277,18 +277,18 @@ dependencies {
}
implementation "io.springfox:springfox-bean-validators:3.0.0"
implementation "mysql:mysql-connector-java:8.0.32"
implementation "org.postgresql:postgresql:42.5.1"
implementation "org.postgresql:postgresql:42.5.4"
implementation "com.h2database:h2:2.1.214"

implementation "org.zalando:problem-spring-web:0.27.0"
implementation "com.ibm.icu:icu4j:72.1"
implementation "com.github.seancfoley:ipaddress:5.4.0"
implementation "org.apache.maven:maven-model:3.8.7"
implementation "org.apache.maven:maven-model:3.9.0"
implementation "org.apache.pdfbox:pdfbox:2.0.27"
implementation "com.google.protobuf:protobuf-java:3.21.12"
implementation "com.google.protobuf:protobuf-java:3.22.0"
implementation "org.commonmark:commonmark:0.21.0"
implementation "de.tum.in.ase.athene:client:0.0.2"
implementation "commons-fileupload:commons-fileupload:1.4"
implementation "commons-fileupload:commons-fileupload:1.5"

annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
annotationProcessor ("org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}") {
Expand All @@ -311,8 +311,8 @@ dependencies {
testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
testImplementation "org.awaitility:awaitility:4.2.0"
testImplementation "org.apache.maven.shared:maven-invoker:3.2.0"
testImplementation "org.gradle:gradle-tooling-api:7.6"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.0.0-M8"
testImplementation "org.gradle:gradle-tooling-api:8.0"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.0.0-M9"
testImplementation "com.opencsv:opencsv:5.7.1"
testImplementation "io.zonky.test:embedded-database-spring-test:2.2.0"
testImplementation "com.tngtech.archunit:archunit:1.0.1"
Expand All @@ -323,7 +323,7 @@ dependencies {

dependencyManagement {
imports {
mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:15.1.0"
mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:15.2.0"
}
}

Expand Down Expand Up @@ -358,7 +358,7 @@ tasks.withType(Test) {
}

wrapper {
gradleVersion = "7.6"
gradleVersion = "8.0"
}

task stage(dependsOn: "bootWar") {
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
command: sh -c "npm install && npm run start-docker"
depends_on:
- artemis-server
image: node:18.12.1-alpine
image: node:18.14.0-alpine
networks:
- artemis
ports:
Expand All @@ -40,7 +40,7 @@ services:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_ROOT_PASSWORD=
- MYSQL_DATABASE=Artemis
image: mysql:8.0.31
image: mysql:8.0.32
networks:
- artemis
ports:
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ following dependencies/tools on your machine:
Artemis uses Hibernate to store entities in a MySQL database.
Download and install the MySQL Community Server (8.0.x) and configure it according to section
`MySQL Setup <#mysql-setup>`__.
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=18.10.0 < 19) to compile
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=18.14.0 < 19) to compile
and run the client Angular application. Depending on your system, you
can install Node either from source or as a pre-packaged bundle.
4. `Npm <https://nodejs.org/en/download>`__: We use Npm (>=8.1.0) to
4. `Npm <https://nodejs.org/en/download>`__: We use Npm (>=9.4.0) to
manage client side dependencies. Npm is typically bundled with Node.js,
but can also be installed separately.
5. ( `Graphviz <https://www.graphviz.org/download/>`__: We use Graphviz to generate graphs within exercise task
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ rootProject.name=Artemis
profile=dev

# Build properties
node_version=18.12.1
npm_version=9.1.3
node_version=18.14.0
npm_version=9.4.0

# Dependency versions
jhipster_dependencies_version=7.8.1
spring_boot_version=2.7.8
spring_security_version=5.7.6
hibernate_version=5.6.14.Final
jaxb_runtime_version=4.0.1
hazelcast_version=5.2.1
hibernate_version=5.6.15.Final
jaxb_runtime_version=4.0.2
hazelcast_version=5.2.2
junit_version=5.9.2
mockito_version=5.0.0
fasterxml_version=2.14.1
mockito_version=5.1.1
fasterxml_version=2.14.2
jgit_version=6.4.0.202211300538-r
checkstyle_version=10.6.0
jplag_version=4.1.0
jplag_version=4.2.0
slf4j_version=1.7.36

# gradle plugin version
Expand Down
2 changes: 1 addition & 1 deletion gradle/war.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ war {
webAppDirName = "build/resources/main/static/"
webXml = file("${project.rootDir}/src/main/webapp/WEB-INF/web.xml")
enabled = true
extension = "war.original"
archiveExtension = "war.original"
includes = ["WEB-INF/**", "META-INF/**"]
}
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-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 61bcea0

Please sign in to comment.