Merge branch 'main' into chore/431-fix-sonar

Author: ursjoss

.github/workflows/check.yml

@@ -25,31 +25,31 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Gradle wrapper validation
-      uses: gradle/wrapper-validation-action@v1
+      uses: gradle/wrapper-validation-action@v2
 
     - name: Set up JDK ${{ matrix.jdk }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.jdk }}
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
     - name: Cache global .gradle folder
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.gradle/caches
         key: global-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/*.kt*') }}-${{ hashFiles('**/*.java') }}
         restore-keys: |
           gradle-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
     - name: Login to Docker Hub
-      uses: docker/login-action@v3.0.0
+      uses: docker/login-action@v3.1.0
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -58,7 +58,7 @@ jobs:
       run: docker pull postgres:15.4
 
     - name: Build
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
         arguments: |
           check
@@ -68,15 +68,15 @@ jobs:
           --continue
 
     - name: Upload sarif file to GitHub
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v3
       if: success() || failure()
       with:
         sarif_file: build/detekt-merged.sarif
         category: detekt
 
     - name: Upload failure artifacts
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reports
         path: '**/build/reports'

.github/workflows/codeql.yml

@@ -27,27 +27,27 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: 17
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     - name: Cache global .gradle folder
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.gradle/caches
         key: global-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/*.kt*') }}-${{ hashFiles('**/*.java') }}
         restore-keys: |
           gradle-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
     - name: Login to Docker Hub
-      uses: docker/login-action@v3.0.0
+      uses: docker/login-action@v3.1.0
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -56,12 +56,12 @@ jobs:
       run: docker pull postgres:15.4
 
     - name: Build
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
         arguments: build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
 

CHANGELOG.adoc

@@ -67,7 +67,7 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
 [[unreleased]]
 == [unreleased]
 
-{url-cl}1.8.11++...++main[Full Changelog]
+{url-cl}1.10.3++...++main[Full Changelog]
 
 .Added
 
@@ -85,6 +85,79 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
 ////
 
 
