diff --git a/.java-version b/.java-version
index 2dbc24b..98d9bcb 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11.0
+17
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 8c79a83..eacdc9e 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -5,14 +5,14 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pom.xml b/pom.xml
index cc8c8a3..51917df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,20 +2,27 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
+
+ io.toolisticon.maven.parent
+ maven-parent-kotlin-base
+ 2023.9.1
+
+
+
io.holunda
camunda-platform-7-autologin
- 0.0.3-SNAPSHOT
- jar
- ${project.artifactId}
- https://github.com/holunda-io/camunda-platform-7-autologin/
+ 0.1.0-SNAPSHOT
+
+ camunda-platform-7-autologin
Camunda Platform 7 Webapp auto-login.
+ https://github.com/holunda-io/camunda-platform-7-autologin/
- UTF-8
- 11
- 1.6.21
- 2.6.7
- 7.19.0
+ 17
+ 17
+
+ 3.1.4
+ 7.20.0
@@ -27,13 +34,6 @@
import
pom
-
- org.jetbrains.kotlin
- kotlin-bom
- ${kotlin.version}
- import
- pom
-
@@ -44,6 +44,10 @@
${camunda.version}
provided
+
+ io.github.microutils
+ kotlin-logging-jvm
+
org.jetbrains.kotlin
@@ -53,11 +57,6 @@
org.jetbrains.kotlin
kotlin-stdlib-jdk8
-
- io.github.microutils
- kotlin-logging-jvm
- 2.1.21
-
org.junit.jupiter
junit-jupiter
@@ -72,345 +71,13 @@
clean jacoco:prepare-agent package
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.8
-
-
- pre-unit-test
-
- prepare-agent
-
-
- ${project.build.directory}/coverage-reports/jacoco-ut.exec
- surefireArgLine
-
-
-
- post-unit-test
- test
-
- report
-
-
- ${project.build.directory}/coverage-reports/jacoco-ut.exec
- ${project.reporting.outputDirectory}/jacoco-ut
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.10.1
-
- UTF-8
- ${java.version}
-
-
-
-
- default-compile
- none
-
-
-
- default-testCompile
- none
-
-
- java-compile
- compile
-
- compile
-
-
-
- java-test-compile
- test-compile
-
- testCompile
-
-
-
-
-
-
-
- org.jetbrains.kotlin
- kotlin-maven-plugin
- ${kotlin.version}
-
- ${java.version}
- 1.5
- 1.5
-
- spring
- no-arg
- all-open
-
-
-
-
-
- compile
-
- compile
-
-
-
- ${project.basedir}/src/main/kotlin
-
-
-
-
- test-compile
-
- test-compile
-
-
-
- ${project.basedir}/src/test/kotlin
-
-
-
-
-
-
-
- org.jetbrains.kotlin
- kotlin-maven-allopen
- ${kotlin.version}
-
-
- org.jetbrains.kotlin
- kotlin-maven-noarg
- ${kotlin.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 3.2.0
-
- UTF-8
-
-
-
-
-
- maven-surefire-plugin
- 2.22.2
-
- false
- kill
- random
- --illegal-access=permit ${surefireArgLine} -Djava.awt.headless=true -XX:+StartAttachListener
-
- **/*ITest.*
-
-
-
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
- 2.8.1
-
- false
-
-
-
-
-
- org.jetbrains.dokka
- dokka-maven-plugin
- 1.6.10
-
-
- package
- attach-javadocs
-
- javadocJar
-
-
-
-
- 11
- false
- true
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.3.0
-
-
- add-kotlin-source
- generate-sources
-
- add-source
-
-
-
- ${project.basedir}/src/main/kotlin
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.2.1
-
-
- attach-sources
- package
-
- jar
-
-
- true
- true
-
-
-
-
-
-
-
- com.amashchenko.maven.plugin
- gitflow-maven-plugin
- 1.17.0
-
-
- master
- develop
- feature/
- release/
- hotfix/
- support/
- origin
-
- true
- true
- false
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 3.0.1
-
-
- --batch
- --yes
- --pinentry-mode
- loopback
-
-
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.8.2
-
- true
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.8
-
- true
- ossrh
- https://oss.sonatype.org/
-
-
-
- default-deploy
- deploy
-
- deploy
-
-
-
-
-
-
-
- maven-install-plugin
- 2.5.2
-
-
-
-
- org.apache.maven.plugins
- maven-enforcer-plugin
- 3.0.0
-
-
- enforce-maven
-
- enforce
-
-
-
-
- 11
-
-
- 3.6.0
-
-
-
-
-
-
-
-
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+
+
org.jacoco
jacoco-maven-plugin
@@ -423,51 +90,10 @@
org.apache.maven.plugins
maven-enforcer-plugin
-
- org.jetbrains.kotlin
- kotlin-maven-plugin
-
+
-
-
-
- release
-
-
- release
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- org.jetbrains.dokka
- dokka-maven-plugin
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
-
-
-
-
-
-
The Apache Software License, Version 2.0
diff --git a/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginAutoConfiguration.kt b/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginAutoConfiguration.kt
index 76ecde8..4d060c9 100644
--- a/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginAutoConfiguration.kt
+++ b/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginAutoConfiguration.kt
@@ -1,5 +1,7 @@
package io.holunda.camunda.platform.login
+import jakarta.annotation.PostConstruct
+import jakarta.servlet.DispatcherType
import mu.KLogging
import org.camunda.bpm.engine.ProcessEngine
import org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter
@@ -10,8 +12,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.web.servlet.FilterRegistrationBean
import org.springframework.context.annotation.Bean
import java.util.*
-import javax.annotation.PostConstruct
-import javax.servlet.DispatcherType
/**
* Auto configuration of the extension. Activates only if the 'camunda.bpm.login.enabled' is set to 'true'.
diff --git a/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginProperties.kt b/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginProperties.kt
index d7eded4..cb27fb7 100644
--- a/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginProperties.kt
+++ b/src/main/kotlin/io/holunda/camunda/platform/login/CamundaLoginProperties.kt
@@ -8,7 +8,6 @@ import java.util.*
/**
* Configuration properties to be supplied via properties or yaml file.
*/
-@ConstructorBinding
@ConfigurationProperties(prefix = "camunda.bpm.login")
data class CamundaLoginProperties(
/**
diff --git a/src/main/kotlin/io/holunda/camunda/platform/login/ExtendedContainerBasedAuthenticationFilter.kt b/src/main/kotlin/io/holunda/camunda/platform/login/ExtendedContainerBasedAuthenticationFilter.kt
index cf807c2..1bce0ea 100644
--- a/src/main/kotlin/io/holunda/camunda/platform/login/ExtendedContainerBasedAuthenticationFilter.kt
+++ b/src/main/kotlin/io/holunda/camunda/platform/login/ExtendedContainerBasedAuthenticationFilter.kt
@@ -1,8 +1,8 @@
package io.holunda.camunda.platform.login
+import jakarta.servlet.FilterConfig
import org.camunda.bpm.engine.rest.security.auth.AuthenticationProvider
import org.camunda.bpm.webapp.impl.security.auth.ContainerBasedAuthenticationFilter
-import javax.servlet.FilterConfig
/**
* Uses provided instance of authentication provider instead of creation of it by reflection.
diff --git a/src/main/kotlin/io/holunda/camunda/platform/login/SessionBasedAuthenticationProvider.kt b/src/main/kotlin/io/holunda/camunda/platform/login/SessionBasedAuthenticationProvider.kt
index 775fa04..a8150b9 100644
--- a/src/main/kotlin/io/holunda/camunda/platform/login/SessionBasedAuthenticationProvider.kt
+++ b/src/main/kotlin/io/holunda/camunda/platform/login/SessionBasedAuthenticationProvider.kt
@@ -1,12 +1,11 @@
package io.holunda.camunda.platform.login
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
import org.camunda.bpm.engine.ProcessEngine
import org.camunda.bpm.engine.rest.security.auth.AuthenticationProvider
import org.camunda.bpm.engine.rest.security.auth.AuthenticationResult
import org.camunda.bpm.webapp.impl.security.auth.AuthenticationUtil
-import org.camunda.bpm.webapp.impl.security.auth.Authentications
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
/**
* Authentication provider retrieving the user id stored in the session. If none is found, falls back to the one provided on construction.