Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Conductor To Spring 3 Framework 6 #1

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
78b46dc
Upgrade to Spring3
LuisLainez Oct 22, 2023
21fa459
Fix Conflicts
LuisLainez Oct 22, 2023
c5faad1
Upgrade Srping 3
LuisLainez Oct 22, 2023
1321711
Update dependencies
LuisLainez Oct 22, 2023
287e644
Delete wrong dependency
LuisLainez Oct 22, 2023
da96dc2
Spotless
LuisLainez Oct 22, 2023
05358bd
Change redis deps
LuisLainez Oct 23, 2023
c05bb2b
Chenge dependencies to 3.30
LuisLainez Oct 23, 2023
7eea16d
Dependency locks
LuisLainez Oct 23, 2023
e0d8c8d
Change dependencies for jedis
LuisLainez Oct 23, 2023
ec0efe5
Restore jedis dependencies
LuisLainez Oct 23, 2023
2934b72
Upgrade Spring 3
LuisLainez Oct 23, 2023
3f8b5a4
Delete test from test
LuisLainez Oct 24, 2023
35bfdb4
Spotless
LuisLainez Oct 24, 2023
d9abb58
Spotless
LuisLainez Oct 24, 2023
ecc6168
Change annotations to jakarta
LuisLainez Oct 25, 2023
a012329
Restore jackson version
LuisLainez Oct 25, 2023
e04057f
Restore jedis version
LuisLainez Oct 25, 2023
4054672
Add workaround ffor javax annotations in generated grpc items
LuisLainez Oct 25, 2023
a5659f8
Change shppe of HTTP Task
LuisLainez Oct 25, 2023
bfd80dc
HIX Fix task tests
LuisLainez Oct 25, 2023
b00fad6
Add stuff
LuisLainez Oct 25, 2023
d1041a1
Stopless
LuisLainez Oct 25, 2023
bdd5be1
Upgrade to Spring
LuisLainez Oct 26, 2023
3409992
Spotless
LuisLainez Oct 26, 2023
22c0b17
Disable test
LuisLainez Oct 26, 2023
5306afb
Disable test
LuisLainez Oct 26, 2023
d89154a
Change protoc dependencies
LuisLainez Oct 26, 2023
a7e332a
Dependencies
LuisLainez Oct 26, 2023
822e731
Fix dependencies pointing to framework 5
LuisLainez Oct 26, 2023
741fc7c
Delete orkes queue dependency
LuisLainez Nov 3, 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
Prev Previous commit
Next Next commit
Add stuff
  • Loading branch information
LuisLainez committed Oct 25, 2023
commit b00fad642307a27e471447ddc0a6190cbbd45cd4
4 changes: 3 additions & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
ext {
revActivation = '3.0.2'
revApacheHttpComponentsClient5 = '5.2.1'
revAwaitility = '3.1.6'
revAwsSdk = '1.11.86'
revBval = '2.0.5'
Expand All @@ -31,7 +32,8 @@ ext {
revGuava = '30.0-jre'
revHamcrestAllMatchers = '1.8'
revHealth = '1.1.+'
revApacheHttpComponentsClient5 = '5.2.1'
revProtoBuf = '3.21.7'
revJakartaAnnotation = '2.1.1'
revJAXB = '4.0.1'
revJAXRS = '2.1.1'
revJedis = '3.3.0'
Expand Down
1 change: 1 addition & 0 deletions grpc-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ dependencies {
implementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
implementation "org.slf4j:slf4j-api"
implementation "org.apache.commons:commons-lang3"
implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}"
implementation "com.google.guava:guava:${revGuava}"
}
6 changes: 0 additions & 6 deletions grpc-client/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@
"locked": "1.59.0"
},
"jakarta.annotation:jakarta.annotation-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "2.1.1"
},
"org.apache.bval:bval-jsr": {
Expand Down Expand Up @@ -285,9 +282,6 @@
"locked": "1.59.0"
},
"jakarta.annotation:jakarta.annotation-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-grpc"
],
"locked": "2.1.1"
},
"junit:junit": {
Expand Down
2 changes: 1 addition & 1 deletion grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
implementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
implementation "io.grpc:grpc-protobuf:${revGrpc}"
implementation "io.grpc:grpc-stub:${revGrpc}"
implementation "jakarta.annotation:jakarta.annotation-api:2.1.1"
implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}"
implementation "javax.annotation:javax.annotation-api:1.3.2" //Needs to be added as a workaround for the generated tags

}
Expand Down
Loading