[WIP] Upgrade spring-boot-starter from version 2.7.x to 3.3.x

dependencies.gradle

@@ -8,8 +8,10 @@ ext {
     flywayDep = 'org.flywaydb:flyway-core:7.6.+'
     jacksonDatabindDep = 'com.fasterxml.jackson.core:jackson-databind:2.+'
     jacksonYamlDep = 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.+'
-    javaxInjectDep = 'javax.inject:javax.inject:1'
-    javaxValidationDep = 'javax.validation:validation-api:2.0.+'
+    jakartaInjectDep = 'jakarta.inject:jakarta.inject-api:2.0.+'
+    jakartaServletDep = 'jakarta.servlet:jakarta.servlet-api:6.1.+'
+    jakartaValidationDep = 'jakarta.validation:jakarta.validation-api:3.1.+'
+
     quartzDep = 'org.quartz-scheduler:quartz:2.3.+'
     jodaTimeDep = 'joda-time:joda-time:2.10.+'
     cronutilsDep = 'com.cronutils:cron-utils:9.1.+'
@@ -21,7 +23,7 @@ ext {
     postgresqlDep = 'org.postgresql:postgresql:42.+'
     slf4jLog4jDep = 'org.slf4j:slf4j-log4j12:2.+'
     junitDep = 'junit:junit:4.13.2'
-    bvalJsrDep= 'org.apache.bval:bval-jsr:2.0.+'
+    bvalJsrDep= 'org.apache.bval:bval-jsr:3.0.+'
     assertJCoreDep = 'org.assertj:assertj-core:3.+'
     mockitoCoreDep = 'org.mockito:mockito-core:4.+'
     junitEngineDep = 'org.junit.vintage:junit-vintage-engine:5.+'

gradle.lockfile

@@ -0,0 +1,5 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath
+empty=runtimeClasspath

maestro-common/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     implementation jacksonDatabindDep
-    implementation javaxInjectDep
-    implementation javaxValidationDep
+    implementation jakartaInjectDep
+    implementation jakartaValidationDep
     implementation jacksonYamlDep
     implementation quartzDep
     implementation jodaTimeDep

maestro-common/gradle.lockfile

@@ -1,19 +1,19 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.cronutils:cron-utils:9.1.8=compileClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.11.4=compileClasspath
-com.fasterxml.jackson.core:jackson-core:2.11.4=compileClasspath
-com.fasterxml.jackson.core:jackson-databind:2.11.4=compileClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4=compileClasspath
-com.mchange:c3p0:0.9.5.4=compileClasspath
-com.mchange:mchange-commons-java:0.2.15=compileClasspath
-com.zaxxer:HikariCP-java7:2.4.13=compileClasspath
-javax.inject:javax.inject:1=compileClasspath
-javax.validation:validation-api:2.0.1.Final=compileClasspath
-joda-time:joda-time:2.10.14=compileClasspath
+com.cronutils:cron-utils:9.1.8=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.11.4=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.11.4=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.11.4=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4=compileClasspath,runtimeClasspath
+com.mchange:c3p0:0.9.5.4=compileClasspath,runtimeClasspath
+com.mchange:mchange-commons-java:0.2.15=compileClasspath,runtimeClasspath
+com.zaxxer:HikariCP-java7:2.4.13=compileClasspath,runtimeClasspath
+jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath
+jakarta.validation:jakarta.validation-api:3.1.0=compileClasspath,runtimeClasspath
+joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath
 org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath
-org.quartz-scheduler:quartz:2.3.2=compileClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath
-org.yaml:snakeyaml:1.26=compileClasspath
+org.quartz-scheduler:quartz:2.3.2=compileClasspath,runtimeClasspath
+org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath
+org.yaml:snakeyaml:1.26=compileClasspath,runtimeClasspath
 empty=

maestro-common/src/main/java/com/netflix/maestro/models/api/PaginationResult.java

@@ -17,8 +17,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/api/StepBreakpointCreateRequest.java

@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/api/StepInstanceRestartRequest.java

@@ -21,10 +21,10 @@
 import com.netflix.maestro.models.instance.RunPolicy;
 import com.netflix.maestro.models.parameter.ParamDefinition;
 import com.netflix.maestro.validations.RunParamsConstraint;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;
 import java.util.UUID;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

maestro-common/src/main/java/com/netflix/maestro/models/api/TagPermitRequest.java

@@ -15,8 +15,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,5 +33,5 @@ public class TagPermitRequest {
   @NotNull private String tag;
 
   @Min(value = 0, message = "maxAllowed value must be greater or equals thant zero.")
-  private int maxAllowed;
+  private Integer maxAllowed;
 }

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowCreateRequest.java

@@ -24,9 +24,9 @@
 import com.netflix.maestro.models.definition.Workflow;
 import com.netflix.maestro.validations.PropertiesConstraint;
 import com.netflix.maestro.validations.WorkflowConstraint;
+import jakarta.validation.Valid;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import javax.validation.Valid;
 import lombok.Data;
 
 /** Request to create a workflow definition. */

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowCreateResponse.java

@@ -19,8 +19,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.netflix.maestro.models.definition.WorkflowDefinition;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowInstanceRestartRequest.java

@@ -18,10 +18,10 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.models.parameter.ParamDefinition;
 import com.netflix.maestro.validations.RunParamsConstraint;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;
 import java.util.UUID;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowOverviewResponse.java

@@ -20,9 +20,9 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.netflix.maestro.models.definition.PropertiesSnapshot;
 import com.netflix.maestro.models.instance.WorkflowInstance;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.EnumMap;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowPropertiesUpdateRequest.java

@@ -25,7 +25,7 @@
 import com.netflix.maestro.models.definition.RunStrategy;
 import com.netflix.maestro.models.definition.User;
 import com.netflix.maestro.validations.PropertiesConstraint;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.Data;
 
 /** Request to update workflow properties. */

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowPropertiesUpdateResponse.java

@@ -19,8 +19,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.netflix.maestro.models.definition.PropertiesSnapshot;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/api/WorkflowStartRequest.java

@@ -21,11 +21,11 @@
 import com.netflix.maestro.models.initiator.Initiator;
 import com.netflix.maestro.models.parameter.ParamDefinition;
 import com.netflix.maestro.validations.RunParamsConstraint;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

maestro-common/src/main/java/com/netflix/maestro/models/definition/AbstractStep.java

@@ -24,9 +24,9 @@
 import com.netflix.maestro.validations.StepDependenciesDefinitionConstraint;
 import com.netflix.maestro.validations.TagListConstraint;
 import com.netflix.maestro.validations.TimeoutConstraint;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
 import java.util.Map;
-import javax.validation.Valid;
-import javax.validation.constraints.Size;
 import lombok.Data;
 import lombok.Getter;
 

maestro-common/src/main/java/com/netflix/maestro/models/definition/Alerting.java

@@ -25,13 +25,13 @@
 import com.netflix.maestro.models.parameter.ParamDefinition;
 import com.netflix.maestro.models.parameter.Parameter;
 import com.netflix.maestro.validations.TctConstraint;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.Getter;
 

maestro-common/src/main/java/com/netflix/maestro/models/definition/Duration.java

@@ -21,8 +21,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.utils.Checks;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /** Duration data model for workflow and step timeout configurations. */

maestro-common/src/main/java/com/netflix/maestro/models/definition/ForeachStep.java

@@ -18,9 +18,9 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.models.Constants;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

maestro-common/src/main/java/com/netflix/maestro/models/definition/Properties.java

@@ -20,9 +20,9 @@
 import com.netflix.maestro.models.Constants;
 import com.netflix.maestro.utils.Checks;
 import com.netflix.maestro.validations.TagListConstraint;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 /**

maestro-common/src/main/java/com/netflix/maestro/models/definition/PropertiesSnapshot.java

@@ -22,9 +22,9 @@
 import com.netflix.maestro.models.Constants;
 import com.netflix.maestro.validations.MaestroIdConstraint;
 import com.netflix.maestro.validations.TagListConstraint;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/definition/RetryPolicy.java

@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.netflix.maestro.models.Constants;
 import com.netflix.maestro.models.Defaults;
+import jakarta.validation.constraints.Max;
 import java.util.Locale;
-import javax.validation.constraints.Max;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/definition/RunStrategy.java

@@ -20,8 +20,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.models.Defaults;
 import com.netflix.maestro.utils.Checks;
+import jakarta.validation.constraints.NotNull;
 import java.util.Locale;
-import javax.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;

maestro-common/src/main/java/com/netflix/maestro/models/definition/SignalOutputsDefinition.java

@@ -19,8 +19,8 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.models.parameter.MapParamDefinition;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.ToString;
 

maestro-common/src/main/java/com/netflix/maestro/models/definition/TagList.java

@@ -21,12 +21,12 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.annotations.Nullable;
 import com.netflix.maestro.utils.Checks;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.validation.Valid;
 import lombok.Data;
 
 /** wrapper class for a list of tag. */

maestro-common/src/main/java/com/netflix/maestro/models/definition/TypedStep.java

@@ -17,8 +17,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/definition/Workflow.java

@@ -28,11 +28,11 @@
 import com.netflix.maestro.validations.TagListConstraint;
 import com.netflix.maestro.validations.TimeTriggerConstraint;
 import com.netflix.maestro.validations.TimeoutConstraint;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.validation.Valid;
-import javax.validation.constraints.Size;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

maestro-common/src/main/java/com/netflix/maestro/models/definition/WorkflowDefinition.java

@@ -21,8 +21,8 @@
 import com.netflix.maestro.models.Defaults;
 import com.netflix.maestro.models.trigger.TriggerUuids;
 import com.netflix.maestro.validations.WorkflowConstraint;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

maestro-common/src/main/java/com/netflix/maestro/models/definition/WorkflowDefinitionExtras.java

@@ -18,9 +18,9 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.netflix.maestro.annotations.Nullable;
 import com.netflix.maestro.models.parameter.ParamDefinition;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /** * Extra information for enriched workflow definition. */