clean up dependencies on webapp et.all

- really use kotlin 1.9.10 - remove dependency on webapp, fixes #8 - remove dependency on commons-io, fixes #9
holunda-io · Oct 25, 2023 · 12a8429 · 12a8429
1 parent a34c43a
commit 12a8429
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,20 +36,23 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-bom</artifactId>
         <version>${kotlin.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -79,7 +82,13 @@
     <!-- CAMUNDA -->
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
-      <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
+      <artifactId>camunda-bpm-spring-boot-starter</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <!-- TEST -->
@@ -152,7 +161,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.10</version>
+          <version>0.8.11</version>
           <executions>
             <execution>
               <id>pre-unit-test</id>
@@ -243,6 +252,7 @@
           <version>${kotlin.version}</version>
           <configuration>
             <jvmTarget>${java.version}</jvmTarget>
+
             <compilerPlugins>
               <plugin>spring</plugin>
               <plugin>no-arg</plugin>

diff --git a/src/main/kotlin/io/holunda/deployment/DeployOnApplicationStart.kt b/src/main/kotlin/io/holunda/deployment/DeployOnApplicationStart.kt
@@ -1,7 +1,6 @@
 package io.holunda.deployment
 
 import mu.KLogging
-import org.apache.commons.io.FilenameUtils
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.repository.DeploymentBuilder
 import org.camunda.bpm.spring.boot.starter.event.PostDeployEvent
@@ -18,11 +17,11 @@ open class DeployOnApplicationStart(
 
   companion object : KLogging() {
     const val PROCESS_APPLICATION = "process application"
-    val CAMUNDA_FILE_SUFFIXES = setOf(
-      CamundaBpmProperties.DEFAULT_BPMN_RESOURCE_SUFFIXES.toSet(),
-      CamundaBpmProperties.DEFAULT_CMMN_RESOURCE_SUFFIXES.toSet(),
-      CamundaBpmProperties.DEFAULT_DMN_RESOURCE_SUFFIXES.toSet()
-    ).flatten()
+    val CAMUNDA_FILE_SUFFIXES: Set<String> = buildSet {
+      addAll(CamundaBpmProperties.DEFAULT_BPMN_RESOURCE_SUFFIXES)
+      addAll(CamundaBpmProperties.DEFAULT_CMMN_RESOURCE_SUFFIXES)
+      addAll(CamundaBpmProperties.DEFAULT_DMN_RESOURCE_SUFFIXES)
+    }
   }
 
   @EventListener
@@ -65,8 +64,7 @@ open class DeployOnApplicationStart(
     }
   }
 
-  private fun isCamundaResource(resource: Resource) =
-    CAMUNDA_FILE_SUFFIXES.any { it.equals(FilenameUtils.getExtension(resource.filename)) }
+  private fun isCamundaResource(resource: Resource) = CAMUNDA_FILE_SUFFIXES.contains(resource.filename!!.substringAfterLast("."))
 
   private fun addDeployment(
     processArchive: CamundaDeploymentProperties.ProcessArchive,

diff --git a/src/test/kotlin/io/holunda/deployment/DeployOnApplicationStartTest.kt b/src/test/kotlin/io/holunda/deployment/DeployOnApplicationStartTest.kt
@@ -130,6 +130,7 @@ class DeploymentBuilderFake(
     return this
   }
 
+  @Deprecated("delegates to deprecated method.", replaceWith = ReplaceWith("DeploymentBuilder#enableDuplicateFiltering(deployChangedOnly: Boolean)"))
   override fun enableDuplicateFiltering(): DeploymentBuilder {
     return this
   }