+
+[[v1.10.3]]
+== {url-tree}1.10.3[1.10.3] -- 2024-02-04
+
+{url-cl}1.10.2++...++1.10.3[Full Changelog]
+
+.Changed
+- {url-issues}621[#621] Migrate from Bootsrap 4.x to 5.3
+- Bumped dependencies
+  kotlin, spring-boot-admin-starter-client, guava, feign, spring-cloud-starter-openfeign,
+  gradle, reckon,
+  jaxb, detekt,
+  unit5, mockk, testcontainers, equalsverifier,
+  github actions gradle-build-action, gradle-wrapper-validation, cache, upload-artifact and codeql
+
+
+[[v1.10.2]]
+== {url-tree}1.10.2[1.10.2] -- 2023-12-08
+
+{url-cl}1.10.0++...++1.10.2[Full Changelog]
+
+.Changed
+- Bumped dependency
+  kotlin,
+  spring boot,
+  wicket, wicketstuff, feign, spring-boot-admin-starter-client, jasperreports,
+  testcontainers-java monorepo, equalsverifier,
+  gradle, detektplugin, jaxb gradle plugin,
+  setup-java action
+- {url-issues}620[#620] Reverted (Data Migration: Update Abstract of old Studies with PM_ID)
+
+
+[[v1.10.1]]
+== {url-tree}1.10.1[1.10.1] -- 2023-12-07
+
+{url-cl}1.10.0++...++1.10.2[Full Changelog]
+
+.Changed
+- {url-issues}620[#620] Data Migration: Update Abstract of old Studies with PM_ID
+
+
+[[v1.10.0]]
+== {url-tree}1.10.0[1.10.0] -- 2023-11-14
+
+{url-cl}1.9.0++...++1.10.0[Full Changelog]
+
+.Added
+- {url-issues}604[#604] New (internal) Reference Abstract Report
+.Changed
+- {url-issues}338[#338] Migrate from Bootsrap 3.4 to 4.0
+- Bumped dependency
+  kotlin,
+  spring-boot, spring-dependency-management, spring-boot-admin, feign, flyway, lombok,
+  junit5, kotest, equalsverifier,
+  detekt, reckon
+
+
+[[v1.9.0]]
+== {url-tree}1.9.0[1.9.0] -- 2023-10-08
+
+{url-cl}1.8.11++...++1.9.0[Full Changelog]
+
+.Changed
+- Bumped dependency
+  postgresql, kris,
+  gradle,
+  sonarqube,
+  setup-java-action
+
+.Removed
+- Removed java platform 11 compatibility: Require minimum java platform 17.
+
+
 [[v1.8.11]]
 == {url-tree}1.8.11[1.8.11] -- 2023-09-03
 
@@ -100,14 +173,6 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
 - Bumped gradle, sonarqube plugin, detekt
 - Bumped checkout action, docker login action
 
-.Deprecated
-
-.Removed
-
-.Fixed
-
-.Security
-
 
 [[v1.8.10]]
 == {url-tree}1.8.10[1.8.10] -- 2023-06-25
@@ -182,7 +247,7 @@ NOTE: References to user stories are in the form Iteration/Story-Number.
 - kotest
 
 .Changed
-- Bumped kotlin, sprign-boot, wicket, wicketstuff, wicket-spring-boot-starter, spring-boot-admin-starter-client, flyway, lombok, kris
+- Bumped kotlin, spring-boot, wicket, wicketstuff, wicket-spring-boot-starter, spring-boot-admin-starter-client, flyway, lombok, kris
   spring-dependency-management, spring-cloud-starter-openfeign, feign, kotlin-loggin,
   mockk, spring-mockk, kluent, equalsverifier, junit5, kotest, testcontainers,
   gradle, sonarqube-plugin, detekt,

build.gradle.kts

@@ -34,8 +34,6 @@ plugins {
 }
 
 extra["spring.cloudVersion"] = libs.versions.springCloud.get()
-extra["jooq.version"] = libs.versions.jooq.get()
-extra["flyway.version"] = libs.versions.flyway.get()
 
 dependencyManagement {
     imports {
@@ -53,6 +51,15 @@ val generatedPackages: Set<String> = setOf(
     "**/ch/difty/scipamato/publ/db/**"
 )
 
+testing {
+    suites {
+        @Suppress("UnstableApiUsage")
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter()
+        }
+    }
+}
+
 jacoco {
     toolVersion = libs.versions.jacoco.get()
 }

common/common-persistence-jooq/src/test/kotlin/ch/difty/scipamato/common/persistence/SortMapperTest.kt

@@ -91,7 +91,7 @@ internal class SortMapperTest {
 
         invoking { mapperSpy.map(sortSpecMock, tableMock) } shouldThrow
             InvalidDataAccessApiUsageException::class withMessage
-            "Could not find table field: inexistentField; nested exception is java.lang.NoSuchFieldException"
+            "Could not find table field: inexistentField"
 
         verify { sortSpecMock.iterator() }
         verify { mapperSpy.getTableFieldFor(tableMock, "INEXISTENT_FIELD") }
@@ -105,7 +105,7 @@ internal class SortMapperTest {
 
         invoking { mapperSpy.map(sortSpecMock, tableMock) } shouldThrow
             InvalidDataAccessApiUsageException::class withMessage
-            "Could not find table field: illegalField; nested exception is java.lang.IllegalAccessException"
+            "Could not find table field: illegalField"
 
         verify { sortSpecMock.iterator() }
         verify { mapperSpy.getTableFieldFor(tableMock, "ILLEGAL_FIELD") }

common/common-test/src/main/resources/kotest.properties

@@ -0,0 +1,2 @@
+kotest.framework.classpath.scanning.config.disable=true
+kotest.framework.classpath.scanning.autoscan.disable=true

common/common-wicket/build.gradle.kts

@@ -45,14 +45,13 @@ dependencies {
     api(libs.wicket.spring)
     api(libs.wicket.authroles)
     api(libs.wicket.beanvalidation)
+    api(libs.hibernate.validator)
     api(libs.wicket.devutils)
+    api(libs.wicket.tester)
     api(libs.wicketstuff.annotation)
     api(libs.wicketBootstrap.core)
     api(libs.wicketBootstrap.extensions)
-    api(libs.wicketBootstrap.less){
-        exclude("commons-collections", "commons-collections")
-        exclude("commons-logging", "commons-logging")
-    }
+    api(libs.wicketBootstrap.sass)
     api(libs.wicketBootstrap.themes)
     api(libs.fontAwesome)
 
@@ -64,6 +63,6 @@ dependencies {
     testImplementation(libs.lombok)
     testAnnotationProcessor(libs.lombok)
 
-    testImplementation(libs.javax.servletApi)
+    testImplementation(libs.jakarta.servletApi)
     testImplementation(libs.validationApi)
 }

common/common-wicket/src/main/kotlin/ch/difty/scipamato/common/web/AbstractPage.kt

@@ -7,6 +7,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButt
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons
 import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
 import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar
+import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior
 import org.apache.wicket.ajax.AjaxRequestTarget
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession
 import org.apache.wicket.bean.validation.PropertyValidator
@@ -26,7 +27,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters
 import org.apache.wicket.settings.DebugSettings
 import org.apache.wicket.spring.injection.annot.SpringBean
 
-@Suppress("SameParameterValue", "TooManyFunctions")
+@Suppress("SameParameterValue", "TooManyFunctions", "serial")
 abstract class AbstractPage<T> : GenericWebPage<T> {
 
     @SpringBean
@@ -120,10 +121,9 @@ abstract class AbstractPage<T> : GenericWebPage<T> {
                 isVisible = isNavbarVisible
             }
         }.apply {
-            fluid()
-            position = Navbar.Position.STATIC_TOP
             setBrandName(Model.of(getBrandName(properties.brand)))
             setInverted(true)
+            setBackgroundColor(BackgroundColorBehavior.Color.Primary)
         }.also {
             addLinksTo(it)
         }
@@ -165,6 +165,7 @@ abstract class AbstractPage<T> : GenericWebPage<T> {
                 super.onConfigure()
                 isEnabled = setResponsePageButtonEnabled()
             }
+
         }
 
     /**

common/common-wicket/src/main/kotlin/ch/difty/scipamato/common/web/pages/AbstractMenuBuilder.kt

@@ -18,13 +18,13 @@ import org.apache.wicket.markup.html.link.AbstractLink
 import org.apache.wicket.model.Model
 import org.apache.wicket.model.StringResourceModel
 import org.apache.wicket.request.mapper.parameter.PageParameters
-import java.util.ArrayList
 
 abstract class AbstractMenuBuilder protected constructor(
     val applicationProperties: ApplicationProperties,
     private val webSessionFacade: ScipamatoWebSessionFacade,
 ) : MenuBuilder {
 
+    @Suppress("LongParameterList")
     fun <P : Page> addPageLink(
         navbar: Navbar,
         menuPage: Page,
@@ -68,11 +68,17 @@ abstract class AbstractMenuBuilder protected constructor(
                     StringResourceModel("menu.$labelResource", page, null),
                     Model.of(iconType)
                 ) {
-                    override fun newSubMenuButtons(buttonMarkupId: String) = ArrayList<AbstractLink>().apply { action.accept(this) }
+                    @java.io.Serial
+                    private val serialVersionUID: Long = 1L
+
+                    override fun newSubMenuButtons(buttonMarkupId: String) = ArrayList<AbstractLink>().apply {
+                        action.accept(this)
+                    }
                 }
             ))
     }
 
+    @Suppress("LongParameterList")
     @JvmOverloads
     fun <P : AbstractPage<*>?> addEntryToMenu(
         label: String,
@@ -93,12 +99,17 @@ abstract class AbstractMenuBuilder protected constructor(
     val versionAnker: String
         get() {
             val buildVersion = applicationProperties.buildVersion
-            return if (buildVersion == null || buildVersion.isEmpty()) ""
+            return if (buildVersion.isNullOrEmpty()) ""
             else "#" + if (buildVersion.endsWith("SNAPSHOT")) "unreleased" else "v$buildVersion"
         }
 
     val versionLink: String
         get() = "version ${applicationProperties.buildVersion}"
 
     fun hasOneOfRoles(vararg roles: String): Boolean = webSessionFacade.hasAtLeastOneRoleOutOf(*roles)
+
+    companion object {
+        @java.io.Serial
+        private val serialVersionUID: Long = 1L
+    }
 }

common/common-wicket/src/main/kotlin/ch/difty/scipamato/common/web/pages/login/AbstractLoginPage.html

@@ -32,7 +32,7 @@ <h2 class="form-signin-heading" wicket:id="header">Please sign in</h2>
                 <div class="row">
                     <div class="col-sm-4 col-md-5"></div>
                     <div class="col-sm-4 col-md-2">
-                        <button type="submit" wicket:id="signin" class="btn btn-lg btn-primary btn-block"></button>
+                        <button type="submit" wicket:id="signin" class="btn-lg btn-block"></button>
                     </div>
                     <div class="col-sm-4 col-md-5"></div>
                 </div>