diff --git a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunProcessEngineConfiguration.java b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunProcessEngineConfiguration.java index d0d0d53848b..469ca3ebe71 100644 --- a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunProcessEngineConfiguration.java +++ b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunProcessEngineConfiguration.java @@ -16,12 +16,11 @@ */ package org.camunda.bpm.run; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; import java.util.Set; -import javax.inject.Inject; - import org.camunda.bpm.engine.ProcessEngineException; import org.camunda.bpm.engine.impl.telemetry.CamundaIntegration; import org.camunda.bpm.engine.spring.SpringProcessEngineConfiguration; diff --git a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunRestConfiguration.java b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunRestConfiguration.java index 2e88a0a22bb..02d09e61d1c 100644 --- a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunRestConfiguration.java +++ b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunRestConfiguration.java @@ -16,6 +16,7 @@ */ package org.camunda.bpm.run; +import jakarta.servlet.Filter; import org.apache.catalina.filters.CorsFilter; import org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter; import org.camunda.bpm.run.property.CamundaBpmRunAuthenticationProperties; @@ -33,8 +34,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.servlet.Filter; - @EnableConfigurationProperties(CamundaBpmRunProperties.class) @Configuration @AutoConfigureAfter({ CamundaBpmAutoConfiguration.class }) diff --git a/distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java index 3a97d692e54..06f28dd288f 100644 --- a/distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java +++ b/distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; diff --git a/distro/run/modules/example/pom.xml b/distro/run/modules/example/pom.xml index 50032f28ea3..df38d9168b7 100644 --- a/distro/run/modules/example/pom.xml +++ b/distro/run/modules/example/pom.xml @@ -28,7 +28,7 @@ org.camunda.bpm.example - camunda-example-invoice + camunda-example-invoice-jakarta ${project.version} classes provided @@ -54,7 +54,7 @@ org.camunda.bpm.example - camunda-example-invoice + camunda-example-invoice-jakarta ${project.version} war ${project.build.directory}/classes diff --git a/distro/run/modules/example/src/main/java/org/camunda/bpm/run/example/invoice/Application.java b/distro/run/modules/example/src/main/java/org/camunda/bpm/run/example/invoice/Application.java index faa93fb7f25..8853cad11e7 100644 --- a/distro/run/modules/example/src/main/java/org/camunda/bpm/run/example/invoice/Application.java +++ b/distro/run/modules/example/src/main/java/org/camunda/bpm/run/example/invoice/Application.java @@ -16,7 +16,7 @@ */ package org.camunda.bpm.run.example.invoice; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.camunda.bpm.engine.ProcessEngine; import org.camunda.bpm.example.invoice.InvoiceApplicationHelper; import org.camunda.bpm.example.invoice.InvoiceProcessApplication; diff --git a/distro/run/modules/swaggerui/src/main/resources/META-INF/spring.factories b/distro/run/modules/swaggerui/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 3c2f52cd14d..00000000000 --- a/distro/run/modules/swaggerui/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.camunda.bpm.run.swaggerui.CamundaSwaggerUIConfiguration \ No newline at end of file diff --git a/distro/run/modules/swaggerui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/distro/run/modules/swaggerui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..9397878cc84 --- /dev/null +++ b/distro/run/modules/swaggerui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.camunda.bpm.run.swaggerui.CamundaSwaggerUIConfiguration \ No newline at end of file diff --git a/distro/run/pom.xml b/distro/run/pom.xml index 79710a7bbda..b71fa644935 100644 --- a/distro/run/pom.xml +++ b/distro/run/pom.xml @@ -58,6 +58,31 @@ + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M1 + + + + [17,) + + + + + + + enforce + + + + + + diff --git a/distro/run/qa/integration-tests/pom.xml b/distro/run/qa/integration-tests/pom.xml index 0df3b60d3c8..16b72b67ab6 100644 --- a/distro/run/qa/integration-tests/pom.xml +++ b/distro/run/qa/integration-tests/pom.xml @@ -82,6 +82,7 @@ org.apache.httpcomponents httpclient + ${version.httpclient} test diff --git a/distro/run/qa/runtime/pom.xml b/distro/run/qa/runtime/pom.xml index 88d50a6c0eb..13e07eb137a 100644 --- a/distro/run/qa/runtime/pom.xml +++ b/distro/run/qa/runtime/pom.xml @@ -110,6 +110,7 @@ org.apache.httpcomponents httpclient + ${version.httpclient} test