NitorCreations · efonsell · Apr 10, 2024 · Apr 5, 2024 · Apr 5, 2024 · Apr 5, 2024
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        java: [ '17', '20' ]
+        java: [ '17', '21' ]
     runs-on: ubuntu-latest
     steps:
       - name: Check out
@@ -82,7 +82,7 @@ jobs:
     if: always()
     strategy:
       matrix:
-        java: [ '17', '20' ]
+        java: [ '17', '21' ]
         db: [ 'h2', 'mariadb', 'postgresql', 'mysql', 'sqlserver', 'db2', 'oracle' ]
     runs-on: ubuntu-latest
     env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,27 @@
 
 **Details**
 
+  - Dependency updates:
+    - Jetty 11.0.20
+    - Apache CFX 4.0.4
+    - Dropwizard metrics 4.2.19
+    - logback 1.5.3
+    - jackson 2.17.0
+    - h2 2.2.224
+    - protobuf 3.25.1
+    - db2 jcc 11.5.9.0
+    - mssql-jdbc 12.6.1
+    - mysql-connector 8.3.0
+    - ojdbc11 23.3.0.23.09
+    - postgresql 42.7.3
+    - mariadb-java-client 3.3.3
+    - HikariCP 5.1.0
+    - netty 4.1.107
+    - joda-time 2.12.5
+    - commons-lang3 3.14.0
+    - slf4j 2.0.12
+
+
 ## 9.0.0 (2023-08-30)
 
 **Highlights**

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
@@ -23,6 +23,9 @@
   <Match>
     <Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
   </Match>
+  <Match>
+    <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+  </Match>
   <Match>
     <!--
     https://github.com/spotbugs/spotbugs/issues/2040 - the new detector has too much false positives,

diff --git a/maven-version-rules.xml b/maven-version-rules.xml
@@ -23,11 +23,31 @@
                 <ignoreVersion type="regex">.*-b[0-9]+.*</ignoreVersion>
             </ignoreVersions>
         </rule>
+        <rule groupId="jakarta.annotation">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
         <rule groupId="jakarta.inject" artifactId="jakarta.inject-api">
             <ignoreVersions>
                 <ignoreVersion type="regex">.*\.(MR|RC[0-9]+).*</ignoreVersion>
             </ignoreVersions>
         </rule>
+        <rule groupId="jakarta.servlet">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="jakarta.validation">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="jakarta.ws.rs">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*M[0-9].*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
         <rule groupId="org.glassfish" artifactId="jakarta.el">
             <ignoreVersions>
                 <ignoreVersion type="regex">.*-M[0-9]+.*</ignoreVersion>

