Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Upgrade Conductor to Spring3 #3855

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Upgrade Conductor to Spring3 #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
753ce5c
Upgrade Conductor to Spring 3
LuisLainez Nov 21, 2023
c96e529
Fix dependency issues
LuisLainez Nov 21, 2023
c4331b4
Upgrade Spring to 3.1.5
LuisLainez Nov 21, 2023
a253dc1
Fix error in lock file
LuisLainez Nov 21, 2023
b007922
Consolidate org.slf4j:slf4j-api versions
LuisLainez Nov 21, 2023
d6167fa
SLf4j version as constant
LuisLainez Nov 21, 2023
18be0d8
Change spring in redis-concurrency limit to a version compatible with…
LuisLainez Nov 21, 2023
e5646ae
Upgrade javax libs to jakarta
LuisLainez Nov 28, 2023
d94052a
Refresh dependecies
LuisLainez Nov 29, 2023
55bdac3
Add dependencies and generate locks
LuisLainez Nov 29, 2023
0e73a2b
Change persistence libs
LuisLainez Nov 29, 2023
354df89
Merge pull request #5 from LuisLainez/issue/UpgradeToSpring3-4
LuisLainez Nov 29, 2023
1795649
Solve conflicts
LuisLainez Nov 29, 2023
a57a539
Solve conflicts
LuisLainez Nov 29, 2023
2504d24
Spotless apply
LuisLainez Nov 29, 2023
48bea9c
Dummy PR
LuisLainez Nov 30, 2023
f95e476
Merge branch 'Netflix:main' into main
LuisLainez Nov 30, 2023
93ee139
Merge branch 'main' of https://github.com/LuisLainez/conductor into i…
LuisLainez Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI

on: [ push, pull_request ]

jobs:
build:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion annotations-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
104 changes: 52 additions & 52 deletions annotations-processor/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.16"
"locked": "3.1.5"
}
},
"compileClasspath": {
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion ...processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 =
Expand Down
Loading
Loading