From e0cbd9a200f789e11ed123b75c9430e904260932 Mon Sep 17 00:00:00 2001 From: arolfes Date: Sat, 18 Nov 2023 21:28:30 +0100 Subject: [PATCH] Closes #612: cleanup pom.xml --- pom.xml | 67 ++++++++++++------- .../pom.xml | 65 ++---------------- taskana-adapter-camunda-listener/pom.xml | 1 - .../pom.xml | 2 - taskana-adapter-camunda-outbox-rest/pom.xml | 14 ---- .../pom.xml | 4 -- .../pom.xml | 61 +++++------------ .../pom.xml | 6 +- .../pom.xml | 9 +-- taskana-adapter-taskana-connector/pom.xml | 37 +++++----- taskana-adapter/pom.xml | 4 -- 11 files changed, 86 insertions(+), 184 deletions(-) diff --git a/pom.xml b/pom.xml index a59f3888..36e7682e 100644 --- a/pom.xml +++ b/pom.xml @@ -47,22 +47,22 @@ 10.12.4 1.16.0 - 3.3.0 - 3.4.0 - 3.3.0 + 3.3.1 3.11.0 - 3.6.0 + 3.6.1 3.2.1 - 3.2.1 - 3.3.1 - 2.7.9 - 3.10.0.2594 - 4.0.0.Final - 7.9.Final + 3.3.0 + 3.6.0 + 7.9.Final 3.3.1 - 3.6.1 + 3.10.0.2594 + 3.3.0 + 2.7.9 + 3.2.1 + 3.4.0 + 4.0.0.Final - 3.5.13 + 3.5.14 3.0.2 3.0.0 @@ -70,14 +70,14 @@ 7.20.0 1.22.0 + 2.2.0 + 2.1.0 2.1.1 6.0.0 3.1.0 6.0.4.Final - 3.0.12.Final - 2.1.1 5.3.1 3.0.3.Final @@ -86,8 +86,8 @@ 5.0.1.Final - 1.0.1 - 0.2 + 1.2.0 + 0.3 3.1.0 1.6.13 @@ -126,6 +126,13 @@ + + org.camunda.bpm + camunda-bom + ${version.camunda} + import + pom + org.springframework.boot spring-boot-dependencies @@ -143,16 +150,6 @@ - - jdk8-compatibility - - [9,) - - - 8 - ${java.version} - - snapshot @@ -374,5 +371,23 @@ true + + camunda-bpm-nexus + Camunda Maven Repository + https://app.camunda.com/nexus/content/groups/public + + + + + jboss-public-repository + JBoss Repository + https://repository.jboss.org/nexus/content/groups/public + diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index 9cd7ad6e..cfeef91c 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -19,18 +19,6 @@ false - - - - org.camunda.bpm - camunda-bom - ${version.camunda} - import - pom - - - - jakarta.ws.rs @@ -58,24 +46,24 @@ org.camunda.spin camunda-spin-dataformat-all - provided + test org.camunda.bpm camunda-engine-plugin-spin - provided + test org.camunda.template-engines camunda-template-engines-freemarker - 2.2.0 + ${version.camunda.template-engines-freemarker} test org.camunda.template-engines camunda-template-engines-velocity - 2.1.0 + ${version.camunda.template-engines-velocity} test @@ -84,13 +72,6 @@ bootstrap ${version.org.webjars.bootstrap} - - org.jboss.spec - jboss-javaee-6.0 - ${version.org.jboss.spec} - provided - pom - com.h2database @@ -132,52 +113,18 @@ org.jboss.as.plugins jboss-as-maven-plugin - ${version.jboss-as-maven-plugin} + ${version.maven.jboss-as.plugin} org.wildfly.plugins wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - - - + ${version.maven.wildfly.plugin} maven-war-plugin ${version.maven-war-plugin} - - - - - camunda-bpm-nexus - Camunda Maven Repository - https://app.camunda.com/nexus/content/groups/public - - - - - jboss-public-repository - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public - - diff --git a/taskana-adapter-camunda-listener/pom.xml b/taskana-adapter-camunda-listener/pom.xml index 4a2d853c..96b86e24 100644 --- a/taskana-adapter-camunda-listener/pom.xml +++ b/taskana-adapter-camunda-listener/pom.xml @@ -22,7 +22,6 @@ com.fasterxml.jackson.core jackson-databind - 2.14.2 org.mybatis diff --git a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml index 153f048e..18cb4c01 100644 --- a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml +++ b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml @@ -28,12 +28,10 @@ org.springframework.boot spring-boot-autoconfigure - ${version.spring.boot} org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.postgresql diff --git a/taskana-adapter-camunda-outbox-rest/pom.xml b/taskana-adapter-camunda-outbox-rest/pom.xml index 61e00b60..7d3297bc 100644 --- a/taskana-adapter-camunda-outbox-rest/pom.xml +++ b/taskana-adapter-camunda-outbox-rest/pom.xml @@ -15,28 +15,14 @@ ../pom.xml - - - - org.camunda.spin - camunda-spin-bom - ${version.camunda.spin} - import - pom - - - - org.camunda.spin camunda-spin-core - ${version.camunda.spin} org.camunda.spin camunda-spin-dataformat-all - ${version.camunda.spin} jakarta.ws.rs diff --git a/taskana-adapter-camunda-spring-boot-example/pom.xml b/taskana-adapter-camunda-spring-boot-example/pom.xml index f3cb4897..4abb9a52 100644 --- a/taskana-adapter-camunda-spring-boot-example/pom.xml +++ b/taskana-adapter-camunda-spring-boot-example/pom.xml @@ -19,18 +19,15 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-configuration-processor - ${version.spring.boot} true org.springframework.boot spring-boot-starter-test - ${version.spring.boot} test @@ -59,7 +56,6 @@ com.h2database h2 - compile diff --git a/taskana-adapter-camunda-spring-boot-test/pom.xml b/taskana-adapter-camunda-spring-boot-test/pom.xml index 76bd3d29..245e435a 100644 --- a/taskana-adapter-camunda-spring-boot-test/pom.xml +++ b/taskana-adapter-camunda-spring-boot-test/pom.xml @@ -15,49 +15,16 @@ ../pom.xml - - - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - import - pom - - - - org.camunda.bpm.springboot camunda-bpm-spring-boot-starter - ${version.camunda} - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-test - ${version.camunda} - test - - - com.h2database - h2 - test - org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-rest - ${version.camunda} org.skyscreamer @@ -69,18 +36,14 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-webapp - ${version.camunda} org.camunda.bpm camunda-engine-plugin-spin - ${version.camunda} - compile org.camunda.spin camunda-spin-dataformat-json-jackson - ${version.camunda.spin} @@ -103,12 +66,6 @@ taskana-adapter-camunda-listener ${project.version} - - - pro.taskana - taskana-common-test - ${version.taskana} - pro.taskana @@ -122,6 +79,24 @@ resteasy-servlet-spring-boot-starter ${version.resteasy.spring.boot} + + + pro.taskana + taskana-common-test + ${version.taskana} + test + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-test + test + + + com.h2database + h2 + test + + com.ibm.db2 diff --git a/taskana-adapter-camunda-system-connector/pom.xml b/taskana-adapter-camunda-system-connector/pom.xml index 1669498f..55c72282 100644 --- a/taskana-adapter-camunda-system-connector/pom.xml +++ b/taskana-adapter-camunda-system-connector/pom.xml @@ -19,7 +19,6 @@ org.springframework.boot spring-boot-starter - ${version.spring.boot} com.squareup.okhttp3 @@ -28,22 +27,21 @@ org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-starter-validation - ${version.spring.boot} pro.taskana taskana-adapter ${project.version} + + org.springframework.boot spring-boot-starter-test - ${version.spring.boot} test diff --git a/taskana-adapter-camunda-wildfly-example/pom.xml b/taskana-adapter-camunda-wildfly-example/pom.xml index d7fef82c..2e710859 100644 --- a/taskana-adapter-camunda-wildfly-example/pom.xml +++ b/taskana-adapter-camunda-wildfly-example/pom.xml @@ -20,13 +20,6 @@ - - org.springframework.boot - spring-boot-dependencies - ${version.spring.boot} - import - pom - org.wildfly.bom wildfly-ee @@ -239,7 +232,7 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.wildfly.maven.plugin} + ${version.maven.wildfly.plugin} ${version.wildfly} -Djboss.http.port=8089 diff --git a/taskana-adapter-taskana-connector/pom.xml b/taskana-adapter-taskana-connector/pom.xml index 71336f92..0c09779f 100644 --- a/taskana-adapter-taskana-connector/pom.xml +++ b/taskana-adapter-taskana-connector/pom.xml @@ -19,38 +19,19 @@ org.springframework.boot spring-boot-starter - ${version.spring.boot} org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-configuration-processor - ${version.spring.boot} true org.springframework.boot spring-boot-starter-jdbc - ${version.spring.boot} - - - com.h2database - h2 - test - - - com.ibm.db2 - jcc - test - - - org.postgresql - postgresql - test pro.taskana @@ -67,6 +48,24 @@ mybatis-spring-boot-starter ${version.spring.mybatis} + + + + com.h2database + h2 + test + + + com.ibm.db2 + jcc + test + + + org.postgresql + postgresql + test + + diff --git a/taskana-adapter/pom.xml b/taskana-adapter/pom.xml index 7d781738..467a25d4 100644 --- a/taskana-adapter/pom.xml +++ b/taskana-adapter/pom.xml @@ -19,17 +19,14 @@ org.springframework.boot spring-boot-starter - ${version.spring.boot} org.springframework.boot spring-boot-starter-web - ${version.spring.boot} org.springframework.boot spring-boot-configuration-processor - ${version.spring.boot} true @@ -46,7 +43,6 @@ org.springframework.boot spring-boot-starter-test - ${version.spring.boot} test