diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f9348d44f..01738f598 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: if: always() strategy: matrix: - java: [ '17', '21', '22' ] + java: [ '17', '21', '23' ] runs-on: ubuntu-latest steps: - name: Check out diff --git a/CHANGELOG.md b/CHANGELOG.md index 737c5d11a..b9b176590 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,29 @@ **Details** +- Dependency updates + - Jetty 11.0.24 + - Apache CFX 4.0.5 + - logback 1.5.11 + - jackson 2.18.0 + - h2 2.2.224 + - db2 jcc 11.5.9.0 + - mssql-jdbc 12.8.1 + - mysql-connector 9.1.0 + - ojdbc11 23.5.0.24.07 + - postgresql 42.7.4 + - HikariCP 6.0.0 + - joda-time 2.13.0 + - commons-lang3 3.17.0 + - slf4j 2.0.16 + - reactor-netty 1.1.23 + - reactor-core 3.6.11 + - swagger 2.2.25 + - asm 9.7.1 + - servlet-api 6.1.0 + - metrics 4.2.28 + - validation-api 3.1.0 + ## 10.0.0 (2024-10-04) **Highlights** diff --git a/maven-version-rules.xml b/maven-version-rules.xml index 42cad8cfe..46ce4dcfd 100644 --- a/maven-version-rules.xml +++ b/maven-version-rules.xml @@ -5,7 +5,7 @@ .*preview - .*jre1[0-9] + .*jre8 @@ -13,6 +13,11 @@ .*rc[0-9]+ + + + .*beta.* + + .*(alpha|beta).* @@ -60,7 +65,7 @@ - .*(Alpha|CR).* + .*(Alpha|Beta|CR).* diff --git a/nflow-engine/src/main/java/io/nflow/engine/service/MaintenanceService.java b/nflow-engine/src/main/java/io/nflow/engine/service/MaintenanceService.java index 72403fdec..d044a5793 100644 --- a/nflow-engine/src/main/java/io/nflow/engine/service/MaintenanceService.java +++ b/nflow-engine/src/main/java/io/nflow/engine/service/MaintenanceService.java @@ -115,12 +115,12 @@ private int doAction(String type, ConfigurationItem configuration, TableType tab } int workflows = doAction.apply(workflowIds); totalWorkflows += workflows; - double timeDiff = max(stopWatch.getTime() / 1000.0, 0.000001); + double timeDiff = max(stopWatch.getDuration().toMillis() / 1000.0, 0.000001); String status = format("%s. %s workflows, %.1f workflows / second.", type, workflows, totalWorkflows / timeDiff); log.debug("{} Workflow ids: {}.", status, workflowIds); periodicLogger.info(status); } while (true); - log.info("{} finished. Operated on {} workflows in {} seconds.", type, totalWorkflows, stopWatch.getTime() / 1000); + log.info("{} finished. Operated on {} workflows in {} seconds.", type, totalWorkflows, stopWatch.getDuration().toSeconds()); return totalWorkflows; } diff --git a/nflow-engine/src/test/java/io/nflow/engine/config/EngineConfigurationTest.java b/nflow-engine/src/test/java/io/nflow/engine/config/EngineConfigurationTest.java index 66ae15818..eccd963dd 100644 --- a/nflow-engine/src/test/java/io/nflow/engine/config/EngineConfigurationTest.java +++ b/nflow-engine/src/test/java/io/nflow/engine/config/EngineConfigurationTest.java @@ -3,6 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isA; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -69,9 +70,10 @@ public void nflowThreadFactoryInstantiated() { } @Test - public void nflowObjectMapperInstantiated() { + public void nflowObjectMapperInstantiated() throws Exception { ObjectMapper mapper = configuration.nflowObjectMapper().get(); - assertThat(mapper.canSerialize(DateTime.class), is(true)); + String nowS = mapper.writeValueAsString(DateTime.now()); + assertThat(mapper.readerFor(DateTime.class).readValue(nowS, DateTime.class), isA(DateTime.class)); assertThat(mapper.getSerializationConfig().getDefaultPropertyInclusion().getValueInclusion(), is(JsonInclude.Include.NON_EMPTY)); } diff --git a/nflow-engine/src/test/java/io/nflow/engine/guice/EngineModuleTest.java b/nflow-engine/src/test/java/io/nflow/engine/guice/EngineModuleTest.java index 6353b4c6e..b4f1a91f4 100644 --- a/nflow-engine/src/test/java/io/nflow/engine/guice/EngineModuleTest.java +++ b/nflow-engine/src/test/java/io/nflow/engine/guice/EngineModuleTest.java @@ -3,9 +3,11 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isA; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import java.io.IOException; import java.util.Properties; import java.util.concurrent.ThreadFactory; @@ -44,7 +46,7 @@ public class EngineModuleTest { @Test - public void testEngineConfiguration() { + public void testEngineConfiguration() throws IOException { Properties props = new Properties(); props.setProperty("nflow.db.type", "h2"); props.setProperty("nflow.executor.thread.count", "1"); @@ -64,7 +66,8 @@ public void testEngineConfiguration() { assertThat(((CustomizableThreadFactory) factory).getThreadGroup().getName(), is("nflow")); ObjectMapper mapper = injector.getInstance(Key.get(EngineObjectMapperSupplier.class, NFlow.class)).get(); - assertThat(mapper.canSerialize(DateTime.class), is(true)); + String nowS = mapper.writeValueAsString(DateTime.now()); + assertThat(mapper.readerFor(DateTime.class).readValue(nowS, DateTime.class), isA(DateTime.class)); assertThat(mapper.getSerializationConfig().getDefaultPropertyInclusion().getValueInclusion(), is(JsonInclude.Include.NON_EMPTY)); diff --git a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowDefinitionResourceTest.java b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowDefinitionResourceTest.java index bcc796a5b..4f657710c 100644 --- a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowDefinitionResourceTest.java +++ b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowDefinitionResourceTest.java @@ -54,8 +54,7 @@ public class WorkflowDefinitionResourceTest { private ListWorkflowDefinitionResponse dummyResponse; private WorkflowDefinitionResource resource; - GenericType> definitionListType = new GenericType<>() { - /**/ }; + GenericType> definitionListType = new GenericType<>() {}; @BeforeEach public void setup() { diff --git a/nflow-server-common/pom.xml b/nflow-server-common/pom.xml index 594e46827..643251ad8 100644 --- a/nflow-server-common/pom.xml +++ b/nflow-server-common/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 4.3.0 + 5.17.14 @@ -35,6 +35,7 @@ https://github.com/swagger-api/swagger-ui/archive/v${swagger.ui.version}.tar.gz true + d6aac808d1991a1a8a50dfc35f57bca6fb2d36d8baccdf7542b06685f9f88303 ${project.build.directory}/swagger diff --git a/pom.xml b/pom.xml index da6c4cf20..d8ae85bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -112,80 +112,80 @@ 17 1C - 9.7 - 4.0.4 - 3.5.0 - 3.14.0 + 9.7.1 + 4.0.5 + 3.6.0 + 3.17.0 1.4 4.3.0 11.5.9.0 4.0.2 1.15.0 7.0.0 - 2.2.224 - 2.2 + 2.3.232 + 3.0 8.0.1.Final - 5.1.0 - 2.17.0 - 2.17.0 + 6.0.0 + 2.18.0 + 2.18.0 3.30.2-GA 3.0.0 - 6.0.0 + 6.1.0 2.0.1 - 3.1.0 + 4.0.0 4.0.2 - 4.0.1 + 4.0.2 3.1.3 - 11.0.20 - 2.12.7 - 5.10.0 - 1.10.2 - 1.5.4 - 3.3.3 + 11.0.24 + 2.13.0 + 5.11.2 + 1.11.2 + 1.5.11 + 3.4.1 3.7.1 - 3.3.2 + 3.4.0 3.13.0 - 3.1.1 - 1.9.0 + 3.1.3 + 1.11.0 2.10 - 3.4.1 - 3.2.2 - 3.1.1 + 3.5.0 + 3.2.7 + 3.1.3 0.8.12 - 3.3.0 - 3.6.3 - 3.3.2 - 3.21.2 - 3.5.0 - 3.0.1 + 3.4.2 + 3.10.1 + 3.5.0 + 3.25.0 + 3.7.0 + 3.1.1 3.3.1 - 3.5.2 - 4.0.0-M13 + 3.6.0 + 4.0.0-M16 3.3.1 - 3.2.5 - 4.2.25 - 5.11.0 - 12.6.1.jre11 - 8.3.0 - 1.6.13 + 3.5.1 + 4.2.28 + 5.14.2 + 12.8.1.jre11 + 9.1.0 + 1.7.0 v20.12.1 10.5.0 1.3 - 23.2.0.0 - 42.7.3 + 23.5.0.24.07 + 42.7.4 UTF-8 UTF-8 - 3.6.5 - 1.1.18 + 3.6.11 + 1.1.23 0.10.2 - 2.0.12 - 4.8.4 + 2.0.16 + 4.8.6 7.6.4 - 4.8.4.0 + 4.8.6.4 6.0.23 - 2.2.21 - 3.0.2 - 2.16.2 + 2.2.25 + 3.1.0 + 2.17.1 @@ -221,7 +221,8 @@ 1 ${surefire.forkcount} - @{jacocoArgLine} -Dorg.apache.cxf.transport.http.forceURLConnection=true + + @{jacocoArgLine} -Dorg.apache.cxf.transport.http.forceURLConnection=true -Djava.security.manager=allow diff --git a/scripts/setup-db-mariadb.sh b/scripts/setup-db-mariadb.sh index 21b28490e..6a65621ab 100755 --- a/scripts/setup-db-mariadb.sh +++ b/scripts/setup-db-mariadb.sh @@ -7,10 +7,10 @@ tool=$(command -v podman) DB_VERSION=${DB_VERSION:-latest} case $DB_VERSION in old) - DB_VERSION=10.4 # supported until Jun/2024 + DB_VERSION=10.5 # supported until Jul/2025 ;; latest) - DB_VERSION=11.3.2 + DB_VERSION=11.5 ;; esac diff --git a/scripts/setup-db-mysql.sh b/scripts/setup-db-mysql.sh index 4a839b48e..f48a1f747 100755 --- a/scripts/setup-db-mysql.sh +++ b/scripts/setup-db-mysql.sh @@ -10,7 +10,7 @@ case $DB_VERSION in DB_VERSION=8.0 # supported until Apr/2026 ;; latest) - DB_VERSION=8.3 + DB_VERSION=9.0 ;; esac diff --git a/scripts/setup-db-oracle.sh b/scripts/setup-db-oracle.sh index 2c636d62f..ee9c4e555 100755 --- a/scripts/setup-db-oracle.sh +++ b/scripts/setup-db-oracle.sh @@ -12,7 +12,7 @@ case $DB_VERSION in ;; latest) IMAGE=docker.io/gvenzl/oracle-free - DB_VERSION=23.3-slim + DB_VERSION=23.5-slim ;; esac diff --git a/scripts/setup-db-postgresql.sh b/scripts/setup-db-postgresql.sh index 057b3fdef..674da5b0b 100755 --- a/scripts/setup-db-postgresql.sh +++ b/scripts/setup-db-postgresql.sh @@ -10,7 +10,7 @@ case $DB_VERSION in DB_VERSION=12 # supported until Nov/2024 ;; latest) - DB_VERSION=16 + DB_VERSION=17 ;; esac