From e10eeb113613233cf091a6438f39db926c32468b Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Thu, 19 Dec 2024 09:35:38 +0100 Subject: [PATCH 1/4] fixed jar task Signed-off-by: Stephan Richter --- de.srsoftware.oidc.app/build.gradle.kts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/de.srsoftware.oidc.app/build.gradle.kts b/de.srsoftware.oidc.app/build.gradle.kts index 06baa7d..9a709ef 100644 --- a/de.srsoftware.oidc.app/build.gradle.kts +++ b/de.srsoftware.oidc.app/build.gradle.kts @@ -1,5 +1,9 @@ description = "SRSoftware OIDC: app" +plugins { + java +} + dependencies{ implementation("org.json:json:20240303") implementation("de.srsoftware:tools.http:1.0.1") @@ -11,4 +15,14 @@ dependencies{ implementation(project(":de.srsoftware.oidc.datastore.encrypted")) implementation(project(":de.srsoftware.oidc.datastore.file")) implementation(project(":de.srsoftware.oidc.web")) +} + +tasks.jar { + manifest.attributes["Main-Class"] = "de.srsoftware.oidc.app.Application" + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + val dependencies = configurations + .runtimeClasspath + .get() + .map(::zipTree) // OR .map { zipTree(it) } + from(dependencies) } \ No newline at end of file From 216cec24990e6293f81e8dc020196237ea7c5e5f Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 20 Dec 2024 00:34:21 +0100 Subject: [PATCH 2/4] minor gui improvement Signed-off-by: Stephan Richter --- de.srsoftware.oidc.web/src/main/resources/de/authorization.html | 1 + de.srsoftware.oidc.web/src/main/resources/en/authorization.html | 1 + 2 files changed, 2 insertions(+) diff --git a/de.srsoftware.oidc.web/src/main/resources/de/authorization.html b/de.srsoftware.oidc.web/src/main/resources/de/authorization.html index bbdafd1..ebf4a91 100644 --- a/de.srsoftware.oidc.web/src/main/resources/de/authorization.html +++ b/de.srsoftware.oidc.web/src/main/resources/de/authorization.html @@ -10,6 +10,7 @@ +

Prüfe Berechtigung…