Skip to content

Commit

Permalink
feat(camunda 7.20): WIP camunda 7.20, spring boot 3, java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
janvonneree committed Oct 10, 2023
1 parent 2011b9b commit c9161f2
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 37 deletions.
1 change: 1 addition & 0 deletions components/approval/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
<exceptionHandler>false</exceptionHandler>
<useTags>true</useTags>
<enumPropertyNaming>UPPERCASE</enumPropertyNaming>
<useSpringBoot3>true</useSpringBoot3>
</configOptions>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.holunda.polyflow.example.infrastructure.jpa

import org.hibernate.dialect.PostgreSQL94Dialect
import org.hibernate.dialect.PostgreSQLDialect
import org.hibernate.type.descriptor.sql.BinaryTypeDescriptor
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor
import java.sql.Types

class NoToastPostgresSQLDialect : PostgreSQL94Dialect() {
class NoToastPostgresSQLDialect : PostgreSQLDialect() {
init {
this.registerColumnType(Types.BLOB, "BYTEA")
}
Expand Down
1 change: 1 addition & 0 deletions components/order-processing/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<bigDecimalAsString>true</bigDecimalAsString>
<useOptional>true</useOptional>
<useBeanValidation>true</useBeanValidation>
<useSpringBoot3>true</useSpringBoot3>
</configOptions>
</configuration>
</execution>
Expand Down
10 changes: 1 addition & 9 deletions components/tasklist-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,11 @@
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

</dependencies>

Expand Down Expand Up @@ -131,6 +122,7 @@
<serializationLibrary>jackson</serializationLibrary>
<useTags>true</useTags>
<enumPropertyNaming>UPPERCASE</enumPropertyNaming>
<useSpringBoot3>true</useSpringBoot3>
</configOptions>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired
import java.time.Instant
import java.time.OffsetDateTime
import java.time.ZoneOffset
import javax.validation.Valid
import jakarta.validation.Valid

/**
* DTO mapper.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TasklistSPAConfiguration : WebMvcConfigurer {
.addResourceHandler(*STATIC_RESOURCES_SHORT_CACHE)
.addResourceLocations(RESOURCE_LOCATION)
.setCacheControl(CacheControl.maxAge(1, TimeUnit.HOURS))

/**
* Webjar support.
*/
Expand All @@ -77,13 +77,13 @@ class TasklistSPAConfiguration : WebMvcConfigurer {
.addMapping(Web.BASE_PATH + "/**")
.allowedOrigins("http://localhost:4200")
.allowedMethods(
HttpMethod.GET.name,
HttpMethod.HEAD.name,
HttpMethod.POST.name,
HttpMethod.DELETE.name,
HttpMethod.OPTIONS.name,
HttpMethod.PATCH.name,
HttpMethod.PUT.name
HttpMethod.GET.name(),
HttpMethod.HEAD.name(),
HttpMethod.POST.name(),
HttpMethod.DELETE.name(),
HttpMethod.OPTIONS.name(),
HttpMethod.PATCH.name(),
HttpMethod.PUT.name()
)
}

Expand Down
8 changes: 5 additions & 3 deletions components/tasklist-reactive-backend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -34,8 +35,8 @@
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -143,6 +144,7 @@
<bigDecimalAsString>true</bigDecimalAsString>
<useOptional>true</useOptional>
<useBeanValidation>true</useBeanValidation>
<useSpringBoot3>true</useSpringBoot3>
</configOptions>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import org.springframework.http.MediaType
import org.springframework.web.bind.annotation.*
import reactor.core.publisher.Flux
import java.util.*
import javax.validation.constraints.NotNull
import javax.validation.constraints.Pattern
import jakarta.validation.constraints.NotNull
import jakarta.validation.constraints.Pattern

/**
* Reactive controller delivering tasks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired
import java.time.OffsetDateTime
import java.time.ZoneOffset
import java.util.*
import javax.validation.Valid
import jakarta.validation.Valid

/**
* REST mapper.
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
<java.version>17</java.version>
<version.java>${java.version}</version.java>
<version.java>${java.version}</version.java>

Expand All @@ -36,17 +36,17 @@
Use the system property: -Dcamunda-ee to enable EE
-->

<springboot.version>2.7.15</springboot.version>
<polyflow.version>3.11.0</polyflow.version>
<springboot.version>3.1.3</springboot.version>
<polyflow.version>4.0.0-SNAPSHOT</polyflow.version>

<camunda-ce.version>7.18.0</camunda-ce.version>
<camunda-ee.version>7.18.5-ee</camunda-ee.version>
<camunda-ce.version>7.20.0</camunda-ce.version>
<camunda-ee.version>7.20.0-ee</camunda-ee.version>
<camunda-springboot.version>${camunda-ce.version}</camunda-springboot.version>

<camunda-bpm-assert.version>${camunda-ce.version}</camunda-bpm-assert.version>
<camunda-bpm-mockito.version>6.18.0</camunda-bpm-mockito.version>
<version.camunda.spin>1.18.0</version.camunda.spin>
<camunda-bpm-data.version>1.2.8</camunda-bpm-data.version>
<camunda-bpm-mockito.version>7.20.0</camunda-bpm-mockito.version>
<version.camunda.spin>1.22.0</version.camunda.spin>
<camunda-bpm-data.version>1.4.0</camunda-bpm-data.version>
<springdoc.version>1.7.0</springdoc.version>
<org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
<mockito-kotlin.version>5.1.0</mockito-kotlin.version>
Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server-local-polyflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-server-connector</artifactId>
<version>4.6.7</version>
<version>4.8.2</version> <!-- FIXME check axon version usage -->
<scope>runtime</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>2.1.1</version>
</dependency>

<!-- Testing -->
Expand Down Expand Up @@ -154,6 +155,7 @@
<bigDecimalAsString>true</bigDecimalAsString>
<useOptional>true</useOptional>
<useBeanValidation>false</useBeanValidation>
<useSpringBoot3>true</useSpringBoot3>
</configOptions>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import java.time.Instant
import java.time.OffsetDateTime
import java.time.ZoneOffset
import java.util.*
import javax.validation.Valid
import jakarta.validation.Valid

/**
* DTO mapper.
Expand Down
1 change: 0 additions & 1 deletion scenarios/single-node-jpa-maria/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.8</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down

0 comments on commit c9161f2

Please sign in to comment.