Upgrade Conductor to Spring3

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: CI
 
 on: [ push, pull_request ]
-
+ 
 jobs:
  build:
  runs-on: ubuntu-latest

annotations-processor/build.gradle

@@ -9,7 +9,7 @@ dependencies {
  api 'com.squareup:javapoet:1.13.+'
  api 'com.github.jknack:handlebars:4.3.+'
  api 'com.google.protobuf:protobuf-java:3.21.12'
- api 'javax.annotation:javax.annotation-api:1.3.2'
+ api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
  api gradleApi()
 
  exampleImplementation sourceSets.main.output

annotations-processor/dependencies.lock

@@ -1,7 +1,7 @@
 {
  "annotationProcessor": {
  "org.springframework.boot:spring-boot-configuration-processor": {
- "locked": "2.7.16"
+ "locked": "3.1.5"
  }
  },
  "compileClasspath": {
@@ -53,23 +53,23 @@
  "com.squareup:javapoet": {
  "locked": "1.13.0"
  },
- "javax.annotation:javax.annotation-api": {
- "locked": "1.3.2"
+ "jakarta.annotation:jakarta.annotation-api": {
+ "locked": "2.1.1"
  },
  "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.yaml:snakeyaml": {
  "locked": "2.0"
@@ -85,67 +85,67 @@
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.core:jackson-core": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.core:jackson-databind": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.datatype:jackson-datatype-joda": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.fasterxml.jackson.module:jackson-module-afterburner": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.13.5"
+ "locked": "2.15.3"
  },
  "com.netflix.conductor:conductor-annotations": {
  "project": true
@@ -154,37 +154,37 @@
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-core": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-jul": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-slf4j-impl": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-web": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.yaml:snakeyaml": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "1.30"
+ "locked": "1.33"
  }
  },
  "runtimeClasspath": {
@@ -269,38 +269,38 @@
  "com.squareup:javapoet": {
  "locked": "1.13.0"
  },
- "javax.annotation:javax.annotation-api": {
- "locked": "1.3.2"
+ "jakarta.annotation:jakarta.annotation-api": {
+ "locked": "2.1.1"
  },
  "org.apache.logging.log4j:log4j-api": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-core": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-jul": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-slf4j-impl": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-web": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.yaml:snakeyaml": {
  "firstLevelTransitive": [
@@ -358,8 +358,8 @@
  "com.squareup:javapoet": {
  "locked": "1.13.0"
  },
- "javax.annotation:javax.annotation-api": {
- "locked": "1.3.2"
+ "jakarta.annotation:jakarta.annotation-api": {
+ "locked": "2.1.1"
  },
  "junit:junit": {
  "locked": "4.13.2"
@@ -368,28 +368,28 @@
  "locked": "5.13.0"
  },
  "org.apache.logging.log4j:log4j-api": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-core": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-jul": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-slf4j-impl": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-web": {
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.junit.vintage:junit-vintage-engine": {
- "locked": "5.8.2"
+ "locked": "5.9.3"
  },
  "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.7.16"
+ "locked": "3.1.5"
  },
  "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.7.16"
+ "locked": "3.1.5"
  },
  "org.yaml:snakeyaml": {
  "locked": "2.0"
@@ -477,8 +477,8 @@
  "com.squareup:javapoet": {
  "locked": "1.13.0"
  },
- "javax.annotation:javax.annotation-api": {
- "locked": "1.3.2"
+ "jakarta.annotation:jakarta.annotation-api": {
+ "locked": "2.1.1"
  },
  "junit:junit": {
  "locked": "4.13.2"
@@ -490,40 +490,40 @@
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-core": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-jul": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-slf4j-impl": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.apache.logging.log4j:log4j-web": {
  "firstLevelTransitive": [
  "com.netflix.conductor:conductor-annotations"
  ],
- "locked": "2.17.2"
+ "locked": "2.20.0"
  },
  "org.junit.vintage:junit-vintage-engine": {
- "locked": "5.8.2"
+ "locked": "5.9.3"
  },
  "org.springframework.boot:spring-boot-starter-log4j2": {
- "locked": "2.7.16"
+ "locked": "3.1.5"
  },
  "org.springframework.boot:spring-boot-starter-test": {
- "locked": "2.7.16"
+ "locked": "3.1.5"
  },
  "org.yaml:snakeyaml": {
  "firstLevelTransitive": [

annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java

@@ -20,7 +20,6 @@
 import java.net.URLClassLoader;
 import java.util.*;
 
-import javax.annotation.Generated;
 import javax.lang.model.element.Modifier;
 
 import com.netflix.conductor.annotations.protogen.ProtoMessage;
@@ -35,6 +34,7 @@
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.TypeSpec;
+import jakarta.annotation.Generated;
 
 public class ProtoGen {
  private static final String GENERATOR_NAME =