kontor-spring/.factorypath

@@ -1,3 +0,0 @@
-<factorypath>
-    <factorypathentry kind="EXTJAR" id="/home/tpeetz/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" enabled="true" runInBatchMode="false"/>
-</factorypath>

kontor-spring/build.gradle

@@ -8,8 +8,8 @@ buildscript {
         }
     }
     repositories {
+        mavenCentral()
         maven { setUrl("https://nexus.thpeetz.de/repository/maven-central") }
-        //mavenCentral()
         maven { setUrl("https://maven.vaadin.com/vaadin-prereleases") }
         maven { setUrl("https://repo.spring.io/milestone") }
     }
@@ -28,23 +28,23 @@ plugins {
     alias(libs.plugins.spring.dependencies)
     alias(libs.plugins.vaadin)
     alias(libs.plugins.lombok)
-    alias(libs.plugins.asciidoctorPdf)
-    alias(libs.plugins.asciidoctorConvert)
-    alias(libs.plugins.asciidoctorGems)
-    id "de.infolektuell.typst" version "0.8.0"
+    //alias(libs.plugins.asciidoctorPdf)
+    //alias(libs.plugins.asciidoctorConvert)
+    //alias(libs.plugins.asciidoctorGems)
+    //id "de.infolektuell.typst" version "0.8.0"
 }
 
 repositories {
     maven { setUrl("https://nexus.thpeetz.de/repository/maven-central") }
-    //mavenCentral()
-    ruby.gems()
+    mavenCentral()
+    //ruby.gems()
     maven { setUrl("https://maven.vaadin.com/vaadin-prereleases") }
     maven { setUrl("https://repo.spring.io/milestone") }
     maven { setUrl("https://maven.vaadin.com/vaadin-addons") }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
 configurations {
@@ -90,7 +90,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
-    asciidoctorGems libs.rouge
+    //asciidoctorGems libs.rouge
     //asciidoctorGems libs.diagram
 }
 
@@ -226,5 +226,5 @@ reporting {
 }
 
 wrapper {
-    gradleVersion = "8.6"
+    gradleVersion = libs.versions.gradle.get().toString()
 }

kontor-spring/gradle/libs.versions.toml

@@ -10,18 +10,18 @@ slf4j = "1.7.22"
 hsqldb = "2.7.1"
 sqlite = "3.25.2"
 spotbugs = "6.0.7"
-asciidoctor = "4.0.2"
-rouge = "3.15.0"
+#asciidoctor = "4.0.2"
+#rouge = "3.15.0"
 #diagram = "2.2.2"
-diagram = "2.3.1"
+#diagram = "2.3.1"
 sonarqube = "3.3"
 cimtConventions = "1.0.0-SNAPSHOT"
 springboot = "3.2.5"
 springdependencies = "1.1.4"
-vaadin = "24.3.8"
+vaadin = "24.4.23"
 camel = "4.10.6"
 artemis = "2.41.0"
-lombok = "8.6"
+lombok = "8.11"
 gson = "2.9.0"
 jackson = "2.16.1"
 json_simple = "1.1.1"
@@ -47,11 +47,11 @@ hypersistence = { module = "io.hypersistence:hypersistence-utils-hibernate-63",
 vaadin-bom = { module = "com.vaadin:vaadin-bom", version.ref = "vaadin" }
 camel-bom = { module = "org.apache.camel.springboot:camel-spring-boot-bom", version.ref = "camel"}
 artemis = { module = "org.apache.activemq:artemis-jms-server", version.ref = "artemis" }
-asciidoctorGradleJvmGems = { module = "org.asciidoctor:asciidoctor-gradle-jvm-gems", version.ref= "asciidoctor" }
-asciidoctorGradleJvm = { module = "org.asciidoctor:asciidoctor-gradle-jvm", version.ref= "asciidoctor" }
-asciidoctorGradleJvmPdf = { module = "org.asciidoctor:asciidoctor-gradle-jvm-pdf", version.ref= "asciidoctor" }
-rouge = { module = "rubygems:rouge", version.ref = "rouge" }
-diagram = { module = "rubygems:asciidoctor-diagram", version.ref = "diagram" }
+#asciidoctorGradleJvmGems = { module = "org.asciidoctor:asciidoctor-gradle-jvm-gems", version.ref= "asciidoctor" }
+#asciidoctorGradleJvm = { module = "org.asciidoctor:asciidoctor-gradle-jvm", version.ref= "asciidoctor" }
+#asciidoctorGradleJvmPdf = { module = "org.asciidoctor:asciidoctor-gradle-jvm-pdf", version.ref= "asciidoctor" }
+#rouge = { module = "rubygems:rouge", version.ref = "rouge" }
+#diagram = { module = "rubygems:asciidoctor-diagram", version.ref = "diagram" }
 
 [bundles]
 logback = ["logbackCore", "logbackClassic"]
@@ -59,13 +59,13 @@ logback = ["logbackCore", "logbackClassic"]
 [plugins]
 spotbugs = { id = "com.github.spotbugs",  version.ref = "spotbugs" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
-asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor" }
-asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor" }
-asciidoctorGems = { id = "org.asciidoctor.jvm.gems", version.ref = "asciidoctor" }
+#asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor" }
+#asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor" }
+#asciidoctorGems = { id = "org.asciidoctor.jvm.gems", version.ref = "asciidoctor" }
 javaConvention = { id = "de.cimt.java-conventions", version.ref = "cimtConventions" }
 applicationConvention  = { id = "de.cimt.application-conventions", version.ref = "cimtConventions" }
 libraryConvention = { id = "de.cimt.library-conventions", version.ref = "cimtConventions" }
-asciidoctorConvention = { id = "de.cimt.asciidoctor-conventions", version.ref = "cimtConventions" }
+#asciidoctorConvention = { id = "de.cimt.asciidoctor-conventions", version.ref = "cimtConventions" }
 spring-boot = { id = "org.springframework.boot", version.ref = "springboot"}
 spring-dependencies = { id  = "io.spring.dependency-management", version.ref = "springdependencies" }
 vaadin = { id = "com.vaadin", version.ref = "vaadin" }

kontor-spring/settings.gradle

@@ -11,6 +11,7 @@ pluginManagement {
     }
     repositories {
         gradlePluginPortal()
+        maven { setUrl("https://nexus.thpeetz.de/repository/maven-central") }
     	mavenCentral()
         maven { setUrl("https://maven.vaadin.com/vaadin-prereleases") }
         maven { setUrl("https://repo.spring.io/milestone") }