Skip to content

Commit

Permalink
Merge branch 'develop' into feature/blackbox-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusPaulsen authored Sep 15, 2023
2 parents 0d3f18c + 8a8f11c commit ba66234
Show file tree
Hide file tree
Showing 105 changed files with 4,610 additions and 2,899 deletions.
42 changes: 21 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ plugins {
id "idea"
id "jacoco"
id "org.springframework.boot" version "${spring_boot_version}"
id "io.spring.dependency-management" version "1.1.2"
id "io.spring.dependency-management" version "1.1.3"
id "com.google.cloud.tools.jib" version "3.3.2"
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
id "com.diffplug.spotless" version "6.20.0"
id "com.diffplug.spotless" version "6.21.0"
// this allows us to find outdated dependencies via ./gradlew dependencyUpdates
id "com.github.ben-manes.versions" version "0.47.0"
id "com.github.ben-manes.versions" version "0.48.0"
id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
id "info.solidsoft.pitest" version "1.9.11"
id "org.owasp.dependencycheck" version "8.3.1"
id "org.owasp.dependencycheck" version "8.4.0"
id "com.adarshr.test-logger" version "3.2.0"
}

Expand Down Expand Up @@ -122,7 +122,7 @@ tasks.register("testReport", TestReport) {
}

jacoco {
toolVersion = "0.8.8"
toolVersion = "0.8.10"
}

jar {
Expand Down Expand Up @@ -263,15 +263,15 @@ dependencies {
implementation "org.springdoc:springdoc-openapi-ui:1.7.0"
implementation "com.vdurmont:semver4j:3.1.0"

implementation "com.github.docker-java:docker-java-core:3.3.2"
implementation "com.github.docker-java:docker-java-transport-httpclient5:3.3.2"
implementation "com.github.docker-java:docker-java-core:3.3.3"
implementation "com.github.docker-java:docker-java-transport-httpclient5:3.3.3"

// import JHipster dependencies BOM
implementation platform("tech.jhipster:jhipster-dependencies:${jhipster_dependencies_version}")

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.11.2"
implementation "io.micrometer:micrometer-registry-prometheus:1.11.4"
implementation "net.logstash.logback:logstash-logback-encoder:7.4"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:${fasterxml_version}"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${fasterxml_version}"
Expand All @@ -288,7 +288,7 @@ dependencies {
implementation "org.apache.commons:commons-math3:3.6.1"
implementation "javax.transaction:javax.transaction-api:1.3"
implementation "org.hibernate:hibernate-entitymanager:${hibernate_version}"
implementation "org.liquibase:liquibase-core:4.23.0"
implementation "org.liquibase:liquibase-core:4.23.2"
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 All @@ -305,16 +305,16 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}"

implementation "org.springframework.ldap:spring-ldap-core:2.4.1"
implementation "org.springframework.data:spring-data-ldap:2.7.14"
implementation "org.springframework.data:spring-data-ldap:2.7.15"

implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:3.1.7"
implementation "org.springframework.cloud:spring-cloud-starter-config:3.1.8"
implementation "org.springframework.boot:spring-boot-starter-cloud-connectors:2.2.13.RELEASE"

implementation "io.netty:netty-all:4.1.96.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.9"
implementation "io.netty:netty-all:4.1.97.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.11"
implementation "org.springframework:spring-messaging:5.3.29"
implementation "org.springframework.retry:spring-retry:2.0.2"
implementation "org.springframework.retry:spring-retry:2.0.3"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
implementation "org.springframework.security:spring-security-data:${spring_security_version}"
Expand All @@ -333,15 +333,15 @@ dependencies {
implementation "io.springfox:springfox-bean-validators:3.0.0"
implementation "mysql:mysql-connector-java:8.0.33"
implementation "org.postgresql:postgresql:42.6.0"
implementation "com.h2database:h2:2.2.220"
implementation "com.h2database:h2:2.2.222"

// zalando problem spring web can only be updated when we support Spring 6
implementation "org.zalando:problem-spring-web:0.27.0"
implementation "com.ibm.icu:icu4j:73.2"
implementation "com.github.seancfoley:ipaddress:5.4.0"
implementation "org.apache.maven:maven-model:3.9.3"
implementation "org.apache.pdfbox:pdfbox:2.0.29"
implementation "com.google.protobuf:protobuf-java:3.23.4"
implementation "org.apache.maven:maven-model:3.9.4"
implementation "org.apache.pdfbox:pdfbox:3.0.0"
implementation "com.google.protobuf:protobuf-java:3.24.3"
implementation "org.apache.commons:commons-csv:1.10.0"
implementation "org.commonmark:commonmark:0.21.0"
implementation "commons-fileupload:commons-fileupload:1.5"
Expand All @@ -366,14 +366,14 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junit_version}"
testImplementation "org.mockito:mockito-core:${mockito_version}"
testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
testImplementation "io.github.classgraph:classgraph:4.8.161"
testImplementation "io.github.classgraph:classgraph:4.8.162"
testImplementation "org.awaitility:awaitility:4.2.0"
testImplementation "org.apache.maven.shared:maven-invoker:3.2.0"
testImplementation "org.gradle:gradle-tooling-api:8.2.1"
testImplementation "org.gradle:gradle-tooling-api:8.3"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.1.2"
testImplementation "com.opencsv:opencsv:5.8"
testImplementation "io.zonky.test:embedded-database-spring-test:2.3.0"
testImplementation "com.tngtech.archunit:archunit:1.0.1"
testImplementation "com.tngtech.archunit:archunit:1.1.0"
testImplementation "org.skyscreamer:jsonassert:1.5.1"

// Lightweight JSON library needed for the internals of the MockRestServiceServer
Expand Down Expand Up @@ -417,7 +417,7 @@ tasks.withType(Test).configureEach {
}

wrapper {
gradleVersion = "8.2.1"
gradleVersion = "8.3"
}

tasks.register("stage") {
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ npm_version=9.6.0

# Dependency versions
jhipster_dependencies_version=7.9.3
spring_boot_version=2.7.14
spring_boot_version=2.7.15
spring_security_version=5.7.10
hibernate_version=5.6.15.Final
jaxb_runtime_version=4.0.3
hazelcast_version=5.3.1
hazelcast_version=5.3.2
junit_version=5.10.0
mockito_version=5.4.0
mockito_version=5.5.0
fasterxml_version=2.15.2
jgit_version=6.6.0.202305301015-r
checkstyle_version=10.12.1
jgit_version=6.7.0.202309050840-r
checkstyle_version=10.12.3
jplag_version=4.3.0
slf4j_version=1.7.36
sentry_version=6.27.0
sentry_version=6.29.0

# gradle plugin version
gradle_node_plugin_version=5.0.0
gradle_node_plugin_version=7.0.0
apt_plugin_version=0.21
liquibase_plugin_version=2.1.1
modernizer_plugin_version=1.8.0
Expand Down
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-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit ba66234

Please sign in to comment.