Skip to content

Commit

Permalink
Updated Gradle and Deps
Browse files Browse the repository at this point in the history
  • Loading branch information
milux committed Mar 18, 2024
1 parent f37007a commit c14f849
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 36 deletions.
45 changes: 22 additions & 23 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
idscp2 = "0.19.2"
ktlint = "1.0.1"
ktlint = "1.2.1"

# Kotlin library/compiler version
kotlin = "1.9.21"
kotlinx-coroutines = "1.7.3"
kotlin = "1.9.23"
kotlinx-coroutines = "1.8.0"
# HTTP client
ktor = "2.3.6"
ktor = "2.3.9"

# The used version of the infomodel from IESE
infomodel = "4.1.3"
Expand All @@ -18,15 +18,15 @@ jaxbImpl = "2.3.7"
jaxActivation = "1.2.0"

camel = "3.18.8"
influxDB = "2.23"
influxDB = "2.24"

guava = "32.1.3-jre"
guava = "33.1.0-jre"
junit4 = "4.13.2"
junit5 = "5.10.1"
mockito = "5.7.0"
mapdb = "3.0.10"
jnrunix = "0.38.21"
protobuf = "3.25.1"
junit5 = "5.10.2"
mockito = "5.11.0"
mapdb = "3.1.0"
jnrunix = "0.38.22"
protobuf = "3.25.3"
httpclient = "4.5.14"

# Needed for policy reasoning with 2p (formerly tuProlog)
Expand All @@ -43,8 +43,7 @@ javaxJson = "1.1.4"
dockerJavaApi = "0.0.13"

# We will pull in a newer version of jackson because of security fixes
jackson = "2.16.0"
jacksonDatabind = "2.16.0"
jackson = "2.17.0"

orgJson = "20220320"

Expand All @@ -57,12 +56,12 @@ javaxValidation = "2.0.1.Final"

# Needed for web console
auth0Jwt = "4.4.0"
swagger = "1.6.12"
jose4j = "0.9.3"
swagger = "1.6.13"
jose4j = "0.9.6"

jetty = "9.4.53.v20231009"
springBoot = "3.2.0"
springSecurity = "6.2.0"
springBoot = "3.2.3"
springSecurity = "6.2.2"
bouncyCastle = "1.77"

[libraries]
Expand All @@ -78,7 +77,7 @@ ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-conte
ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref = "ktor" }
ktor-serialization-jackson = { group = "io.ktor", name = "ktor-serialization-jackson", version.ref = "ktor" }
jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" }
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonDatabind" }
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }

# common test libraries
junit = { group = "junit", name = "junit", version.ref = "junit4" }
Expand Down Expand Up @@ -155,8 +154,8 @@ swagger = { id = "com.benjaminsproule.swagger", version = "1.0.14" }
protobuf = { id = "com.google.protobuf", version = "0.9.4" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version = "6.22.0" }
licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.5" }
versions = { id = "com.github.ben-manes.versions", version = "0.50.0" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "4.2.0" }
node = { id = "com.github.node-gradle.node", version = "7.0.1" }
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.6" }
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" }
node = { id = "com.github.node-gradle.node", version = "7.0.2" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down

0 comments on commit c14f849

Please sign in to comment.