Skip to content

Commit

Permalink
Aligned lib versions with TC
Browse files Browse the repository at this point in the history
  • Loading branch information
milux committed Nov 3, 2023
1 parent 5df3000 commit 2dd0f9d
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 32 deletions.
43 changes: 18 additions & 25 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,33 @@
[versions]
# Versions for modules that will be released as libraries
idscp2 = "0.18.0"
ktlint = "0.47.1"
idscp2 = "0.18.1"
ktlint = "0.50.0"

# Kotlin library/compiler version
kotlin = "1.8.0"
kotlinxCoroutines = "1.6.4"

# The used version of the infomodel from IESE
infomodel = "4.1.3"
kotlin = "1.9.20"
kotlinxCoroutines = "1.7.3"
# HTTP client
ktor = "2.3.5"

camel = "3.18.4"
camel = "3.18.8"

slf4j = "2.0.6"
slf4j = "2.0.9"

guava = "31.1-jre"
guava = "32.1.3-jre"
junit4 = "4.13.2"
mockito = "4.11.0"
mockito = "5.7.0"
awaitility = "4.2.0"

protobuf = "3.21.12"
protobuf = "3.25.0"

bouncycastle = "1.70"

# We will pull in a newer version of jackson (required by io.jsonwebtoken) because of security fixes
jackson = "2.14.1"
jackson = "2.15.3"

# Needed for token manager to assemble JWTs
jsonwebtoken = "0.11.5"
orgJson = "20220320"
jose4j = "0.9.2"

# HTTP client
ktor = "2.2.2"
jsonwebtoken = "0.12.3"
jose4j = "0.9.3"

[libraries]
slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
Expand All @@ -41,8 +36,6 @@ kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", versio
protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
junit = { group = "junit", name = "junit", version.ref = "junit4" }
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
infomodel-model = { group = "de.fraunhofer.iais.eis.ids.infomodel", name = "java", version.ref = "infomodel" }
infomodel-serializer = { group = "de.fraunhofer.iais.eis.ids", name = "infomodel-serializer", version.ref = "infomodel" }

kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "kotlinxCoroutines" }
bouncycastle = { group = "org.bouncycastle", name = "bcprov-jdk15on", version.ref = "bouncycastle" }
Expand All @@ -67,8 +60,8 @@ jsonwebtoken = ["jjwt-impl", "jjwt-jackson", "jjwt-api", "jackson-databind"]
ktor-richClient = ["ktor-client-core", "ktor-client-java", "ktor-client-content-negotiation", "ktor-serialization-jackson"]

[plugins]
protobuf = { id = "com.google.protobuf", version = "0.9.1" }
protobuf = { id = "com.google.protobuf", version = "0.9.4" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version = "6.12.1" }
license-report = { id = "com.github.jk1.dependency-license-report", version = "2.1" }
versions = { id = "com.github.ben-manes.versions", version = "0.44.0" }
spotless = { id = "com.diffplug.spotless", version = "6.22.0" }
license-report = { id = "com.github.jk1.dependency-license-report", version = "2.5" }
versions = { id = "com.github.ben-manes.versions", version = "0.49.0" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down

0 comments on commit 2dd0f9d

Please sign in to comment.