Skip to content

Commit

Permalink
feat(run): Upgrade to Spring Boot 3.1
Browse files Browse the repository at this point in the history
* This commit includes maven-enforcer-plugin in camunda-run to enforce java 17 during build time

Related to: camunda#3442
  • Loading branch information
psavidis authored and yanavasileva committed Jun 30, 2023
1 parent 6b2e2f2 commit 807e223
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions distro/run/modules/example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<dependency>
<groupId>org.camunda.bpm.example</groupId>
<artifactId>camunda-example-invoice</artifactId>
<artifactId>camunda-example-invoice-jakarta</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<scope>provided</scope>
Expand All @@ -54,7 +54,7 @@
<artifactItems>
<artifactItem>
<groupId>org.camunda.bpm.example</groupId>
<artifactId>camunda-example-invoice</artifactId>
<artifactId>camunda-example-invoice-jakarta</artifactId>
<version>${project.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.camunda.bpm.run.swaggerui.CamundaSwaggerUIConfiguration
25 changes: 25 additions & 0 deletions distro/run/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,31 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>

<!-- Enforces Java 17 during the build -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<rules>
<requireJavaVersion>
<version>[17,)</version>
</requireJavaVersion>
</rules>
</configuration>
<executions>
<execution>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

<profiles>
Expand Down
1 change: 1 addition & 0 deletions distro/run/qa/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${version.httpclient}</version>
<scope>test</scope>
</dependency>

Expand Down
1 change: 1 addition & 0 deletions distro/run/qa/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${version.httpclient}</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit 807e223

Please sign in to comment.