diff --git a/nflow-engine/.settings/org.eclipse.jdt.core.prefs b/nflow-engine/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,4 @@
+#Sun Apr 07 10:53:41 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -10,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java b/nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
@@ -52,7 +53,7 @@ protected Properties getClassPathConfigurationProperties() {
   protected void configure() {
     bind(Environment.class).toInstance(new StandardEnvironment() {
       @Override
-      protected void customizePropertySources(MutablePropertySources propertySources) {
+      protected void customizePropertySources(@NonNull MutablePropertySources propertySources) {
         customizeEnvironment(propertySources);
       }
     });

diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java b/nflow-engine/src/main/java/io/nflow/engine/internal/storage/db/SQLVariants.java
@@ -11,6 +11,9 @@
 
 import io.nflow.engine.workflow.instance.WorkflowInstance.WorkflowInstanceStatus;
 
+/**
+ * Abstracts the differences of different SQL backends.
+ */
 public interface SQLVariants {
   String currentTimePlusSeconds(int seconds);
 

diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinition.java
@@ -6,12 +6,13 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.nflow.engine.model.ModelObject;
 
+@SuppressFBWarnings(value = {"URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD","UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"}, justification = "used by rest apis")
 public class StoredWorkflowDefinition extends ModelObject {
 
   public String type;
   public String description;
   public String onError;
-  public List<State> states;
+  public List<State> states = new ArrayList<>();
   public List<Signal> supportedSignals = new ArrayList<>();
 
   @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "serialized to database with object mapper")

diff --git a/...gine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java b/...gine/src/main/java/io/nflow/engine/internal/workflow/StoredWorkflowDefinitionWrapper.java
@@ -13,6 +13,7 @@
 import io.nflow.engine.workflow.definition.WorkflowStateType;
 
 public class StoredWorkflowDefinitionWrapper extends WorkflowDefinition {
+    @SuppressWarnings("this-escape")
     public StoredWorkflowDefinitionWrapper(StoredWorkflowDefinition stored) {
         super(stored.type, getInitialState(stored), getErrorState(stored), new WorkflowSettings.Builder().build(), emptyMap(), allStates(stored), false);
         setDescription(stored.description);

diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/BulkWorkflow.java
@@ -78,6 +78,7 @@ public class BulkWorkflow extends WorkflowDefinition {
    * @param type
    *          The type of the workflow.
    */
+  @SuppressWarnings("this-escape")
   protected BulkWorkflow(String type) {
     super(type, SPLIT_WORK, ERROR, new Builder().setMaxRetries(Integer.MAX_VALUE).build());
     setDescription("Executes child workflows in bulk but gracefully without effecting non-bulk tasks.");

diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java
@@ -63,6 +63,7 @@ public abstract class CronWorkflow extends WorkflowDefinition {
    * @param settings
    *          The workflow settings.
    */
+  @SuppressWarnings("this-escape")
   protected CronWorkflow(String type, WorkflowSettings settings) {
     super(type, SCHEDULE, HANDLE_FAILURE, settings);
     permit(SCHEDULE, DO_WORK);

diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/MaintenanceWorkflow.java
@@ -28,6 +28,7 @@ public class MaintenanceWorkflow extends CronWorkflow {
   /**
    * Create maintenance workflow definition.
    */
+  @SuppressWarnings("this-escape")
   public MaintenanceWorkflow() {
     super(MAINTENANCE_WORKFLOW_TYPE);
     setDescription("Clean up workflow instances periodically.");
@@ -41,6 +42,7 @@ public MaintenanceWorkflow() {
    * @param settings
    *          The workflow settings.
    */
+  @SuppressWarnings("this-escape")
   protected MaintenanceWorkflow(String type, WorkflowSettings settings) {
     super(type, settings);
     setDescription("Clean up workflow instances periodically.");

diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/Mutable.java
@@ -1,5 +1,7 @@
 package io.nflow.engine.workflow.definition;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.util.Objects;
 
 /**
@@ -12,6 +14,7 @@ public class Mutable<T> {
   /**
    * The wrapped value.
    */
+  @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "this is just a wrapper class around the single field")
   public T val;
 
   /**

diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java b/nflow-engine/src/test/java/io/nflow/engine/internal/executor/WorkflowStateProcessorTest.java
@@ -131,6 +131,7 @@
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction;
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
 
+@SuppressWarnings("this-escape")
 public class WorkflowStateProcessorTest extends BaseNflowTest {
 
   @Mock

diff --git a/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/internal/workflow/StaticStateFieldsWorkflow.java
@@ -23,6 +23,7 @@ public class StaticStateFieldsWorkflow extends WorkflowDefinition {
   protected WorkflowState protectedState = new State("protected", WorkflowStateType.manual);
   public WorkflowState publicState = new State("public", WorkflowStateType.manual);
 
+  @SuppressWarnings("this-escape")
   public StaticStateFieldsWorkflow() {
     super("staticStateFields", BEGIN, ERROR);
     permit(new State("origin", WorkflowStateType.manual), new State("target", WorkflowStateType.manual),

diff --git a/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/service/DummyTestWorkflow.java
@@ -12,6 +12,7 @@
 import io.nflow.engine.workflow.definition.WorkflowDefinition;
 import io.nflow.engine.workflow.definition.WorkflowSettings;
 
+@SuppressWarnings("this-escape")
 public class DummyTestWorkflow extends WorkflowDefinition {
 
   public static final String DUMMY_TYPE = "dummy";

diff --git a/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/service/SpringDummyTestWorkflow.java
@@ -15,6 +15,7 @@
 @Profile("nflow-engine-test")
 public class SpringDummyTestWorkflow extends WorkflowDefinition {
 
+  @SuppressWarnings("this-escape")
   protected SpringDummyTestWorkflow() {
     super("springdummy", BEGIN, DONE);
     permit(BEGIN, DONE);

diff --git a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestDefinition.java
@@ -4,6 +4,7 @@
 
 import io.nflow.engine.workflow.curated.State;
 
+@SuppressWarnings("this-escape")
 public class TestDefinition extends WorkflowDefinition {
 
   public static final WorkflowState START_1 = new State("start1", WorkflowStateType.start);

diff --git a/...ngine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java b/...ngine/src/test/java/io/nflow/engine/workflow/definition/TestDefinitionWithStateTypes.java
@@ -11,6 +11,7 @@ public class TestDefinitionWithStateTypes extends WorkflowDefinition {
   static final WorkflowState STATE_1 = new State("state1");
   static final WorkflowState STATE_2 = new State("state2");
 
+  @SuppressWarnings("this-escape")
   public TestDefinitionWithStateTypes(String type, WorkflowState initialState) {
     super(type, initialState, ERROR);
     permit(BEGIN, DONE, ERROR);

diff --git a/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java b/nflow-engine/src/test/java/io/nflow/engine/workflow/definition/TestWorkflow.java
@@ -12,6 +12,7 @@ public class TestWorkflow extends WorkflowDefinition {
   public static final WorkflowState START_WITHOUT_FAILURE = new State("startWithoutFailure", WorkflowStateType.start);
   public static final WorkflowState FAILED = new State("failed", WorkflowStateType.end);
 
+  @SuppressWarnings("this-escape")
   public TestWorkflow() {
     super("test", BEGIN, ERROR);
     permit(BEGIN, DONE, FAILED);

diff --git a/nflow-explorer/package-lock.json b/nflow-explorer/package-lock.json
diff --git a/nflow-jetty/.settings/org.eclipse.jdt.core.prefs b/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:03 EEST 2022
+#Sun Apr 07 10:53:44 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/nflow-metrics/.settings/org.eclipse.jdt.core.prefs b/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:01 EEST 2022
+#Sun Apr 07 10:53:42 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/nflow-netty/.settings/org.eclipse.jdt.core.prefs b/nflow-netty/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Jul 09 00:19:02 EEST 2022
+#Sun Apr 07 10:53:50 EEST 2024
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false