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

Commit

Permalink
Issue/upgrade to spring (#3828)
Browse files Browse the repository at this point in the history 
SB3 upgrades
  • Loading branch information
@LuisLainez
LuisLainez authored Oct 31, 2023
1 parent d164531 commit 064b0a6
Show file tree
Hide file tree
Showing 100 changed files with 1,448 additions and 1,461 deletions.
4 changes: 2 additions & 2 deletions annotations-processor/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies {
api 'com.google.guava:guava:31.1-jre'
api 'com.squareup:javapoet:1.13.+'
api 'com.github.jknack:handlebars:4.3.+'
api 'com.google.protobuf:protobuf-java:3.21.7'
api 'javax.annotation:javax.annotation-api:1.3.2'
api 'com.google.protobuf:protobuf-java:3.21.12'
api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
api gradleApi()

exampleImplementation sourceSets.main.output
Expand Down
88 changes: 44 additions & 44 deletions annotations-processor/dependencies.lock
View file
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.3"
"locked": "3.1.4"
}
},
"compileClasspath": {
Expand All @@ -12,31 +12,31 @@
"locked": "31.1-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
},
"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"
}
},
"exampleCompileClasspath": {
Expand All @@ -52,31 +52,31 @@
"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"
}
},
"runtimeClasspath": {
Expand All @@ -87,46 +87,46 @@
"locked": "31.1-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
},
"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"
}
},
"testCompileClasspath": {
Expand All @@ -137,43 +137,43 @@
"locked": "31.1-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
},
"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"
},
"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.3"
"locked": "3.1.4"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "3.1.4"
}
},
"testRuntimeClasspath": {
Expand All @@ -184,16 +184,16 @@
"locked": "31.1-jre"
},
"com.google.protobuf:protobuf-java": {
"locked": "3.21.7"
"locked": "3.21.12"
},
"com.netflix.conductor:conductor-annotations": {
"project": true
},
"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 @@ -202,40 +202,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.3"
"locked": "3.1.4"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.3"
"locked": "3.1.4"
}
}
}
2 changes: 1 addition & 1 deletion ...processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java
View file
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

0 comments on commit 064b0a6

Please sign in to comment.