From b14556f14feb23222e92efab94c305ad3fde73e0 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 27 Aug 2024 21:21:05 -0400 Subject: [PATCH 01/81] upgrade to version 2.1.37-SNAPSHOT after release --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 8a91657b..3ff8a8c5 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 2a2d146a..c759f9b9 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 5f951982..65ed1f4b 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 22d278cd..f8949e79 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index a068de9b..8b97b813 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 6d86b7b7..14bf53b4 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 06ceee2a..f6ac95c6 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index c6fa050f..aa002a52 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 01f16719..20b7b8c8 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 4eb99028..08043202 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index e09d4802..31cdde77 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.1.36 +light4jVersion=2.1.37-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.17.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 737298c2..5f0046f2 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 0c4150c5..25e846bc 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.36 +light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 undertowVersion=2.3.15.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index c59a18fd..9f7f45e5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 0c4150c5..25e846bc 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.36 +light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 undertowVersion=2.3.15.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 7652d578..5d56baef 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index f239d24b..bcbc3963 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.36 +light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 undertowVersion=2.3.15.Final logbackVersion=1.5.6 diff --git a/pom.xml b/pom.xml index 6952e069..5ad528a5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.1.36 + 2.1.37-SNAPSHOT pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.1.36 + 2.1.37-SNAPSHOT 2.17.1 2.0.13 0.9.6 From b8faec72747687c961010a7ce98221379a76906c Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 27 Aug 2024 21:28:16 -0400 Subject: [PATCH 02/81] upgrade undertow to 2.3.16.Final --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 14bf53b4..453ad0e7 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.15.Final + 2.3.16.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index aa002a52..d83677ce 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.15.Final + 2.3.16.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 20b7b8c8..08094124 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.15.Final + 2.3.16.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 25e846bc..1df59905 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 -undertowVersion=2.3.15.Final +undertowVersion=2.3.16.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 9f7f45e5..5e0537f3 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.6 7.0.1 5.8.1 - 2.3.15.Final + 2.3.16.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 25e846bc..1df59905 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 -undertowVersion=2.3.15.Final +undertowVersion=2.3.16.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 5d56baef..a58c559e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.6 7.0.1 5.8.1 - 2.3.15.Final + 2.3.16.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index bcbc3963..c17bbbc9 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 -undertowVersion=2.3.15.Final +undertowVersion=2.3.16.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 diff --git a/pom.xml b/pom.xml index 5ad528a5..ae13677d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.5.6 4.13.2 5.8.1 - 2.3.15.Final + 2.3.16.Final 1.3 3.8.0 2.1.10 From 3c622c178962d5079bcc9dff79a77dc88ef43f26 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Sep 2024 14:22:31 -0400 Subject: [PATCH 03/81] upgrade undertow to 2.3.17.Final --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 453ad0e7..116e7655 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.16.Final + 2.3.17.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index d83677ce..f4cd966e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.16.Final + 2.3.17.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 08094124..6fae2bad 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.6 5.8.1 - 2.3.16.Final + 2.3.17.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 1df59905..124877da 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 -undertowVersion=2.3.16.Final +undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 5e0537f3..c5432036 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.6 7.0.1 5.8.1 - 2.3.16.Final + 2.3.17.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 1df59905..124877da 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 slf4jVersion=2.0.13 -undertowVersion=2.3.16.Final +undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index a58c559e..d55792bd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.6 7.0.1 5.8.1 - 2.3.16.Final + 2.3.17.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index c17bbbc9..e6a081f3 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT jacksonVersion=2.17.1 -undertowVersion=2.3.16.Final +undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 diff --git a/pom.xml b/pom.xml index ae13677d..b4db64fd 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.5.6 4.13.2 5.8.1 - 2.3.16.Final + 2.3.17.Final 1.3 3.8.0 2.1.10 From c2301af870fa207939bd2f0eb4528ac7dee247bc Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Sep 2024 14:30:59 -0400 Subject: [PATCH 04/81] upgrade jackson to 2.17.2 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 116e7655..ff2f83fa 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index f4cd966e..763c05b4 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 6fae2bad..0e490e9f 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 31cdde77..254ee269 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -2,6 +2,6 @@ light4jVersion=2.1.37-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.17.1 +jacksonVersion=2.17.2 logbackVersion=1.5.6 junitVersion=5.7.0 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 5f0046f2..64c02404 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 2fd52eaf..40ce5a98 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.17.1 +jacksonVersion=2.17.2 slf4jVersion=2.0.13 logbackVersion=1.5.6 junitVersion=5.10.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index aaeea058..c5813381 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.34-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 124877da..1af38e5d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT -jacksonVersion=2.17.1 +jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index c5432036..72e8c24e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 124877da..1af38e5d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT -jacksonVersion=2.17.1 +jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index d55792bd..5e9fcdcd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index e6a081f3..abb375f2 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.37-SNAPSHOT -jacksonVersion=2.17.1 +jacksonVersion=2.17.2 undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 diff --git a/pom.xml b/pom.xml index b4db64fd..9b3da061 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 11 UTF-8 2.1.37-SNAPSHOT - 2.17.1 + 2.17.2 2.0.13 0.9.6 4.7 From e03c7307cdbb9cd33d91de36e2440b0df01b7853 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 20 Sep 2024 14:14:58 -0400 Subject: [PATCH 05/81] upgrade to version 2.1.37 before release --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 3ff8a8c5..8e9130da 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index c759f9b9..1484e0a2 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 65ed1f4b..a81ac5e8 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index f8949e79..9f82be39 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 8b97b813..d124a60d 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index ff2f83fa..504a588a 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index f6ac95c6..6f45f1e7 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 763c05b4..aae85561 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 0e490e9f..d3c30483 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 08043202..de9b20cc 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 254ee269..df574011 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.1.37-SNAPSHOT +light4jVersion=2.1.37 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.17.2 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 64c02404..14df4216 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 1af38e5d..7d8ba057 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37-SNAPSHOT +light4jVersion=2.1.37 jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 72e8c24e..3a55d1b2 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 1af38e5d..7d8ba057 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37-SNAPSHOT +light4jVersion=2.1.37 jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 5e9fcdcd..558b513c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index abb375f2..218e0435 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37-SNAPSHOT +light4jVersion=2.1.37 jacksonVersion=2.17.2 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/pom.xml b/pom.xml index 9b3da061..d86bade2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.1.37-SNAPSHOT + 2.1.37 pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.1.37-SNAPSHOT + 2.1.37 2.17.2 2.0.13 0.9.6 From ec5588f72e883da71b892aa94c9651cf7e159bbd Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 20 Sep 2024 16:04:15 -0400 Subject: [PATCH 06/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62745152..9985f2bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [2.1.37](https://github.com/networknt/light-codegen/tree/2.1.37) (2024-09-20) + + +**Merged pull requests:** + + ## [2.1.36](https://github.com/networknt/light-codegen/tree/2.1.36) (2024-08-27) From c894483f93300b6656fd7142bae4735d3996a954 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 20 Sep 2024 17:43:52 -0400 Subject: [PATCH 07/81] upgrade to version 2.1.38-SNAPSHOT after release --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 8e9130da..3deaef38 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 1484e0a2..c189133f 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index a81ac5e8..b03b2527 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 9f82be39..2bb762bc 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index d124a60d..1905d43b 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 504a588a..66dc126b 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 6f45f1e7..fdd68b70 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index aae85561..a69b8dc9 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index d3c30483..ad83dcea 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index de9b20cc..2ca4c5bd 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index df574011..64fea745 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.1.37 +light4jVersion=2.1.38-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.17.2 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 14df4216..9f57fb7e 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 7d8ba057..4a65cc03 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37 +light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 3a55d1b2..e0234241 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 7d8ba057..4a65cc03 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37 +light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.17.2 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 558b513c..5d216700 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 218e0435..a1368198 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.37 +light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.17.2 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/pom.xml b/pom.xml index d86bade2..8e4a4577 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.1.37 + 2.1.38-SNAPSHOT pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.1.37 + 2.1.38-SNAPSHOT 2.17.2 2.0.13 0.9.6 From 219125af022c3764b7803ca5080c5cbae7288e6f Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 10:47:09 -0400 Subject: [PATCH 08/81] upgrade jackson to 2.18.0 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 66dc126b..a3bf932b 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index a69b8dc9..517f49d2 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index ad83dcea..8c835ed2 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 64fea745..65a92695 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -2,6 +2,6 @@ light4jVersion=2.1.38-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.17.2 +jacksonVersion=2.18.0 logbackVersion=1.5.6 junitVersion=5.7.0 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 9f57fb7e..5d6a8fc1 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 40ce5a98..2f8f487a 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.17.2 +jacksonVersion=2.18.0 slf4jVersion=2.0.13 logbackVersion=1.5.6 junitVersion=5.10.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index c5813381..e212b822 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.34-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 4a65cc03..22a10eda 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.17.2 +jacksonVersion=2.18.0 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index e0234241..6a2e5503 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 4a65cc03..22a10eda 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.17.2 +jacksonVersion=2.18.0 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 5d216700..42556557 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index a1368198..678911d5 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.17.2 +jacksonVersion=2.18.0 undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 diff --git a/pom.xml b/pom.xml index 8e4a4577..57bb562a 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 11 UTF-8 2.1.38-SNAPSHOT - 2.17.2 + 2.18.0 2.0.13 0.9.6 4.7 From 2914d579bcee153737f3695728020bb05a2dd235 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 10:51:44 -0400 Subject: [PATCH 09/81] upgrade jackson to 2.18.0 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index a3bf932b..61acfad8 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 517f49d2..57035ea3 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 1.5.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 8c835ed2..8e4dc00c 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 65a92695..f59468e5 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -2,6 +2,6 @@ light4jVersion=2.1.38-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.18.0 +jacksonVersion=2.18.1 logbackVersion=1.5.6 junitVersion=5.7.0 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 5d6a8fc1..65812bf0 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 2f8f487a..b7ddfb6a 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 -jacksonVersion=2.18.0 +jacksonVersion=2.18.1 slf4jVersion=2.0.13 logbackVersion=1.5.6 junitVersion=5.10.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index e212b822..59ffa3de 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.34-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 1.5.6 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 22a10eda..7eac01d5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.18.0 +jacksonVersion=2.18.1 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 6a2e5503..9962239f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 22a10eda..7eac01d5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.18.0 +jacksonVersion=2.18.1 slf4jVersion=2.0.13 undertowVersion=2.3.17.Final logbackVersion=1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 42556557..b948c4c5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 1.5.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 678911d5..18c72c8f 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT -jacksonVersion=2.18.0 +jacksonVersion=2.18.1 undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 diff --git a/pom.xml b/pom.xml index 57bb562a..0ebb2b34 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 11 UTF-8 2.1.38-SNAPSHOT - 2.18.0 + 2.18.1 2.0.13 0.9.6 4.7 From 6dc36acd8ee19c03ce034336293d89245dd0813a Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 10:55:07 -0400 Subject: [PATCH 10/81] upgrade slf4j to 2.0.16 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 61acfad8..1f4acb7d 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 1.5.6 5.8.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 57035ea3..f4c34bbf 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 1.5.6 5.8.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 8e4dc00c..8a1e001a 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 1.5.6 5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 65812bf0..d85d0560 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -14,7 +14,7 @@ UTF-8 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 1.5.6 1.5.1 2.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index b7ddfb6a..d273843d 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -3,6 +3,6 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 -slf4jVersion=2.0.13 +slf4jVersion=2.0.16 logbackVersion=1.5.6 junitVersion=5.10.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 59ffa3de..fdfe4f0f 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -14,7 +14,7 @@ UTF-8 2.1.34-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 1.5.6 1.5.1 2.2 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 7eac01d5..d6432525 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 -slf4jVersion=2.0.13 +slf4jVersion=2.0.16 undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 9962239f..fca0d662 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -13,7 +13,7 @@ com.networknt.server.Server 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 1.5.6 7.0.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 7eac01d5..d6432525 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 -slf4jVersion=2.0.13 +slf4jVersion=2.0.16 undertowVersion=2.3.17.Final logbackVersion=1.5.6 jsonSchemaValidatorVersion=1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index b948c4c5..d334ffd2 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -13,7 +13,7 @@ com.networknt.server.Server 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 1.5.6 7.0.1 diff --git a/pom.xml b/pom.xml index 0ebb2b34..995c5f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ UTF-8 2.1.38-SNAPSHOT 2.18.1 - 2.0.13 + 2.0.16 0.9.6 4.7 1.3 From 37d50df94d94b140e6293e99d1c8fff4aa62a893 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 11:11:38 -0400 Subject: [PATCH 11/81] upgrade loback to 1.5.12 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 1f4acb7d..f2295a2a 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.6 + 1.5.12 5.8.1 2.3.17.Final 22.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index f4c34bbf..d7c5989b 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.6 + 1.5.12 5.8.1 2.3.17.Final 1.5.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 8a1e001a..0c23fa9e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.6 + 1.5.12 5.8.1 2.3.17.Final 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index f59468e5..ed42dcaa 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -3,5 +3,5 @@ light4jVersion=2.1.38-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 -logbackVersion=1.5.6 +logbackVersion=1.5.12 junitVersion=5.7.0 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index d85d0560..52b74f48 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.38-SNAPSHOT 2.18.1 2.0.16 - 1.5.6 + 1.5.12 1.5.1 2.2 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index d273843d..20a3ca8a 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -4,5 +4,5 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 slf4jVersion=2.0.16 -logbackVersion=1.5.6 +logbackVersion=1.5.12 junitVersion=5.10.2 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index fdfe4f0f..10e8be18 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.34-SNAPSHOT 2.18.1 2.0.16 - 1.5.6 + 1.5.12 1.5.1 2.2 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index d6432525..e7ac3f40 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.17.Final -logbackVersion=1.5.6 +logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index fca0d662..e22d1d6a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.6 + 1.5.12 7.0.1 5.8.1 2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index d6432525..e7ac3f40 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.17.Final -logbackVersion=1.5.6 +logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index d334ffd2..78e5ee03 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.6 + 1.5.12 7.0.1 5.8.1 2.3.17.Final diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 18c72c8f..92e02a97 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.17.Final -logbackVersion=1.5.6 +logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 kotlinLoggingVersion=1.6.22 diff --git a/pom.xml b/pom.xml index 995c5f2c..de342954 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.11.0 1.15 1.2.3 - 1.5.6 + 1.5.12 4.13.2 5.8.1 2.3.17.Final From 8cb5cdf373ad470c5a702e07b638f9fcf6da3178 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 11:15:05 -0400 Subject: [PATCH 12/81] upgrade undertow to 2.3.18 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index f2295a2a..48a782b9 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.12 5.8.1 - 2.3.17.Final + 2.3.18.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index d7c5989b..38884290 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.12 5.8.1 - 2.3.17.Final + 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 0c23fa9e..143f01fc 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.12 5.8.1 - 2.3.17.Final + 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index e7ac3f40..4c0ae1b0 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 -undertowVersion=2.3.17.Final +undertowVersion=2.3.18.Final logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index e22d1d6a..8346359a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.12 7.0.1 5.8.1 - 2.3.17.Final + 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index e7ac3f40..4c0ae1b0 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 -undertowVersion=2.3.17.Final +undertowVersion=2.3.18.Final logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.8.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 78e5ee03..12685446 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.12 7.0.1 5.8.1 - 2.3.17.Final + 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 3.1.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 92e02a97..a9f13c92 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.6.0 light4jVersion=2.1.38-SNAPSHOT jacksonVersion=2.18.1 -undertowVersion=2.3.17.Final +undertowVersion=2.3.18.Final logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 diff --git a/pom.xml b/pom.xml index de342954..b9f2de46 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.5.12 4.13.2 5.8.1 - 2.3.17.Final + 2.3.18.Final 1.3 3.8.0 2.1.10 From f847c2432d4330a53fa97045a97102c3fb0075c8 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 11:24:58 -0400 Subject: [PATCH 13/81] upgrade junit to 5.11.3 --- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 4c0ae1b0..da647b62 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -8,7 +8,7 @@ slf4jVersion=2.0.16 undertowVersion=2.3.18.Final logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 -junitVersion=5.8.1 +junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ hikaricpVersion=3.1.0 } diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 4c0ae1b0..da647b62 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -8,7 +8,7 @@ slf4jVersion=2.0.16 undertowVersion=2.3.18.Final logbackVersion=1.5.12 jsonSchemaValidatorVersion=1.5.1 -junitVersion=5.8.1 +junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ hikaricpVersion=3.1.0 } From bbd94def51c4e638126e74bdbf6891dc34b4879f Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 11:31:25 -0400 Subject: [PATCH 14/81] upgrade junit to 5.11.3 --- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 20a3ca8a..3e2bf480 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -5,4 +5,4 @@ lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 slf4jVersion=2.0.16 logbackVersion=1.5.12 -junitVersion=5.10.2 +junitVersion=5.11.3 From 4dd98323c12f99fd730da5ca2fd45749dda8e6df Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 12:12:38 -0400 Subject: [PATCH 15/81] upgrade junit to 5.11.3 --- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index ed42dcaa..538f9059 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -4,4 +4,4 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 logbackVersion=1.5.12 -junitVersion=5.7.0 +junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 52b74f48..1896d03a 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -20,7 +20,7 @@ 2.2 1.2.3 3.11.6 - 5.7.0 + 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 10e8be18..663c4ea7 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -20,7 +20,7 @@ 2.2 1.2.3 3.6.0 - 5.7.0 + 5.11.3 From 0deb4614d5aef5a9812dda7515e5aa4217ba6360 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 30 Oct 2024 12:19:14 -0400 Subject: [PATCH 16/81] upgrade junit to 5.11.3 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 48a782b9..4f201ed8 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.16 0.9.6 1.5.12 - 5.8.1 + 5.11.3 2.3.18.Final 22.2 2.1.5 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 38884290..9d2a0554 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.16 0.9.6 1.5.12 - 5.8.1 + 5.11.3 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 143f01fc..e6e0908b 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.16 0.9.6 1.5.12 - 5.8.1 + 5.11.3 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 8346359a..f250d453 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 0.9.6 1.5.12 7.0.1 - 5.8.1 + 5.11.3 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 12685446..133a1481 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 0.9.6 1.5.12 7.0.1 - 5.8.1 + 5.11.3 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ From 41093793e1a17e05f77b8256e2904d4ff6ac4678 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Mon, 18 Nov 2024 21:16:51 -0500 Subject: [PATCH 17/81] fixes #708 update keystores, license and pom.xml (#709) --- LICENSE | 4 ++-- .../main/resources/binaries/client.keystore | Bin 2179 -> 2888 bytes .../main/resources/binaries/client.truststore | Bin 885 -> 2566 bytes .../main/resources/binaries/server.keystore | Bin 2176 -> 2888 bytes .../main/resources/binaries/server.truststore | Bin 935 -> 2566 bytes .../templates/graphql/LICENSE.rocker.raw | 4 ++-- .../main/resources/binaries/client.keystore | Bin 2179 -> 2888 bytes .../main/resources/binaries/client.truststore | Bin 885 -> 2566 bytes .../main/resources/binaries/server.keystore | Bin 2176 -> 2888 bytes .../main/resources/binaries/server.truststore | Bin 935 -> 2566 bytes .../templates/hybrid/LICENSE.rocker.raw | 4 ++-- .../main/resources/binaries/client.keystore | Bin 2179 -> 2888 bytes .../main/resources/binaries/client.truststore | Bin 885 -> 2566 bytes .../main/resources/binaries/server.keystore | Bin 2176 -> 2888 bytes .../main/resources/binaries/server.truststore | Bin 935 -> 2566 bytes .../templates/lambdanative/values.rocker.raw | 3 +++ .../templates/rest/LICENSE.rocker.raw | 4 ++-- .../templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/server/pom.xml.rocker.raw | 10 ++++++++++ .../templates/rest/single/pom.xml.rocker.raw | 10 ++++++++++ .../templates/rest/values.rocker.raw | 3 +++ .../templates/restkotlin/LICENSE.rocker.raw | 4 ++-- 22 files changed, 37 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index 8dada3ed..d26ed5e2 100644 --- a/LICENSE +++ b/LICENSE @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright {yyyy} [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/light-graphql-4j/src/main/resources/binaries/client.keystore b/light-graphql-4j/src/main/resources/binaries/client.keystore index c593b3758ec0283a53004a213f61a237155871e3..7e8c001d4af3a5cd323c9d5e6ea6cf0914846e3b 100644 GIT binary patch literal 2888 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 literal 885 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 MkcJnJ|AWMT0e!wR2LJ#7 literal 2176 zcmcJQ`8U*y8^`A}D>GvqOqPo*S?$@X|h)u+m{K0Q3>f=_k6$S+<)Nv!~2KVdCqg5^SsadJkS2>{wfFr0{;~7x8O7{ zYN!|WCmK?S9u^=F41$k?{=f^uk-x(MD4-4&0RR{X8VCK9z#|ovEiPw-FRBbz`aLWT zUl|mhVt$pPs-CVJ4a)Cs^xHRzKx&1$iFLqh#!p*gZogOTQJsJ+FT8ao<-W}D7T3A1 z+`8B%FD{!Et^Y$8fui)6e`a3>6=!&0jSAa22`*Wui&{lpZ55wY(F@1noEByNA?>IXcR%or zXYp0q`$ZK|8mZ|yw3oo_5$9bw{%_Yz1Y**McRgkL)KFP%wP9(lf^+0zhV}8_jb_w% zqxopkJuoZTSFl#*t({{WJ9!iqO?OR>A!oKwr4zUthiaFj<9+_f+jM56YpHxUTgOuT zy;{aaj<4F^B7Mkv(7LkL{6^_*iPJ)+hUwJIvG=?!KRdMuKb&M>nk5hgnbZj{r?r<{ zWl;O>Es=Vi`LwSoD~XyK)N1!L&sZ~YH1gAbaeH16R%+PHGIuL9a%23s(=-y!*`W(aJ zNxWo#eMHVY+W3}AlMvpFVeU6-js5)UM<4ZbWa?A{a)clC$0pjxR?l-R8{cbjRT2jMWRV{;S;aOK7Dp99?VD zZt8xV!OkLmfYTze@JQ;Ya5i&>17I8?9mz57n^y|4iTUmkT^~cgAT5aWmm&@F?>?+pnofT6j2%_?#>mc_TQ9YF} z>>k#^#ZGbVd1$e1zhJ%!_hRYev?YZCwch*c#^{VwdUKF3>@jVw~p6o;PmmCmW!HPqddoC!)$BEe?K&$(4V zgf>qiMy_`}%`CA@WDU%}>YR{cc8}803gnlP5&t1>N=308PJO(p*F|HKC1T2-4z$XiY-^0M+qs(Vku8l~HFUjRdqZQR0o$gx zItAb;fwF66AGYczAzA1x`kLgs+`N%s@}YV|l#LLPB=05AB%+oE zIp9l0yxg*B&d33|oC}6+i67s*w(1=*>9MB-eA3T(46bSzJK|n27lJ7F+EKoJN{D~Z zlA*D4^I8HhsSaYe`ntstWtt0vn9<+U*_|^7ow6?KNw;&v;$70W?<2{q66gioYV+JJ zhm-};V@Fb}AKfV3%z;N%AQF(h^$O&Hs000F8;hhO6JU<-b0EJ_~q~ioZJo*># zVPKRHw-7Ia03P*=5g6!+%OPO|G#>d2kr;>#)%$;)C=A%ffgp+({#Alt`2B-C-28ol zXd!r6tN=k9PaxtCy-SZ z!EN?3?Wm9F2BSCktXa|g2H&w+QAgRdvx>o_ZL(t=aI%WWee@r99=A#W diff --git a/light-graphql-4j/src/main/resources/binaries/server.truststore b/light-graphql-4j/src/main/resources/binaries/server.truststore index fb0c19ccb2e390365688d071d5326480ce81a73d..f30e2d7fbfeee89138c08d878a5e8f23c5f286c2 100644 GIT binary patch literal 2566 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 literal 935 zcmezO_TO6u1_mY|W(3nF$$7RVsl_D<$vK&+c_lgu`K7k`r9jFyzbIWtA;&g3v!qf- zp}54hxFoS8RYxJ&Ha!Wb*_PRk*O-AdLeJE|l7WHQ%Akqa%%F)$ZUHkBBNG!#z^}Cj z40zc%wc0$|zVk9NaZl`k)bi>=*h3f9cfLC-|z9h^m?lz zukiix)Hio#n%x($N&4e?)P08QvyAV}ck1+(Pu5-5Dra{f%jSoggTdSXlh(wu9*FpJ zNm_TdizfdX2CKy`OCbOtacw9gB+#{`^PGe&vO!#wH^ANAI_GTYa`|RdJcpqd55x>zdM?5}cpj zaz8P#VivvkC%ukwXZW zB!D5r$PhD8V4YrQu+yi%Up}-v++p=aVw*+*XMjQD>wgmK_AlIjI8ye_WiioZ2|B-O zZi!hflG!i8b9UW>%s0>8-AneLckByZ)^qs_MAj|o zK9<+;W?g@qK}Of)5RuKBI+LC1wj_xhNKmOhoqA^dg|>j0J&$Jo(0H{ia9Qfb&(pJ> zyGmpPcOU0nvdZ&L@KL74emsvheXURV5mPq3>~>n|-y`X>GV(U?YC4OD?@wxp_fDwa zwD#PVTT{I^NDJy_Uv*t!G~>U)E5QXuHItcG(^y)W-UKHJtm!y>|LxK!d4)^oeyqs8 p`k&^%B&=X-`gcN#EI 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 literal 885 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 MkcJnJ|AWMT0e!wR2LJ#7 literal 2176 zcmcJQ`8U*y8^`A}D>GvqOqPo*S?$@X|h)u+m{K0Q3>f=_k6$S+<)Nv!~2KVdCqg5^SsadJkS2>{wfFr0{;~7x8O7{ zYN!|WCmK?S9u^=F41$k?{=f^uk-x(MD4-4&0RR{X8VCK9z#|ovEiPw-FRBbz`aLWT zUl|mhVt$pPs-CVJ4a)Cs^xHRzKx&1$iFLqh#!p*gZogOTQJsJ+FT8ao<-W}D7T3A1 z+`8B%FD{!Et^Y$8fui)6e`a3>6=!&0jSAa22`*Wui&{lpZ55wY(F@1noEByNA?>IXcR%or zXYp0q`$ZK|8mZ|yw3oo_5$9bw{%_Yz1Y**McRgkL)KFP%wP9(lf^+0zhV}8_jb_w% zqxopkJuoZTSFl#*t({{WJ9!iqO?OR>A!oKwr4zUthiaFj<9+_f+jM56YpHxUTgOuT zy;{aaj<4F^B7Mkv(7LkL{6^_*iPJ)+hUwJIvG=?!KRdMuKb&M>nk5hgnbZj{r?r<{ zWl;O>Es=Vi`LwSoD~XyK)N1!L&sZ~YH1gAbaeH16R%+PHGIuL9a%23s(=-y!*`W(aJ zNxWo#eMHVY+W3}AlMvpFVeU6-js5)UM<4ZbWa?A{a)clC$0pjxR?l-R8{cbjRT2jMWRV{;S;aOK7Dp99?VD zZt8xV!OkLmfYTze@JQ;Ya5i&>17I8?9mz57n^y|4iTUmkT^~cgAT5aWmm&@F?>?+pnofT6j2%_?#>mc_TQ9YF} z>>k#^#ZGbVd1$e1zhJ%!_hRYev?YZCwch*c#^{VwdUKF3>@jVw~p6o;PmmCmW!HPqddoC!)$BEe?K&$(4V zgf>qiMy_`}%`CA@WDU%}>YR{cc8}803gnlP5&t1>N=308PJO(p*F|HKC1T2-4z$XiY-^0M+qs(Vku8l~HFUjRdqZQR0o$gx zItAb;fwF66AGYczAzA1x`kLgs+`N%s@}YV|l#LLPB=05AB%+oE zIp9l0yxg*B&d33|oC}6+i67s*w(1=*>9MB-eA3T(46bSzJK|n27lJ7F+EKoJN{D~Z zlA*D4^I8HhsSaYe`ntstWtt0vn9<+U*_|^7ow6?KNw;&v;$70W?<2{q66gioYV+JJ zhm-};V@Fb}AKfV3%z;N%AQF(h^$O&Hs000F8;hhO6JU<-b0EJ_~q~ioZJo*># zVPKRHw-7Ia03P*=5g6!+%OPO|G#>d2kr;>#)%$;)C=A%ffgp+({#Alt`2B-C-28ol zXd!r6tN=k9PaxtCy-SZ z!EN?3?Wm9F2BSCktXa|g2H&w+QAgRdvx>o_ZL(t=aI%WWee@r99=A#W diff --git a/light-hybrid-4j/src/main/resources/binaries/server.truststore b/light-hybrid-4j/src/main/resources/binaries/server.truststore index fb0c19ccb2e390365688d071d5326480ce81a73d..f30e2d7fbfeee89138c08d878a5e8f23c5f286c2 100644 GIT binary patch literal 2566 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 literal 935 zcmezO_TO6u1_mY|W(3nF$$7RVsl_D<$vK&+c_lgu`K7k`r9jFyzbIWtA;&g3v!qf- zp}54hxFoS8RYxJ&Ha!Wb*_PRk*O-AdLeJE|l7WHQ%Akqa%%F)$ZUHkBBNG!#z^}Cj z40zc%wc0$|zVk9NaZl`k)bi>=*h3f9cfLC-|z9h^m?lz zukiix)Hio#n%x($N&4e?)P08QvyAV}ck1+(Pu5-5Dra{f%jSoggTdSXlh(wu9*FpJ zNm_TdizfdX2CKy`OCbOtacw9gB+#{`^PGe&vO!#wH^ANAI_GTYa`|RdJcpqd55x>zdM?5}cpj zaz8P#VivvkC%ukwXZW zB!D5r$PhD8V4YrQu+yi%Up}-v++p=aVw*+*XMjQD>wgmK_AlIjI8ye_WiioZ2|B-O zZi!hflG!i8b9UW>%s0>8-AneLckByZ)^qs_MAj|o zK9<+;W?g@qK}Of)5RuKBI+LC1wj_xhNKmOhoqA^dg|>j0J&$Jo(0H{ia9Qfb&(pJ> zyGmpPcOU0nvdZ&L@KL74emsvheXURV5mPq3>~>n|-y`X>GV(U?YC4OD?@wxp_fDwa zwD#PVTT{I^NDJy_Uv*t!G~>U)E5QXuHItcG(^y)W-UKHJtm!y>|LxK!d4)^oeyqs8 p`k&^%B&=X-`gcN#EI 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 literal 885 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 MkcJnJ|AWMT0e!wR2LJ#7 literal 2176 zcmcJQ`8U*y8^`A}D>GvqOqPo*S?$@X|h)u+m{K0Q3>f=_k6$S+<)Nv!~2KVdCqg5^SsadJkS2>{wfFr0{;~7x8O7{ zYN!|WCmK?S9u^=F41$k?{=f^uk-x(MD4-4&0RR{X8VCK9z#|ovEiPw-FRBbz`aLWT zUl|mhVt$pPs-CVJ4a)Cs^xHRzKx&1$iFLqh#!p*gZogOTQJsJ+FT8ao<-W}D7T3A1 z+`8B%FD{!Et^Y$8fui)6e`a3>6=!&0jSAa22`*Wui&{lpZ55wY(F@1noEByNA?>IXcR%or zXYp0q`$ZK|8mZ|yw3oo_5$9bw{%_Yz1Y**McRgkL)KFP%wP9(lf^+0zhV}8_jb_w% zqxopkJuoZTSFl#*t({{WJ9!iqO?OR>A!oKwr4zUthiaFj<9+_f+jM56YpHxUTgOuT zy;{aaj<4F^B7Mkv(7LkL{6^_*iPJ)+hUwJIvG=?!KRdMuKb&M>nk5hgnbZj{r?r<{ zWl;O>Es=Vi`LwSoD~XyK)N1!L&sZ~YH1gAbaeH16R%+PHGIuL9a%23s(=-y!*`W(aJ zNxWo#eMHVY+W3}AlMvpFVeU6-js5)UM<4ZbWa?A{a)clC$0pjxR?l-R8{cbjRT2jMWRV{;S;aOK7Dp99?VD zZt8xV!OkLmfYTze@JQ;Ya5i&>17I8?9mz57n^y|4iTUmkT^~cgAT5aWmm&@F?>?+pnofT6j2%_?#>mc_TQ9YF} z>>k#^#ZGbVd1$e1zhJ%!_hRYev?YZCwch*c#^{VwdUKF3>@jVw~p6o;PmmCmW!HPqddoC!)$BEe?K&$(4V zgf>qiMy_`}%`CA@WDU%}>YR{cc8}803gnlP5&t1>N=308PJO(p*F|HKC1T2-4z$XiY-^0M+qs(Vku8l~HFUjRdqZQR0o$gx zItAb;fwF66AGYczAzA1x`kLgs+`N%s@}YV|l#LLPB=05AB%+oE zIp9l0yxg*B&d33|oC}6+i67s*w(1=*>9MB-eA3T(46bSzJK|n27lJ7F+EKoJN{D~Z zlA*D4^I8HhsSaYe`ntstWtt0vn9<+U*_|^7ow6?KNw;&v;$70W?<2{q66gioYV+JJ zhm-};V@Fb}AKfV3%z;N%AQF(h^$O&Hs000F8;hhO6JU<-b0EJ_~q~ioZJo*># zVPKRHw-7Ia03P*=5g6!+%OPO|G#>d2kr;>#)%$;)C=A%ffgp+({#Alt`2B-C-28ol zXd!r6tN=k9PaxtCy-SZ z!EN?3?Wm9F2BSCktXa|g2H&w+QAgRdvx>o_ZL(t=aI%WWee@r99=A#W diff --git a/light-rest-4j/src/main/resources/binaries/server.truststore b/light-rest-4j/src/main/resources/binaries/server.truststore index fb0c19ccb2e390365688d071d5326480ce81a73d..f30e2d7fbfeee89138c08d878a5e8f23c5f286c2 100644 GIT binary patch literal 2566 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 literal 935 zcmezO_TO6u1_mY|W(3nF$$7RVsl_D<$vK&+c_lgu`K7k`r9jFyzbIWtA;&g3v!qf- zp}54hxFoS8RYxJ&Ha!Wb*_PRk*O-AdLeJE|l7WHQ%Akqa%%F)$ZUHkBBNG!#z^}Cj z40zc%wc0$|zVk9NaZl`k)bi>=*h3f9cfLC-|z9h^m?lz zukiix)Hio#n%x($N&4e?)P08QvyAV}ck1+(Pu5-5Dra{f%jSoggTdSXlh(wu9*FpJ zNm_TdizfdX2CKy`OCbOtacw9gB+#{`^PGe&vO!#wH^ANAI_GTYa`|RdJcpqd55x>zdM?5}cpj zaz8P#VivvkC%ukwXZW zB!D5r$PhD8V4YrQu+yi%Up}-v++p=aVw*+*XMjQD>wgmK_AlIjI8ye_WiioZ2|B-O zZi!hflG!i8b9UW>%s0>8-AneLckByZ)^qs_MAj|o zK9<+;W?g@qK}Of)5RuKBI+LC1wj_xhNKmOhoqA^dg|>j0J&$Jo(0H{ia9Qfb&(pJ> zyGmpPcOU0nvdZ&L@KL74emsvheXURV5mPq3>~>n|-y`X>GV(U?YC4OD?@wxp_fDwa zwD#PVTT{I^NDJy_Uv*t!G~>U)E5QXuHItcG(^y)W-UKHJtm!y>|LxK!d4)^oeyqs8 p2.0.16 0.9.6 1.5.12 - 7.0.1 + 8.0 5.11.3 2.3.18.Final 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/server/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/server/pom.xml.rocker.raw index 4cac4a08..e12fb905 100644 --- a/light-rest-4j/src/main/resources/templates/rest/server/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/server/pom.xml.rocker.raw @@ -132,6 +132,16 @@ com.networknt decryptor + + com.networknt + cache-manager + ${version.light-4j} + + + com.networknt + caffeine-cache + ${version.light-4j} + com.networknt cache-explorer diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 133a1481..6eba3a01 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -186,6 +186,16 @@ decryptor ${version.light-4j} + + com.networknt + cache-manager + ${version.light-4j} + + + com.networknt + caffeine-cache + ${version.light-4j} + com.networknt cache-explorer diff --git a/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw index 16584fef..a5ef74e4 100644 --- a/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw @@ -24,6 +24,9 @@ server.buildNumber: @version # security.yml security.enableVerifyJwt: false +# metrics.yml +metrics.enabled: false + # service.yml service.singletons: - com.networknt.registry.URL: diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/LICENSE.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/LICENSE.rocker.raw index 8dada3ed..d26ed5e2 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/LICENSE.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/LICENSE.rocker.raw @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright {yyyy} [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From e6ef9d5f579f2c259694075d646949f59ebe3aa6 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 23 Nov 2024 14:55:28 -0500 Subject: [PATCH 18/81] upgrade to version 2.2.0-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 3deaef38..01ab53ff 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index c189133f..8febb8ee 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index b03b2527..44fe0939 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 2bb762bc..8508b2ae 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 1905d43b..03c90065 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 4f201ed8..8639bfa9 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index fdd68b70..8eee70c4 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 9d2a0554..de89d0b8 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e6e0908b..e235753e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 2ca4c5bd..8d5af710 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 538f9059..7f7bb393 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.1.38-SNAPSHOT +light4jVersion=2.2.0-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.11.6 jacksonVersion=2.18.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 1896d03a..f40ffcbe 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 1.5.12 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index da647b62..fc2edd40 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.38-SNAPSHOT +light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index f3de8f6f..65673f9b 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index da647b62..fc2edd40 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.38-SNAPSHOT +light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 6eba3a01..cdad3ecd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index a9f13c92..1167c6c7 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.6.0 -light4jVersion=2.1.38-SNAPSHOT +light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.18.Final logbackVersion=1.5.12 diff --git a/pom.xml b/pom.xml index b9f2de46..0d763f8e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.1.38-SNAPSHOT + 2.2.0-SNAPSHOT 2.18.1 2.0.16 0.9.6 From 8293e21714b6e8909931d0c90d1f54c789826aea Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 30 Nov 2024 20:40:24 -0500 Subject: [PATCH 19/81] upgrade junit to 5.11.3 --- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 7f7bb393..213e1b68 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ # Versions of Frequently used Libraries light4jVersion=2.2.0-SNAPSHOT lambdaCoreVersion=1.2.3 -lambdaEventsVersion=3.11.6 +lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 logbackVersion=1.5.12 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index f40ffcbe..0321d7e5 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -19,7 +19,7 @@ 1.5.1 2.2 1.2.3 - 3.11.6 + 3.14.0 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 3e2bf480..a9346832 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ # Versions of Frequently used Libraries light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 -lambdaEventsVersion=3.11.6 +lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 slf4jVersion=2.0.16 logbackVersion=1.5.12 From d1fa1988fc2356140a56ca9b49ec9821032d2746 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 30 Nov 2024 20:47:28 -0500 Subject: [PATCH 20/81] upgrade lambda-events to 3.14.0 --- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 663c4ea7..32b500ef 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -19,7 +19,7 @@ 1.5.1 2.2 1.2.3 - 3.6.0 + 3.14.0 5.11.3 From 6e54f04bb72edcfaa8d1c7b17bf030878f0d7195 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 7 Dec 2024 12:41:43 -0500 Subject: [PATCH 21/81] fixes #710 update rest and hybrid generator (#711) --- .../codegen/hybrid/HybridServerGenerator.java | 18 +-- .../hybrid/HybridServiceGenerator.java | 16 +-- .../templates/hybrid/handler.rocker.raw | 4 +- .../templates/hybrid/handlerYml.rocker.raw | 13 +- .../templates/hybrid/primaryCrt.rocker.raw | 19 --- .../templates/hybrid/rpcRouterYml.rocker.raw | 3 - .../templates/hybrid/secondaryCrt.rocker.raw | 19 --- .../templates/hybrid/securityYml.rocker.raw | 38 ------ .../hybrid/server/pom.xml.rocker.raw | 51 ++++++-- .../templates/hybrid/serverYml.rocker.raw | 123 ------------------ .../hybrid/service/pom.xml.rocker.raw | 51 ++++++-- .../templates/hybrid/serviceYml.rocker.raw | 41 ------ .../templates/hybrid/values.rocker.raw | 54 +++++++- .../codegen/rest/OpenApiKotlinGenerator.java | 3 - .../codegen/rest/OpenApiLambdaGenerator.java | 2 - .../codegen/rest/OpenApiLightGenerator.java | 2 - .../templates/rest/dockerfileslim.rocker.raw | 2 +- .../templates/rest/handlerYml.rocker.raw | 3 + .../templates/rest/primaryCrt.rocker.raw | 19 --- .../templates/rest/secondaryCrt.rocker.raw | 19 --- .../templates/rest/values.rocker.raw | 10 +- .../restkotlin/primaryCrt.rocker.raw | 19 --- .../restkotlin/secondaryCrt.rocker.raw | 19 --- 23 files changed, 149 insertions(+), 399 deletions(-) delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/primaryCrt.rocker.raw delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/rpcRouterYml.rocker.raw delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/secondaryCrt.rocker.raw delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/securityYml.rocker.raw delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/serverYml.rocker.raw delete mode 100644 light-hybrid-4j/src/main/resources/templates/hybrid/serviceYml.rocker.raw delete mode 100644 light-rest-4j/src/main/resources/templates/rest/primaryCrt.rocker.raw delete mode 100644 light-rest-4j/src/main/resources/templates/rest/secondaryCrt.rocker.raw delete mode 100644 light-rest-4j/src/main/resources/templates/restkotlin/primaryCrt.rocker.raw delete mode 100644 light-rest-4j/src/main/resources/templates/restkotlin/secondaryCrt.rocker.raw diff --git a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServerGenerator.java b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServerGenerator.java index cf347c37..1cb3428e 100644 --- a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServerGenerator.java +++ b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServerGenerator.java @@ -84,12 +84,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, "", ".project", templates.hybrid.project.template()); } - // config - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "service.yml", templates.hybrid.serviceYml.template(config)); - - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "server.yml", templates.hybrid.serverYml.template(serviceId, enableHttp, httpPort, enableHttps, httpsPort, enableHttp2, enableRegistry, version)); - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "server.yml", templates.hybrid.serverYml.template(serviceId, enableHttp, "49587", enableHttps, "49588", enableHttp2, enableRegistry, version)); - if(kafkaProducer) { transfer(targetPath, ("src.main.resources.config").replace(".", separator), "kafka-producer.yml", templates.hybrid.kafkaProducerYml.template(kafkaTopic)); } @@ -97,12 +91,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, ("src.main.resources.config").replace(".", separator), "kafka-streams.yml", templates.hybrid.kafkaStreamsYml.template(artifactId)); } - // transfer(targetPath, ("src.main.resources.config").replace(".", separator), "secret.yml", templates.hybrid.secretYml.template()); - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "security.yml", templates.hybrid.securityYml.template()); - - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "primary.crt", templates.hybrid.primaryCrt.template()); - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "secondary.crt", templates.hybrid.secondaryCrt.template()); - // logging transfer(targetPath, ("src.main.resources").replace(".", separator), "logback.xml", templates.hybrid.logback.template()); transfer(targetPath, ("src.test.resources").replace(".", separator), "logback-test.xml", templates.hybrid.logback.template()); @@ -110,7 +98,8 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO // added with #471 transfer(targetPath, ("src.main.resources.config").replace(".", separator), "app-status.yml", templates.hybrid.appStatusYml.template()); // values.yml file, transfer to suppress the warning message during start startup and encourage usage. - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template()); + transfer(targetPath, ("src.main.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template(config, handlerPackage, jsonPath, serviceId, enableHttp, httpPort, enableHttps, httpsPort, enableHttp2, enableRegistry, version)); + transfer(targetPath, ("src.test.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template(config, handlerPackage, jsonPath, serviceId, enableHttp, "49587", enableHttps, "49588", enableHttp2, enableRegistry, version)); // transfer binary files without touching them. try (InputStream is = HybridServerGenerator.class.getResourceAsStream("/binaries/server.keystore")) { @@ -138,9 +127,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, ("src.main.resources.config").replace(".", separator), "handler.yml", templates.hybrid.handlerYml.template(serviceId, handlerPackage, jsonPath, prometheusMetrics)); - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "rpc-router.yml", - templates.hybrid.rpcRouterYml.template(handlerPackage, jsonPath)); - } diff --git a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java index f84cc3c6..542ef62d 100644 --- a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java +++ b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import static java.io.File.separator; @@ -81,12 +82,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, "", ".project", templates.hybrid.project.template()); } - // config - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "service.yml", templates.hybrid.serviceYml.template(config)); - - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "server.yml", templates.hybrid.serverYml.template(serviceId, enableHttp, "49587", enableHttps, "49588", enableHttp2, enableRegistry, version)); - //transfer(targetPath, ("src.test.resources.config").replace(".", separator), "secret.yml", templates.hybrid.secretYml.template()); - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "security.yml", templates.hybrid.securityYml.template()); if(kafkaProducer) { transfer(targetPath, ("src.test.resources.config").replace(".", separator), "kafka-producer.yml", templates.hybrid.kafkaProducerYml.template(kafkaTopic)); } @@ -103,10 +98,10 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO // added with #471 transfer(targetPath, ("src.test.resources.config").replace(".", separator), "app-status.yml", templates.hybrid.appStatusYml.template()); // values.yml file, transfer to suppress the warning message during start startup and encourage usage. - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template()); + transfer(targetPath, ("src.test.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template(config, handlerPackage, jsonPath, serviceId, enableHttp, "49587", enableHttps, "49588", enableHttp2, enableRegistry, version)); // handler - Map services = new HashMap(); + Map services = new TreeMap(); JsonNode anyModel = (JsonNode)model; String host = anyModel.get("host").textValue(); String service = anyModel.get("service").textValue(); @@ -121,7 +116,7 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO } transfer(targetPath, ("src.main.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + ".java", templates.hybrid.handler.template(handlerPackage, host, service, item, example)); String sId = host + "/" + service + "/" + item.get("name").textValue() + "/" + item.get("version").textValue(); - Map map = new HashMap<>(); + Map map = new TreeMap<>(); map.put("schema", item.get("schema")); JsonNode anyScope = item.get("scope"); String scope = anyScope != null ? anyScope.textValue().trim() : null; @@ -164,9 +159,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, ("src.test.resources.config").replace(".", separator), "handler.yml", templates.hybrid.handlerYml.template(serviceId, handlerPackage, jsonPath, prometheusMetrics)); - transfer(targetPath, ("src.test.resources.config").replace(".", separator), "rpc-router.yml", - templates.hybrid.rpcRouterYml.template(handlerPackage, jsonPath)); - // write the generated schema into the config folder for schema validation. try (InputStream is = new ByteArrayInputStream(Generator.jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsBytes(services))) { Generator.copyFile(is, Paths.get(targetPath, ("src.main.resources").replace(".", separator), "schema.json")); diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/handler.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/handler.rocker.raw index 411143d9..39638dc8 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/handler.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/handler.rocker.raw @@ -3,7 +3,7 @@ package @handlerPackage; import com.networknt.utility.NioUtils; -import com.networknt.rpc.Handler; +import com.networknt.rpc.HybridHandler; import com.networknt.rpc.router.ServiceHandler; import java.nio.ByteBuffer; import io.undertow.server.HttpServerExchange; @@ -13,7 +13,7 @@ For more information on how to write business handlers, please check the link be https://doc.networknt.com/development/business-handler/hybrid/ */ @@ServiceHandler(id="@host/@service/@item.get("name").textValue()/@item.get("version").textValue()") -public class @item.get("handler").textValue() implements Handler { +public class @item.get("handler").textValue() implements HybridHandler { @@Override public ByteBuffer handle(HttpServerExchange exchange, Object input) { return NioUtils.toByteBuffer("@example"); diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/handlerYml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/handlerYml.rocker.raw index d491d030..ac69dda9 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/handlerYml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/handlerYml.rocker.raw @@ -45,21 +45,22 @@ handlers: # Light-framework cross-cutting concerns implemented in the microservice - com.networknt.exception.ExceptionHandler@@exception @if(prometheusMetrics){ - com.networknt.metrics.prometheus.PrometheusHandler@@prometheus} else { - com.networknt.metrics.MetricsHandler@@metrics} - # - com.networknt.traceability.TraceabilityHandler@@traceability - # - com.networknt.correlation.CorrelationHandler@@correlation - - com.networknt.jaeger.tracing.JaegerHandler@@jaeger + - com.networknt.correlation.CorrelationHandler@@correlation - com.networknt.cors.CorsHttpHandler@@cors + - com.networknt.body.BodyHandler@@body # - com.networknt.audit.AuditHandler@@audit # DumpHandler is to dump detail request/response info to log, useful for troubleshooting but not suggested to use in production due to it may lower the performance # - com.networknt.dump.DumpHandler@@dump # - com.networknt.sanitizer.SanitizerHandler@@sanitizer - com.networknt.rpc.router.JsonHandler@@json + - com.networknt.rpc.router.SchemaHandler@@schema + - com.networknt.rpc.security.HybridJwtVerifyHandler@@security + # Customer business domain specific cross-cutting concerns handlers # - com.example.validator.CustomizedValidator@@custvalidator # Framework endpoint handlers - com.networknt.health.HealthGetHandler@@health - com.networknt.info.ServerInfoGetHandler@@info - - com.networknt.openapi.JwtVerifyHandler@@security - com.networknt.logging.handler.LoggerGetHandler@@getLogger - com.networknt.logging.handler.LoggerPostHandler@@postLogger - com.networknt.logging.handler.LoggerGetLogContentsHandler@@getLogContents @@ -74,10 +75,10 @@ chains: default: - exception @if(prometheusMetrics){ - prometheus} else { - metrics} - - traceability - correlation - # - dump - cors + - schema + - security - json paths: diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/primaryCrt.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/primaryCrt.rocker.raw deleted file mode 100644 index 34f9272f..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/primaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDmzCCAoOgAwIBAgIEHnAgtDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEUMBIGA1UEBxMLTWlzc2lzc2F1Z2ExJjAkBgNVBAoTHU5ldHdvcmsgTmV3IFRl -Y2hub2xvZ2llcyBJbmMuMQwwCgYDVQQLEwNERVYxETAPBgNVBAMTCFN0ZXZlIEh1MB4XDTE2MDkw -MTE2MTYxNVoXDTI2MDcxMTE2MTYxNVowfjELMAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFyaW8x -FDASBgNVBAcTC01pc3Npc3NhdWdhMSYwJAYDVQQKEx1OZXR3b3JrIE5ldyBUZWNobm9sb2dpZXMg -SW5jLjEMMAoGA1UECxMDREVWMREwDwYDVQQDEwhTdGV2ZSBIdTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALrlxMtDb60DogElf4TBz504tRheZimAE0dJL/Yby4nacJdqvc5l4z+WWpDf -rI9krQ2Yi9yvhwAP+PrR6gWcIqWP4cpNE7XIAUDgr4CtyI7CptT/lpjtbkz4DGCMmaeDn0jqHqJt -SeSZGfwVu5zAGm8n4sHatjnnxBI/iWzkTII3V4xv0WeK37szNTEd+ly2ag7n2IV5zNnYmqZTeMQm -J2ENS+IwAG3ENtiVtrVTx/2bGtqutJjtdxsN58/cUG/guRyMT6OPI8Yi3ZzevdvRbxadyhEl/Kaw -6vJcdxmJI3tp4lx+p6sAxOWa7aapJe4JxutAQqzv0GKdVjoHKQ1wB60CAwEAAaMhMB8wHQYDVR0O -BBYEFIPF9SBd06RWU1eDL73CKfy01lavMA0GCSqGSIb3DQEBCwUAA4IBAQAoaKZGOak3Upz/ordF -slZoJuZlCu7jnKQEjYwHf3DNxcd1WmgFPtMcna6pW0VUxPIfidEA6VCMsGoK1RvshB0SjrRdCht6 -5qPXs9kV3NW0WvMiwDSYZZ9HgaZ9efTe5E9Fzc7ltKrE43L6k8NJcaEEWEdpdjFbrAqH4I+j/Vro -K3OhIo062fXjas5ipL4gF+3ECImjWzirQP8UiAfM0/36x7rtAu3btH/qI9hSyx39LBPPE5AsDJZ4 -dSMwNTW1gqmBAZIj+zQ/RD5dyWfPwON7Q+t96YbK6WBuYo0xy+I+PjcUgrWYWP3N24hlq8ZBIei+ -BudoEVJlIlmS0aRCuP8n ------END CERTIFICATE----- diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/rpcRouterYml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/rpcRouterYml.rocker.raw deleted file mode 100644 index 31fd303f..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/rpcRouterYml.rocker.raw +++ /dev/null @@ -1,3 +0,0 @@ -@args (String handlerPackage, String jsonPath) -handlerPackage: '@handlerPackage' -jsonPath: @jsonPath diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/secondaryCrt.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/secondaryCrt.rocker.raw deleted file mode 100644 index dfbd3cea..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/secondaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDkzCCAnugAwIBAgIEUBGbJDANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEQMA4GA1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5v -bG9naWVzIEluYy4xDDAKBgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwHhcNMTYwOTIyMjI1 -OTIxWhcNMjYwODAxMjI1OTIxWjB6MQswCQYDVQQGEwJDQTEQMA4GA1UECBMHT250YXJpbzEQMA4G -A1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5vbG9naWVzIEluYy4xDDAK -BgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCqYfarFwug2DwpG/mmcW77OluaHVNsKEVJ/BptLp5suJAH/Z70SS5pwM4x2QwMOVO2ke8U -rsAws8allxcuKXrbpVt4evpO1Ly2sFwqB1bjN3+VMp6wcT+tSjzYdVGFpQAYHpeA+OLuoHtQyfpB -0KCveTEe3KAG33zXDNfGKTGmupZ3ZfmBLINoey/X13rY71ITt67AY78VHUKb+D53MBahCcjJ9YpJ -UHG+Sd3d4oeXiQcqJCBCVpD97awWARf8WYRIgU1xfCe06wQ3CzH3+GyfozLeu76Ni5PwE1tm7Dhg -EDSSZo5khmzVzo4G0T2sOeshePc5weZBNRHdHlJA0L0fAgMBAAGjITAfMB0GA1UdDgQWBBT9rnek -spnrFus5wTszjdzYgKll9TANBgkqhkiG9w0BAQsFAAOCAQEAT8udTfUGBgeWbN6ZAXRI64VsSJj5 -1sNUN1GPDADLxZF6jArKU7LjBNXn9bG5VjJqlx8hQ1SNvi/t7FqBRCUt/3MxDmGZrVZqLY1kZ2e7 -x+5RykbspA8neEUtU8sOr/NP3O5jBjU77EVec9hNNT5zwKLevZNL/Q5mfHoc4GrIAolQvi/5fEqC -8OMdOIWS6sERgjaeI4tXxQtHDcMo5PeLW0/7t5sgEsadZ+pkdeEMVTmLfgf97bpNNI7KF5uEbYnQ -NpwCT+NNC5ACmJmKidrfW23kml1C7vr7YzTevw9QuH/hN8l/Rh0fr+iPEVpgN6Zv00ymoKGmjuuW -owVmdKg/0w== ------END CERTIFICATE----- diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/securityYml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/securityYml.rocker.raw deleted file mode 100644 index 30eb86b6..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/securityYml.rocker.raw +++ /dev/null @@ -1,38 +0,0 @@ -# Security configuration for hybrid-security in light-hybrid-4j. It is a specific config -# for Hybrid framework security. It is introduced to support multiple frameworks in the -# same server instance. If this file cannot be found, the generic security.yml will be -# loaded for backward compatibility. ---- -# Enable JWT verification flag. -enableVerifyJwt: false - -# Enable JWT scope verification. Only valid when enableVerifyJwt is true. -enableVerifyScope: true - -# User for test only. should be always be false on official environment. -enableMockJwt: false - -# JWT signature public certificates. kid and certificate path mappings. -jwt: - certificate: - '100': primary.crt - '101': secondary.crt - clockSkewInSeconds: 60 - # Key distribution server standard: JsonWebKeySet for other OAuth 2.0 provider| X509Certificate for light-oauth2 - keyResolver: X509Certificate - -# Enable or disable JWT token logging -logJwtToken: true - -# Enable or disable client_id, user_id and scope logging. -logClientUserScope: false - -# Enable JWT token cache to speed up verification. This will only verify expired time -# and skip the signature verification as it takes more CPU power and long time. -enableJwtCache: true - -# If you are using light-oauth2, then you don't need to have oauth subfolder for public -# key certificate to verify JWT token, the key will be retrieved from key endpoint once -# the first token is arrived. Default to false for dev environment without oauth2 server -# or official environment that use other OAuth 2.0 providers. -bootstrapFromKeyService: false diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index de89d0b8..3431f673 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -20,16 +20,16 @@ 5.11.3 2.3.18.Final 1.5.1 - @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ + @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ 3.1.0 } - @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 } - @if(config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 8.0.32 } - @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ @@ -76,17 +76,17 @@ com.networknt - traceability + correlation ${version.light-4j} com.networknt - correlation + rpc-router ${version.light-4j} com.networknt - rpc-router + rpc-security ${version.light-4j} @@ -101,12 +101,37 @@ com.networknt - cors + logger-handler + ${version.light-4j} + + + com.networknt + config-reload + ${version.light-4j} + + + com.networknt + cache-manager ${version.light-4j} com.networknt - jaeger-tracing + caffeine-cache + ${version.light-4j} + + + com.networknt + cache-explorer + ${version.light-4j} + + + com.networknt + body + ${version.light-4j} + + + com.networknt + cors ${version.light-4j} @@ -170,28 +195,28 @@ undertow-core ${version.undertow} - @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ + @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ com.zaxxer HikariCP ${version.hikaricp} } - @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ com.oracle ojdbc6 ${version.oracle} } - @if(config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ mysql mysql-connector-java ${version.mysql} } - @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ org.postgresql postgresql diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/serverYml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/serverYml.rocker.raw deleted file mode 100644 index f4fd14c5..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/serverYml.rocker.raw +++ /dev/null @@ -1,123 +0,0 @@ -@args (String serviceId, Boolean enableHttp, String httpPort, Boolean enableHttps, String httpsPort, Boolean enableHttp2, Boolean enableRegistry, String version) -# Server configuration ---- -# This is the default binding address if the service is dockerized. -ip: ${server.ip:0.0.0.0} - -# Http port if enableHttp is true. It will be ignored if dynamicPort is true. -httpPort: ${server.httpPort:@httpPort} - -# Enable HTTP should be false by default. It should be only used for testing with clients or tools -# that don't support https or very hard to import the certificate. Otherwise, https should be used. -# When enableHttp, you must set enableHttps to false, otherwise, this flag will be ignored. There is -# only one protocol will be used for the server at anytime. If both http and https are true, only -# https listener will be created and the server will bind to https port only. -enableHttp: ${server.enableHttp:@enableHttp} - -# Https port if enableHttps is true. It will be ignored if dynamicPort is true. -httpsPort: ${server.httpsPort:@httpsPort} - -# Enable HTTPS should be true on official environment and most dev environments. -enableHttps: ${server.enableHttps:@enableHttps} - -# Http/2 is enabled by default for better performance and it works with the client module -# Please note that HTTP/2 only works with HTTPS. -enableHttp2: ${server.enableHttp2:@enableHttp2} - -# Keystore file name in config folder. -keystoreName: ${server.keystoreName:server.keystore} - -# Keystore password -keystorePass: ${server.keystorePass:password} - -# Private key password -keyPass: ${server.keyPass:password} - -# Flag that indicate if two way TLS is enabled. Not recommended in docker container. -enableTwoWayTls: ${server.enableTwoWayTls:false} - -# Truststore file name in config folder. -truststoreName: ${server.truststoreName:server.truststore} - -# Truststore password -truststorePass: ${server.truststorePass:password} - -# Bootstrap truststore name used to connect to the light-config-server if it is used. -bootstrapStoreName: ${server.bootstrapStoreName:bootstrap.truststore} - -# Bootstrap truststore password -bootstrapStorePass: ${server.bootstrapStorePass:password} - -# Unique service identifier. Used in service registration and discovery etc. -serviceId: ${server.serviceId:@serviceId} - -# Flag to enable self service registration. This should be turned on on official test and production. And -# dyanmicPort should be enabled if any orchestration tool is used like Kubernetes. -enableRegistry: ${server.enableRegistry:@enableRegistry} - -# When enableRegistry is true and the registry/discovery service is not reachable. Stop the server or continue -# starting the server. When your global registry is not setup as high availability and only for monitoring, you -# can set it true. If you are using it for global service discovery, leave it with false. -startOnRegistryFailure: ${server.startOnRegistryFailure:false} - -# Dynamic port is used in situation that multiple services will be deployed on the same host and normally -# you will have enableRegistry set to true so that other services can find the dynamic port service. When -# deployed to Kubernetes cluster, the Pod must be annotated as hostNetwork: true -dynamicPort: ${server.dynamicPort:false} - -# Minimum port range. This define a range for the dynamic allocated ports so that it is easier to setup -# firewall rule to enable this range. Default 2400 to 2500 block has 100 port numbers and should be -# enough for most cases unless you are using a big bare metal box as Kubernetes node that can run 1000s pods -minPort: ${server.minPort:2400} - -# Maximum port rang. The range can be customized to adopt your network security policy and can be increased or -# reduced to ease firewall rules. -maxPort: ${server.maxPort:2500} - -# environment tag that will be registered on consul to support multiple instances per env for testing. -# https://github.com/networknt/light-doc/blob/master/docs/content/design/env-segregation.md -# This tag should only be set for testing env, not production. The production certification process will enforce it. -# environment: ${server.environment:test1} - -# Build Number, to be set by teams for auditing or tracing purposes. -# Allows teams to audit the value and set it according to their release management process -buildNumber: ${server.buildNumber:@version} - -# Shutdown gracefully wait period in milliseconds -# In this period, it allows the in-flight requests to complete but new requests are not allowed. It needs to be set -# based on the slowest request possible. -shutdownGracefulPeriod: ${server.shutdownGracefulPeriod:2000} - -# ----------------------------------------------------------------------------------------------------------- -# The following parameters are for advanced users to fine tune the service in a container environment. Please leave -# these values default if you do not understand. For more info, visit https://doc.networknt.com/concern/server/ - -# Unique service name. Used in microservice to associate a given name to a service with configuration -# or as a key within the configuration of a particular domain -# serviceName: ${server.serviceName:petstore} - -# Buffer size of undertow server. Default to 16K -# bufferSize: ${server.bufferSize:16384} - -# Number of IO thread. Default to number of processor * 2 -# ioThreads: ${server.ioThreads:4} - -# Number of worker threads. Default to 200 and it can be reduced to save memory usage in a container with only one cpu -# workerThreads: ${server.workerThreads:200} - -# Backlog size. Default to 10000 -# backlog: ${server.backlog:10000} - -# Flag to set UndertowOptions.ALWAYS_SET_DATE -# alwaysSetDate: ${server.alwaysSetDate:false} - -# Server string used to mark the server. Default to L for light-4j. -# serverString: ${server.serverString:L} - -# Flag to set UndertowOptions.ALLOW_UNESCAPED_CHARACTERS_IN_URL. Default to false. -# Please note that this option widens the attack surface and attacker can potentially access your filesystem. -# This should only be used on an internal server and never be used on a server accessed from the Internet. -# allowUnescapedCharactersInUrl: ${server.allowUnescapedCharactersInUrl:false} - -# Set the max transfer file size for uploading files. Default to 1000000 which is 1 MB. -# maxTransferFileSize: ${server.maxTransferFileSize:1000000} diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e235753e..052163fb 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -20,16 +20,16 @@ 5.11.3 2.3.18.Final 1.5.1 - @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ + @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || config.get("supportH2ForTest").booleanValue()){ 3.1.0 } - @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 } - @if(config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 8.0.32 } - @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ @@ -66,17 +66,17 @@ com.networknt - traceability + correlation ${version.light-4j} com.networknt - correlation + rpc-router ${version.light-4j} com.networknt - rpc-router + rpc-security ${version.light-4j} @@ -91,12 +91,37 @@ com.networknt - cors + logger-handler + ${version.light-4j} + + + com.networknt + config-reload + ${version.light-4j} + + + com.networknt + cache-manager ${version.light-4j} com.networknt - jaeger-tracing + caffeine-cache + ${version.light-4j} + + + com.networknt + cache-explorer + ${version.light-4j} + + + com.networknt + body + ${version.light-4j} + + + com.networknt + cors ${version.light-4j} @@ -155,28 +180,28 @@ undertow-core ${version.undertow} - @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ + @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ com.zaxxer HikariCP ${version.hikaricp} } - @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ com.oracle ojdbc6 ${version.oracle} } - @if(config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "mysql".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ mysql mysql-connector-java ${version.mysql} } - @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ + @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ org.postgresql postgresql diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/serviceYml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/serviceYml.rocker.raw deleted file mode 100644 index 25f37d76..00000000 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/serviceYml.rocker.raw +++ /dev/null @@ -1,41 +0,0 @@ -@import com.fasterxml.jackson.databind.JsonNode -@args (JsonNode config) -# Singleton service factory configuration/IoC injection -singletons: -# StartupHookProvider implementations, there are one to many and they are called in the same sequence defined. -- com.networknt.server.StartupHookProvider: - # registry all service handlers by from annotations - - com.networknt.rpc.router.RpcStartupHookProvider - @if(config.get("kafkaProducer").booleanValue()){ - # Kafka producer startup hook example - # - net.lightapi.portal.user.command.UserCommandStartup - } - @if(config.get("kafkaConsumer").booleanValue()){ - # Kafka consumer startup hook example - # - net.lightapi.portal.user.query.UserQueryStartup - } -# ShutdownHookProvider implementations, there are one to many and they are called in the same sequence defined. -- com.networknt.server.ShutdownHookProvider: - @if(config.get("kafkaProducer").booleanValue()){ - # Kafka producer startup hook example - # - net.lightapi.portal.user.command.UserCommandShutdown - } - @if(config.get("kafkaConsumer").booleanValue()){ - # Kafka consumer startup hook example - # - net.lightapi.portal.user.query.UserQueryShutdown - } -@if(config.get("kafkaProducer").booleanValue()){ -# Kafka Producer instance -- com.networknt.kafka.producer.NativeLightProducer: - - com.networknt.kafka.producer.SidecarProducer -} -@if(config.get("kafkaStreams").booleanValue()){ -- com.networknt.kafka.streams.LightStreams: - # Kafka streams processor example - # - net.lightapi.portal.user.query.UserQueryStreams -} -@if(config.get("kafkaStreams").booleanValue()||config.get("kafkaProducer").booleanValue()||config.get("kafkaConsumer").booleanValue()){ -# Schema registry client -- io.confluent.kafka.schemaregistry.client.SchemaRegistryClient: - - com.networknt.kafka.common.LightSchemaRegistryClient -} diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw index 8f98d76b..2e7fc509 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw @@ -1,3 +1,5 @@ +@import com.fasterxml.jackson.databind.JsonNode +@args (JsonNode config, String handlerPackage, String jsonPath, String serviceId, Boolean enableHttp, String httpPort, Boolean enableHttps, String httpsPort, Boolean enableHttp2, Boolean enableRegistry, String version) #-------------------------------------------------------------------------------- # values.yml : Set of values commonly overridden in microservices #-------------------------------------------------------------------------------- @@ -5,10 +7,60 @@ # client.yml # server.yml -server.serviceId: com.networknt.placeholder-1.0.0 +server.serviceId: @serviceId +server.httpPort: @httpPort +server.enableHttp: @enableHttp +server.httpsPort: @httpsPort +server.enableHttps: @enableHttps +server.enableHttp2: @enableHttp2 +server.enableRegistry: @enableRegistry +server.buildNumber: @version + # security.yml security.enableVerifyJwt: true +# rpc-router.yml +rpc-router.handlerPackage: @handlerPackage +rpc-router.jsonPath: @jsonPath + # service.yml +# Singleton service factory configuration/IoC injection service.singletons: +# StartupHookProvider implementations, there are one to many and they are called in the same sequence defined. +- com.networknt.server.StartupHookProvider: + # registry all service handlers by from annotations + - com.networknt.rpc.router.RpcStartupHookProvider + @if(config.get("kafkaProducer").booleanValue()){ + # Kafka producer startup hook example + # - net.lightapi.portal.user.command.UserCommandStartup + } + @if(config.get("kafkaConsumer").booleanValue()){ + # Kafka consumer startup hook example + # - net.lightapi.portal.user.query.UserQueryStartup + } +# ShutdownHookProvider implementations, there are one to many and they are called in the same sequence defined. +- com.networknt.server.ShutdownHookProvider: + @if(config.get("kafkaProducer").booleanValue()){ + # Kafka producer startup hook example + # - net.lightapi.portal.user.command.UserCommandShutdown + } + @if(config.get("kafkaConsumer").booleanValue()){ + # Kafka consumer startup hook example + # - net.lightapi.portal.user.query.UserQueryShutdown + } +@if(config.get("kafkaProducer").booleanValue()){ +# Kafka Producer instance +- com.networknt.kafka.producer.NativeLightProducer: + - com.networknt.kafka.producer.SidecarProducer +} +@if(config.get("kafkaStreams").booleanValue()){ +- com.networknt.kafka.streams.LightStreams: + # Kafka streams processor example + # - net.lightapi.portal.user.query.UserQueryStreams +} +@if(config.get("kafkaStreams").booleanValue()||config.get("kafkaProducer").booleanValue()||config.get("kafkaConsumer").booleanValue()){ +# Schema registry client +- io.confluent.kafka.schemaregistry.client.SchemaRegistryClient: + - com.networknt.kafka.common.LightSchemaRegistryClient +} diff --git a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiKotlinGenerator.java b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiKotlinGenerator.java index 1f9fcaed..64d93a5a 100644 --- a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiKotlinGenerator.java +++ b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiKotlinGenerator.java @@ -120,9 +120,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, ("src.main.resources.config").replace(".", separator), "openapi-security.yml", templates.restkotlin.openapiSecurity.template()); transfer(targetPath, ("src.main.resources.config").replace(".", separator), "openapi-validator.yml", templates.restkotlin.openapiValidator.template()); - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "primary.crt", templates.restkotlin.primaryCrt.template()); - transfer(targetPath, ("src.main.resources.config").replace(".", separator), "secondary.crt", templates.restkotlin.secondaryCrt.template()); - // mask transfer(targetPath, ("src.main.resources.config").replace(".", separator), "mask.yml", templates.restkotlin.maskYml.template()); // logging diff --git a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLambdaGenerator.java b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLambdaGenerator.java index 657fd3e4..6f5edd81 100644 --- a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLambdaGenerator.java +++ b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLambdaGenerator.java @@ -123,8 +123,6 @@ public void generate(final String targetPath, Object model, JsonNode config) thr } transfer(targetPath, "proxy", "server.yml", templates.lambda.proxy.server.template(serviceId, enableRegistry, version)); - transfer(targetPath, "proxy", "primary.crt", templates.rest.primaryCrt.template()); - transfer(targetPath, "proxy", "secondary.crt", templates.rest.secondaryCrt.template()); // transfer binary files without touching them. try (InputStream is = OpenApiLambdaGenerator.class.getResourceAsStream("/binaries/server.keystore")) { Generator.copyFile(is, Paths.get(targetPath, "proxy", "server.keystore")); diff --git a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java index 6812450b..f3059c79 100644 --- a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java +++ b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java @@ -147,8 +147,6 @@ public void generate(final String targetPath, Object model, JsonNode config) thr transfer(targetPath, "", ".project", templates.rest.project.template(config)); } // config - transfer(targetPath, (configFolder).replace(".", separator), "primary.crt", templates.rest.primaryCrt.template()); - transfer(targetPath, (configFolder).replace(".", separator), "secondary.crt", templates.rest.secondaryCrt.template()); if(kafkaProducer) { transfer(targetPath, (configFolder).replace(".", separator), "kafka-producer.yml", templates.rest.kafkaProducerYml.template(kafkaTopic)); } diff --git a/light-rest-4j/src/main/resources/templates/rest/dockerfileslim.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/dockerfileslim.rocker.raw index 4867b985..13b0bd5b 100644 --- a/light-rest-4j/src/main/resources/templates/rest/dockerfileslim.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/dockerfileslim.rocker.raw @@ -1,6 +1,6 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config, String expose) -FROM openjdk:11.0.3-slim +FROM amazoncorretto:11.0.21 @if(config.get("multipleModule").booleanValue()){ @if(config.get("buildMaven").booleanValue()){ COPY /server/target/server.jar server.jar diff --git a/light-rest-4j/src/main/resources/templates/rest/handlerYml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/handlerYml.rocker.raw index b4f294e6..a64cbe5c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/handlerYml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/handlerYml.rocker.raw @@ -15,6 +15,9 @@ auditOnError: ${handler.auditOnError:false} # default, if not set:false auditStackTrace: ${handler.auditStackTrace:false} +# Base Path of the API endpoints +basePath: ${handler.basePath:/} + #------------------------------------------------------------------------------ # Support individual handler chains for each separate endpoint. It allows framework # handlers like health check, server info to bypass majority of the middleware handlers diff --git a/light-rest-4j/src/main/resources/templates/rest/primaryCrt.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/primaryCrt.rocker.raw deleted file mode 100644 index 34f9272f..00000000 --- a/light-rest-4j/src/main/resources/templates/rest/primaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDmzCCAoOgAwIBAgIEHnAgtDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEUMBIGA1UEBxMLTWlzc2lzc2F1Z2ExJjAkBgNVBAoTHU5ldHdvcmsgTmV3IFRl -Y2hub2xvZ2llcyBJbmMuMQwwCgYDVQQLEwNERVYxETAPBgNVBAMTCFN0ZXZlIEh1MB4XDTE2MDkw -MTE2MTYxNVoXDTI2MDcxMTE2MTYxNVowfjELMAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFyaW8x -FDASBgNVBAcTC01pc3Npc3NhdWdhMSYwJAYDVQQKEx1OZXR3b3JrIE5ldyBUZWNobm9sb2dpZXMg -SW5jLjEMMAoGA1UECxMDREVWMREwDwYDVQQDEwhTdGV2ZSBIdTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALrlxMtDb60DogElf4TBz504tRheZimAE0dJL/Yby4nacJdqvc5l4z+WWpDf -rI9krQ2Yi9yvhwAP+PrR6gWcIqWP4cpNE7XIAUDgr4CtyI7CptT/lpjtbkz4DGCMmaeDn0jqHqJt -SeSZGfwVu5zAGm8n4sHatjnnxBI/iWzkTII3V4xv0WeK37szNTEd+ly2ag7n2IV5zNnYmqZTeMQm -J2ENS+IwAG3ENtiVtrVTx/2bGtqutJjtdxsN58/cUG/guRyMT6OPI8Yi3ZzevdvRbxadyhEl/Kaw -6vJcdxmJI3tp4lx+p6sAxOWa7aapJe4JxutAQqzv0GKdVjoHKQ1wB60CAwEAAaMhMB8wHQYDVR0O -BBYEFIPF9SBd06RWU1eDL73CKfy01lavMA0GCSqGSIb3DQEBCwUAA4IBAQAoaKZGOak3Upz/ordF -slZoJuZlCu7jnKQEjYwHf3DNxcd1WmgFPtMcna6pW0VUxPIfidEA6VCMsGoK1RvshB0SjrRdCht6 -5qPXs9kV3NW0WvMiwDSYZZ9HgaZ9efTe5E9Fzc7ltKrE43L6k8NJcaEEWEdpdjFbrAqH4I+j/Vro -K3OhIo062fXjas5ipL4gF+3ECImjWzirQP8UiAfM0/36x7rtAu3btH/qI9hSyx39LBPPE5AsDJZ4 -dSMwNTW1gqmBAZIj+zQ/RD5dyWfPwON7Q+t96YbK6WBuYo0xy+I+PjcUgrWYWP3N24hlq8ZBIei+ -BudoEVJlIlmS0aRCuP8n ------END CERTIFICATE----- diff --git a/light-rest-4j/src/main/resources/templates/rest/secondaryCrt.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/secondaryCrt.rocker.raw deleted file mode 100644 index dfbd3cea..00000000 --- a/light-rest-4j/src/main/resources/templates/rest/secondaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDkzCCAnugAwIBAgIEUBGbJDANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEQMA4GA1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5v -bG9naWVzIEluYy4xDDAKBgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwHhcNMTYwOTIyMjI1 -OTIxWhcNMjYwODAxMjI1OTIxWjB6MQswCQYDVQQGEwJDQTEQMA4GA1UECBMHT250YXJpbzEQMA4G -A1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5vbG9naWVzIEluYy4xDDAK -BgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCqYfarFwug2DwpG/mmcW77OluaHVNsKEVJ/BptLp5suJAH/Z70SS5pwM4x2QwMOVO2ke8U -rsAws8allxcuKXrbpVt4evpO1Ly2sFwqB1bjN3+VMp6wcT+tSjzYdVGFpQAYHpeA+OLuoHtQyfpB -0KCveTEe3KAG33zXDNfGKTGmupZ3ZfmBLINoey/X13rY71ITt67AY78VHUKb+D53MBahCcjJ9YpJ -UHG+Sd3d4oeXiQcqJCBCVpD97awWARf8WYRIgU1xfCe06wQ3CzH3+GyfozLeu76Ni5PwE1tm7Dhg -EDSSZo5khmzVzo4G0T2sOeshePc5weZBNRHdHlJA0L0fAgMBAAGjITAfMB0GA1UdDgQWBBT9rnek -spnrFus5wTszjdzYgKll9TANBgkqhkiG9w0BAQsFAAOCAQEAT8udTfUGBgeWbN6ZAXRI64VsSJj5 -1sNUN1GPDADLxZF6jArKU7LjBNXn9bG5VjJqlx8hQ1SNvi/t7FqBRCUt/3MxDmGZrVZqLY1kZ2e7 -x+5RykbspA8neEUtU8sOr/NP3O5jBjU77EVec9hNNT5zwKLevZNL/Q5mfHoc4GrIAolQvi/5fEqC -8OMdOIWS6sERgjaeI4tXxQtHDcMo5PeLW0/7t5sgEsadZ+pkdeEMVTmLfgf97bpNNI7KF5uEbYnQ -NpwCT+NNC5ACmJmKidrfW23kml1C7vr7YzTevw9QuH/hN8l/Rh0fr+iPEVpgN6Zv00ymoKGmjuuW -owVmdKg/0w== ------END CERTIFICATE----- diff --git a/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw index a5ef74e4..9c52351d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/values.rocker.raw @@ -6,12 +6,10 @@ #-------------------------------------------------------------------------------- # client.yml -# https://github.com/networknt/light-4j/blob/master/client/src/main/resources/config/client.yml client.timeout: 3000 client.verifyHostname: true # server.yml -# https://github.com/networknt/light-4j/blob/master/server/src/main/resources/config/server.yml server.httpPort: @httpPort server.enableHttp: @enableHttp server.httpsPort: @httpsPort @@ -30,13 +28,7 @@ metrics.enabled: false # service.yml service.singletons: - com.networknt.registry.URL: - - com.networknt.registry.URLImpl: - protocol: light - host: localhost - port: 8080 - path: portal - parameters: - registryRetryPeriod: '30000' + - com.networknt.registry.URLImpl - com.networknt.portal.registry.client.PortalRegistryClient: - com.networknt.portal.registry.client.PortalRegistryClientImpl - com.networknt.registry.Registry: diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/primaryCrt.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/primaryCrt.rocker.raw deleted file mode 100644 index 34f9272f..00000000 --- a/light-rest-4j/src/main/resources/templates/restkotlin/primaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDmzCCAoOgAwIBAgIEHnAgtDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEUMBIGA1UEBxMLTWlzc2lzc2F1Z2ExJjAkBgNVBAoTHU5ldHdvcmsgTmV3IFRl -Y2hub2xvZ2llcyBJbmMuMQwwCgYDVQQLEwNERVYxETAPBgNVBAMTCFN0ZXZlIEh1MB4XDTE2MDkw -MTE2MTYxNVoXDTI2MDcxMTE2MTYxNVowfjELMAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFyaW8x -FDASBgNVBAcTC01pc3Npc3NhdWdhMSYwJAYDVQQKEx1OZXR3b3JrIE5ldyBUZWNobm9sb2dpZXMg -SW5jLjEMMAoGA1UECxMDREVWMREwDwYDVQQDEwhTdGV2ZSBIdTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALrlxMtDb60DogElf4TBz504tRheZimAE0dJL/Yby4nacJdqvc5l4z+WWpDf -rI9krQ2Yi9yvhwAP+PrR6gWcIqWP4cpNE7XIAUDgr4CtyI7CptT/lpjtbkz4DGCMmaeDn0jqHqJt -SeSZGfwVu5zAGm8n4sHatjnnxBI/iWzkTII3V4xv0WeK37szNTEd+ly2ag7n2IV5zNnYmqZTeMQm -J2ENS+IwAG3ENtiVtrVTx/2bGtqutJjtdxsN58/cUG/guRyMT6OPI8Yi3ZzevdvRbxadyhEl/Kaw -6vJcdxmJI3tp4lx+p6sAxOWa7aapJe4JxutAQqzv0GKdVjoHKQ1wB60CAwEAAaMhMB8wHQYDVR0O -BBYEFIPF9SBd06RWU1eDL73CKfy01lavMA0GCSqGSIb3DQEBCwUAA4IBAQAoaKZGOak3Upz/ordF -slZoJuZlCu7jnKQEjYwHf3DNxcd1WmgFPtMcna6pW0VUxPIfidEA6VCMsGoK1RvshB0SjrRdCht6 -5qPXs9kV3NW0WvMiwDSYZZ9HgaZ9efTe5E9Fzc7ltKrE43L6k8NJcaEEWEdpdjFbrAqH4I+j/Vro -K3OhIo062fXjas5ipL4gF+3ECImjWzirQP8UiAfM0/36x7rtAu3btH/qI9hSyx39LBPPE5AsDJZ4 -dSMwNTW1gqmBAZIj+zQ/RD5dyWfPwON7Q+t96YbK6WBuYo0xy+I+PjcUgrWYWP3N24hlq8ZBIei+ -BudoEVJlIlmS0aRCuP8n ------END CERTIFICATE----- diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/secondaryCrt.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/secondaryCrt.rocker.raw deleted file mode 100644 index dfbd3cea..00000000 --- a/light-rest-4j/src/main/resources/templates/restkotlin/secondaryCrt.rocker.raw +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDkzCCAnugAwIBAgIEUBGbJDANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJDQTEQMA4GA1UE -CBMHT250YXJpbzEQMA4GA1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5v -bG9naWVzIEluYy4xDDAKBgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwHhcNMTYwOTIyMjI1 -OTIxWhcNMjYwODAxMjI1OTIxWjB6MQswCQYDVQQGEwJDQTEQMA4GA1UECBMHT250YXJpbzEQMA4G -A1UEBxMHVG9yb250bzEmMCQGA1UEChMdTmV0d29yayBOZXcgVGVjaG5vbG9naWVzIEluYy4xDDAK -BgNVBAsTA0FQSTERMA8GA1UEAxMIU3RldmUgSHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCqYfarFwug2DwpG/mmcW77OluaHVNsKEVJ/BptLp5suJAH/Z70SS5pwM4x2QwMOVO2ke8U -rsAws8allxcuKXrbpVt4evpO1Ly2sFwqB1bjN3+VMp6wcT+tSjzYdVGFpQAYHpeA+OLuoHtQyfpB -0KCveTEe3KAG33zXDNfGKTGmupZ3ZfmBLINoey/X13rY71ITt67AY78VHUKb+D53MBahCcjJ9YpJ -UHG+Sd3d4oeXiQcqJCBCVpD97awWARf8WYRIgU1xfCe06wQ3CzH3+GyfozLeu76Ni5PwE1tm7Dhg -EDSSZo5khmzVzo4G0T2sOeshePc5weZBNRHdHlJA0L0fAgMBAAGjITAfMB0GA1UdDgQWBBT9rnek -spnrFus5wTszjdzYgKll9TANBgkqhkiG9w0BAQsFAAOCAQEAT8udTfUGBgeWbN6ZAXRI64VsSJj5 -1sNUN1GPDADLxZF6jArKU7LjBNXn9bG5VjJqlx8hQ1SNvi/t7FqBRCUt/3MxDmGZrVZqLY1kZ2e7 -x+5RykbspA8neEUtU8sOr/NP3O5jBjU77EVec9hNNT5zwKLevZNL/Q5mfHoc4GrIAolQvi/5fEqC -8OMdOIWS6sERgjaeI4tXxQtHDcMo5PeLW0/7t5sgEsadZ+pkdeEMVTmLfgf97bpNNI7KF5uEbYnQ -NpwCT+NNC5ACmJmKidrfW23kml1C7vr7YzTevw9QuH/hN8l/Rh0fr+iPEVpgN6Zv00ymoKGmjuuW -owVmdKg/0w== ------END CERTIFICATE----- From 3bd0262af821cb32c5827f03ea278bb5dc7269db Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 20 Dec 2024 20:40:11 -0500 Subject: [PATCH 22/81] update logback.xml templete to remove comments --- .../src/main/resources/templates/hybrid/logback.rocker.raw | 2 -- 1 file changed, 2 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw index 73e1812e..6c7f2a70 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw @@ -16,8 +16,6 @@ --> - TODO create logger for audit only. - http://stackoverflow.com/questions/2488558/logback-to-log-different-messages-to-two-files PROFILER From 797dc62158484648f3c4f4fd3d56cf61ad514ead Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 26 Dec 2024 18:30:47 -0500 Subject: [PATCH 23/81] update comment in config file --- codegen-web/src/test/resources/config/values.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/codegen-web/src/test/resources/config/values.yml b/codegen-web/src/test/resources/config/values.yml index 71cd6357..e831166b 100644 --- a/codegen-web/src/test/resources/config/values.yml +++ b/codegen-web/src/test/resources/config/values.yml @@ -5,7 +5,6 @@ server.httpsPort: 49588 server.enableHttps: false server.enableHttp2: false -# unified-security.yml # unified-security.yml unified-security.pathPrefixAuths: - prefix: /api/json From c4f94f4da796e47166f50597619b1cb5a4b114dc Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 8 Jan 2025 17:19:10 -0500 Subject: [PATCH 24/81] fixes #712 update rest template to build docker local only and xml to build fat jar by default --- .../codegen/rest/OpenApiLightGenerator.java | 2 +- .../templates/rest/buildSh.rocker.raw | 47 +++++- .../templates/rest/single/pom.xml.rocker.raw | 148 +++++++++--------- 3 files changed, 112 insertions(+), 85 deletions(-) diff --git a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java index f3059c79..0ecbc7a6 100644 --- a/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java +++ b/light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiLightGenerator.java @@ -137,7 +137,7 @@ public void generate(final String targetPath, Object model, JsonNode config) thr transfer(targetPath, "docker", "Dockerfile", templates.rest.dockerfile.template(config, expose)); transfer(targetPath, "docker", "Dockerfile-Slim", templates.rest.dockerfileslim.template(config, expose)); - transfer(targetPath, "", "build.sh", templates.rest.buildSh.template(config, serviceId)); + transfer(targetPath, "", "build.sh", templates.rest.buildSh.template(config)); transfer(targetPath, "", "kubernetes.yml", templates.rest.kubernetes.template(dockerOrganization, serviceId, config.get("artifactId").textValue(), expose, version)); transfer(targetPath, "", ".gitignore", templates.rest.gitignore.template()); transfer(targetPath, "", "README.md", templates.rest.README.template(config)); diff --git a/light-rest-4j/src/main/resources/templates/rest/buildSh.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/buildSh.rocker.raw index e457b603..39830a8b 100755 --- a/light-rest-4j/src/main/resources/templates/rest/buildSh.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/buildSh.rocker.raw @@ -1,28 +1,32 @@ @import com.fasterxml.jackson.databind.JsonNode -@args (JsonNode config, String serviceId) +@args (JsonNode config) #!/bin/bash set -ex -VERSION=$1 -IMAGE_NAME="@config.get("dockerOrganization").textValue()/@serviceId" +VERSION="" # Initialize VERSION as empty +IMAGE_NAME="@config.get("dockerOrganization").textValue()/@@config.get("artifactId").textValue()" +LOCAL_BUILD=false # Flag to track local build showHelp() { echo " " echo "Error: $1" echo " " - echo " build.sh [VERSION]" + echo " build.sh [VERSION] [-l|--local]" echo " " echo " where [VERSION] version of the docker image that you want to publish (example: 0.0.1)" + echo " [-l|--local] optional flag to only build the docker image locally" echo " " echo " example: ./build.sh 0.0.1" + echo " example: ./build.sh 0.0.1 -l" + echo " example: ./build.sh -l 0.0.1" echo " " } build() { echo "Building ..." @if(config.get("buildMaven").booleanValue()){ - ./mvnw clean install -Prelease + ./mvnw clean install }else{ ./gradlew clean build } @@ -42,14 +46,43 @@ publish() { docker build -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest -f ./docker/Dockerfile . --no-cache=true docker build -t $IMAGE_NAME:$VERSION-slim -f ./docker/Dockerfile-Slim . --no-cache=true echo "Images built with version $VERSION" + + if $LOCAL_BUILD; then + echo "Skipping DockerHub publish due to local build flag (-l or --local)" + else echo "Pushing image to DockerHub" docker push $IMAGE_NAME -a echo "Image successfully published!" + fi } -if [ -z $VERSION ]; then +# Parse command-line arguments in any order +while [[ $# -gt 0 ]]; do + case "$1" in + -l|--local) + LOCAL_BUILD=true + shift + ;; + -*) # Catch any other argument starting with - + showHelp "Invalid option: $1" + exit 1 + ;; + *) + if [[ -z "$VERSION" ]]; then + VERSION="$1" # Assign to VERSION if VERSION is not set yet + else + showHelp "Invalid option: $1" # error if VERSION is set already + exit 1 + fi + shift # Remove the processed argument + ;; + esac +done + +# Check if VERSION is empty after parsing +if [[ -z "$VERSION" ]]; then showHelp "[VERSION] parameter is missing" - exit + exit 1 fi build; diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index cdad3ecd..8de7f31c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -352,7 +352,7 @@ install target - ${project.artifactId}-${project.version} + server com.networknt @@ -410,6 +410,76 @@ + + org.apache.maven.plugins + maven-shade-plugin + ${version.maven-shade} + + + package + + shade + + + server + ${project.build.directory}/dependency-reduced-pom.xml + + + *:* + + module-info.class + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${version.maven-source} + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.maven-javadoc} + + + attach-javadocs + + jar + + + + + + org.codehaus.mojo + exec-maven-plugin + ${version.exec-maven} + + java + + -jar + ${project.build.directory}/${project.build.finalName}.${project.packaging} + + + + @@ -469,82 +539,6 @@ - - release - - - - org.apache.maven.plugins - maven-shade-plugin - ${version.maven-shade} - - - package - - shade - - - server - ${project.build.directory}/dependency-reduced-pom.xml - - - *:* - - module-info.class - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.maven-source} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.maven-javadoc} - - - attach-javadocs - - jar - - - - - - org.codehaus.mojo - exec-maven-plugin - ${version.exec-maven} - - java - - -jar - ${project.build.directory}/${project.build.finalName}.${project.packaging} - - - - - - debug From afc5877f564a0c0bd43a11b02b32ccd376a7bfab Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 10 Jan 2025 09:19:14 -0500 Subject: [PATCH 25/81] fixes #713 update hybrid generator pom.xml to fix the confluent url with https --- .../templates/hybrid/server/pom.xml.rocker.raw | 17 ++++++++++++++--- .../templates/hybrid/service/pom.xml.rocker.raw | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 3431f673..5367fdc3 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -354,16 +354,27 @@ @if(config.get("supportAvro").booleanValue()){ confluent - http://packages.confluent.io/maven/ + https://packages.confluent.io/maven/ - } - sonatype-snapshots + jitpack.io + https://jitpack.io + + } + + ossrh https://oss.sonatype.org/content/repositories/snapshots true + + s01 + https://s01.oss.sonatype.org/content/repositories/snapshots + + true + + diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 052163fb..260ce5fe 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -339,16 +339,27 @@ @if(config.get("supportAvro").booleanValue()){ confluent - http://packages.confluent.io/maven/ + https://packages.confluent.io/maven/ - } - sonatype-snapshots + jitpack.io + https://jitpack.io + + } + + ossrh https://oss.sonatype.org/content/repositories/snapshots true + + s01 + https://s01.oss.sonatype.org/content/repositories/snapshots + + true + + From 1106bead26776ff246fe2f7cfe9931e719c1c9d1 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 18 Jan 2025 13:19:56 -0500 Subject: [PATCH 26/81] fixes #715 update hybrid service generator to use spec.yaml and service.yml config --- codegen-web/src/main/resources/schema.json | 106 ------ codegen-web/src/main/resources/spec.yaml | 122 +++++++ .../hybrid/HybridServiceGenerator.java | 42 +-- .../templates/hybrid/handlerTest.rocker.raw | 10 +- .../templates/hybrid/values.rocker.raw | 2 +- .../hybrid/HybridServiceGeneratorTest.java | 8 +- .../src/test/resources/logback-test.xml | 2 +- .../src/test/resources/schema.json | 105 ------ .../src/test/resources/service.yaml | 27 ++ light-hybrid-4j/src/test/resources/spec.yaml | 306 ++++++++++++++++++ 10 files changed, 486 insertions(+), 244 deletions(-) delete mode 100644 codegen-web/src/main/resources/schema.json create mode 100644 codegen-web/src/main/resources/spec.yaml delete mode 100644 light-hybrid-4j/src/test/resources/schema.json create mode 100644 light-hybrid-4j/src/test/resources/service.yaml create mode 100644 light-hybrid-4j/src/test/resources/spec.yaml diff --git a/codegen-web/src/main/resources/schema.json b/codegen-web/src/main/resources/schema.json deleted file mode 100644 index 2eec45f5..00000000 --- a/codegen-web/src/main/resources/schema.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "lightapi.net/codegen/listFramework/0.0.1" : { - "schema": { - }, - "scope": "codegen.r" - }, - "lightapi.net/codegen/getSchema/0.0.1" : { - "schema": { - "title" : "Service", - "type" : "object", - "properties" : { - "framework": { - "type" : "string" - } - }, - "required" : ["framework"] - }, - "scope": "codegen.r" - }, - "lightapi.net/codegen/validateUploadFile/0.0.1" : { - "schema": { - }, - "scope": "codegen.r" - }, - "lightapi.net/codegen/multiple/0.0.1" : { - "schema": { - "title" : "Service", - "type" : "object", - "properties" : { - "generators" : { - "type" : "array", - "items": { - "properties": { - "modelType": { - "type": "string", - "enum": ["C", "U"] - }, - "modelText": { - "type": ["string", "object"] - }, - "modelUrl": { - "type": "string" - }, - "configType": { - "type": "string", - "enum": ["C", "U"] - }, - "configText" : { - "type": ["string", "object"] - }, - "configUrl": { - "type": "string" - }, - "framework": { - "type": "string" - }, - "release": { - "type": "string" - } - }, - "required": ["configType", "modelType", "framework", "release"] - }, - "maxItems": 5, - "minItems": 1 - } - } - }, - "scope": "codegen.w" - }, - "lightapi.net/codegen/single/0.0.1" : { - "schema": { - "title" : "Service", - "type" : "object", - "properties": { - "modelType": { - "type": "string", - "enum": ["C", "U"] - }, - "modelText": { - "type": ["string", "object"] - }, - "modelUrl": { - "type": "string" - }, - "configType": { - "type": "string", - "enum": ["C", "U"] - }, - "configText" : { - "type": ["string", "object"] - }, - "configUrl": { - "type": "string" - }, - "framework": { - "type" : "string" - }, - "release": { - "type" : "string" - } - }, - "required": ["configType", "modelType", "framework", "release"] - }, - "scope": "codegen.w" - } -} diff --git a/codegen-web/src/main/resources/spec.yaml b/codegen-web/src/main/resources/spec.yaml new file mode 100644 index 00000000..5d7b9aba --- /dev/null +++ b/codegen-web/src/main/resources/spec.yaml @@ -0,0 +1,122 @@ +--- +host: lightapi.net +service: codegen +schemas: + getSchemaRequest: + title: Service + type: object + properties: + framework: + type: string + required: + - framework + multipleRequest: + title: Service + type: object + properties: + generators: + type: array + items: + properties: + modelType: + type: string + enum: + - C + - U + modelText: + type: + - string + - object + modelUrl: + type: string + configType: + type: string + enum: + - C + - U + configText: + type: + - string + - object + configUrl: + type: string + framework: + type: string + release: + type: string + required: + - configType + - modelType + - framework + - release + maxItems: 5 + minItems: 1 + singleRequest: + title: Service + type: object + properties: + modelType: + type: string + enum: + - C + - U + modelText: + type: + - string + - object + modelUrl: + type: string + configType: + type: string + enum: + - C + - U + configText: + type: + - string + - object + configUrl: + type: string + framework: + type: string + release: + type: string + required: + - configType + - modelType + - framework + - release +action: + - name: listFramework + version: 0.0.1 + handler: ListFramework + scope: codegen.r + request: + schema: {} + - name: getSchema + version: 0.0.1 + handler: GetSchema + scope: codegen.r + request: + schema: + $ref: '#/schemas/getSchemaRequest' + - name: validateUploadFile + version: 0.0.1 + handler: ValidateUploadFile + scope: codegen.r + request: + schema: {} + - name: multiple + version: 0.0.1 + handler: Multiple + scope: codegen.w + request: + schema: + $ref: '#/schemas/multipleRequest' + - name: single + version: 0.0.1 + handler: Single + scope: codegen.w + request: + schema: + $ref: '#/schemas/singleRequest' \ No newline at end of file diff --git a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java index 542ef62d..437827cc 100644 --- a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java +++ b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java @@ -3,20 +3,16 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.networknt.codegen.Generator; +import com.networknt.config.JsonMapper; import org.apache.commons.text.StringEscapeUtils; import java.io.ByteArrayInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import static java.io.File.separator; @@ -101,7 +97,6 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO transfer(targetPath, ("src.test.resources.config").replace(".", separator), "values.yml", templates.hybrid.values.template(config, handlerPackage, jsonPath, serviceId, enableHttp, "49587", enableHttps, "49588", enableHttp2, enableRegistry, version)); // handler - Map services = new TreeMap(); JsonNode anyModel = (JsonNode)model; String host = anyModel.get("host").textValue(); String service = anyModel.get("service").textValue(); @@ -109,31 +104,36 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO if(jsonNode != null && jsonNode.isArray()) { ArrayNode items = (ArrayNode)jsonNode; for(JsonNode item : items) { - JsonNode any = item.get("example"); + JsonNode response = item.get("response"); + JsonNode any = response == null ? null : response.get("example"); String example = any != null ? StringEscapeUtils.escapeJson(any.toString()).trim() : ""; if(!overwriteHandler && checkExist(targetPath, ("src.main.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + ".java")) { continue; } transfer(targetPath, ("src.main.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + ".java", templates.hybrid.handler.template(handlerPackage, host, service, item, example)); - String sId = host + "/" + service + "/" + item.get("name").textValue() + "/" + item.get("version").textValue(); - Map map = new TreeMap<>(); - map.put("schema", item.get("schema")); - JsonNode anyScope = item.get("scope"); - String scope = anyScope != null ? anyScope.textValue().trim() : null; - if(scope != null) map.put("scope", scope); - JsonNode anySkipAuth = item.get("skipAuth"); - Boolean skipAuth = anySkipAuth != null ? anySkipAuth.booleanValue() : false; - if(skipAuth != null) map.put("skipAuth", skipAuth); - services.put(sId, map); } // handler test cases transfer(targetPath, ("src.test.java." + handlerPackage + ".").replace(".", separator), "TestServer.java", templates.hybrid.testServer.template(handlerPackage)); for(JsonNode item : items) { + JsonNode request = item.get("request"); + JsonNode any = request == null ? null : request.get("example"); + String example = any != null ? any.toString() : null; + String body = ""; + if(example != null) { + Map map = new LinkedHashMap<>(); + map.put("host", host); + map.put("service", service); + map.put("action", item.get("name")); + map.put("version", item.get("version")); + map.put("data", JsonMapper.string2Map(example)); + body = Generator.jsonMapper.writeValueAsString(map); + body = StringEscapeUtils.escapeJson(body); + } if(!overwriteHandlerTest && checkExist(targetPath, ("src.test.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + "Test.java")) { continue; } - transfer(targetPath, ("src.test.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + "Test.java", templates.hybrid.handlerTest.template(handlerPackage, host, service, item)); + transfer(targetPath, ("src.test.java." + handlerPackage).replace(".", separator), item.get("handler").textValue() + "Test.java", templates.hybrid.handlerTest.template(handlerPackage, host, service, body, jsonPath, item)); } } @@ -160,8 +160,8 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO templates.hybrid.handlerYml.template(serviceId, handlerPackage, jsonPath, prometheusMetrics)); // write the generated schema into the config folder for schema validation. - try (InputStream is = new ByteArrayInputStream(Generator.jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsBytes(services))) { - Generator.copyFile(is, Paths.get(targetPath, ("src.main.resources").replace(".", separator), "schema.json")); + try (InputStream is = new ByteArrayInputStream(Generator.yamlMapper.writeValueAsBytes(model))) { + Generator.copyFile(is, Paths.get(targetPath, ("src.main.resources.config").replace(".", separator), "spec.yaml")); } } } diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/handlerTest.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/handlerTest.rocker.raw index 426cceda..90499295 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/handlerTest.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/handlerTest.rocker.raw @@ -1,5 +1,5 @@ @import com.fasterxml.jackson.databind.JsonNode -@args (String handlerPackage, String host, String service, JsonNode item) +@args (String handlerPackage, String host, String service, String body, String jsonPath, JsonNode item) package @handlerPackage; import com.networknt.client.Http2Client; @@ -39,7 +39,6 @@ import java.util.concurrent.atomic.AtomicReference; @@Test @with(s3 = item.get("handler").textValue() + "()") {public void test@s3} throws ClientException, ApiException { - /* final CountDownLatch latch = new CountDownLatch(1); SimpleConnectionHolder.ConnectionToken connectionToken = null; @@ -51,12 +50,12 @@ import java.util.concurrent.atomic.AtomicReference; connectionToken = client.borrow(new URI(url), Http2Client.WORKER, Http2Client.BUFFER_POOL, OptionMap.EMPTY); } ClientConnection connection = (ClientConnection) connectionToken.getRawConnection(); - - ClientRequest request = new ClientRequest().setPath("/api/json").setMethod(Methods.POST); + String body = "@body"; + ClientRequest request = new ClientRequest().setPath("@jsonPath").setMethod(Methods.POST); request.getRequestHeaders().put(Headers.CONTENT_TYPE, "application/json"); request.getRequestHeaders().put(Headers.TRANSFER_ENCODING, "chunked"); request.getRequestHeaders().put(new HttpString("host"), "localhost"); - connection.sendRequest(request, client.createClientCallback(reference, latch, "request body to be replaced")); + connection.sendRequest(request, client.createClientCallback(reference, latch, body)); latch.await(); } catch (Exception e) { logger.error("Exception: ", e); @@ -68,6 +67,5 @@ import java.util.concurrent.atomic.AtomicReference; String body = reference.get().getAttachment(Http2Client.RESPONSE_BODY); Assertions.assertEquals(200, statusCode); Assertions.assertNotNull(body); - */ } } diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw index 2e7fc509..e7d85678 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/values.rocker.raw @@ -18,7 +18,7 @@ server.buildNumber: @version # security.yml -security.enableVerifyJwt: true +security.enableVerifyJwt: false # rpc-router.yml rpc-router.handlerPackage: @handlerPackage diff --git a/light-hybrid-4j/src/test/java/com/networknt/codegen/hybrid/HybridServiceGeneratorTest.java b/light-hybrid-4j/src/test/java/com/networknt/codegen/hybrid/HybridServiceGeneratorTest.java index 20fdb766..40ec7dae 100644 --- a/light-hybrid-4j/src/test/java/com/networknt/codegen/hybrid/HybridServiceGeneratorTest.java +++ b/light-hybrid-4j/src/test/java/com/networknt/codegen/hybrid/HybridServiceGeneratorTest.java @@ -15,8 +15,8 @@ */ public class HybridServiceGeneratorTest { public static String targetPath = "/tmp/hybridservice"; - public static String configName = "/serviceConfig.json"; - public static String schemaName = "/schema.json"; + public static String configName = "/service.yaml"; + public static String schemaName = "/spec.yaml"; @BeforeAll public static void setUp() throws IOException { @@ -31,8 +31,8 @@ public static void tearDown() throws IOException { @Test public void testGenerator() throws IOException { - JsonNode config = Generator.jsonMapper.readTree(HybridServiceGeneratorTest.class.getResourceAsStream(configName)); - JsonNode model = Generator.jsonMapper.readTree(HybridServiceGeneratorTest.class.getResourceAsStream(schemaName)); + JsonNode config = Generator.yamlMapper.readTree(HybridServiceGeneratorTest.class.getResourceAsStream(configName)); + JsonNode model = Generator.yamlMapper.readTree(HybridServiceGeneratorTest.class.getResourceAsStream(schemaName)); HybridServiceGenerator generator = new HybridServiceGenerator(); generator.generate(targetPath, model, config); } diff --git a/light-hybrid-4j/src/test/resources/logback-test.xml b/light-hybrid-4j/src/test/resources/logback-test.xml index 6b5cdba6..bf032058 100644 --- a/light-hybrid-4j/src/test/resources/logback-test.xml +++ b/light-hybrid-4j/src/test/resources/logback-test.xml @@ -25,7 +25,7 @@ - + diff --git a/light-hybrid-4j/src/test/resources/schema.json b/light-hybrid-4j/src/test/resources/schema.json deleted file mode 100644 index 60194d99..00000000 --- a/light-hybrid-4j/src/test/resources/schema.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "host": "lightapi.net", - "service": "world", - "action": [ - { - "name": "hello", - "version": "0.1.0", - "handler": "HelloWorld1", - "scope" : "world.r", - "schema": { - "title": "Service", - "type": "object", - "properties": { - "firstName": { - "type": "string" - }, - "lastName": { - "type": "string" - }, - "age": { - "description": "Age in years", - "type": "integer", - "minimum": 0 - } - }, - "required": ["firstName", "lastName"] - }, - "example": {"message": "Hello World"} - }, - { - "name": "hello", - "version": "0.1.1", - "handler": "HelloWorld2", - "scope" : "world.r", - "schema": { - "title": "Service", - "type": "object", - "properties": { - "firstName": { - "type": "string" - }, - "lastName": { - "type": "string" - }, - "age": { - "description": "Age in years", - "type": "integer", - "minimum": 0 - } - }, - "required": ["firstName", "lastName"] - }, - "example": [{"message": "Hello World"}] - }, - { - "name": "hi", - "version": "0.0.1", - "handler": "HiWorld", - "scope" : "world.r", - "schema": { - "title": "Service", - "type": "object", - "properties": { - "firstName": { - "type": "string" - }, - "lastName": { - "type": "string" - }, - "age": { - "description": "Age in years", - "type": "integer", - "minimum": 0 - } - }, - "required": ["firstName", "lastName"] - }, - "example": [{"message": "Hello World"},{"message": "Hi World"}] - }, - { - "name": "welcome", - "version": "0.0.1", - "handler": "WelcomeWorld", - "scope" : "world.w", - "schema": { - "title": "Service", - "type": "object", - "properties": { - "firstName": { - "type": "string" - }, - "lastName": { - "type": "string" - }, - "age": { - "description": "Age in years", - "type": "integer", - "minimum": 0 - } - }, - "required": ["firstName", "lastName"] - } - } - ] -} diff --git a/light-hybrid-4j/src/test/resources/service.yaml b/light-hybrid-4j/src/test/resources/service.yaml new file mode 100644 index 00000000..2d8da681 --- /dev/null +++ b/light-hybrid-4j/src/test/resources/service.yaml @@ -0,0 +1,27 @@ +--- +name: rule-command +version: 1.0.1 +groupId: net.lightapi +artifactId: rule-command +rootPackage: com.networknt.rule +handlerPackage: com.networknt.rule.handler +modelPackage: com.networknt.rule.model +overwriteHandler: true +overwriteHandlerTest: true +httpPort: 8080 +enableHttp: true +httpsPort: 8443 +enableHttps: false +enableHttp2: false +enableRegistry: false +supportDb: true +jsonPath: "/portal/command" +dbInfo: + name: mysql + driverClassName: com.mysql.jdbc.Driver + jdbcUrl: jdbc:mysql://mysqldb:3306/oauth2?useSSL=false + username: root + password: my-secret-pw +supportH2ForTest: false +supportClient: false +buildMaven: true diff --git a/light-hybrid-4j/src/test/resources/spec.yaml b/light-hybrid-4j/src/test/resources/spec.yaml new file mode 100644 index 00000000..3aaf753b --- /dev/null +++ b/light-hybrid-4j/src/test/resources/spec.yaml @@ -0,0 +1,306 @@ +--- +host: lightapi.net +service: rule +action: + - name: createRule + version: 0.1.0 + handler: CreateRule + scope: portal.w + request: + schema: + $ref: "#/schemas/createRuleRequest" + example: + hostId: "host123" + ruleId: "rule456" + ruleName: "My New Rule" + ruleVersion: "1.0" + ruleType: "Authorization" + ruleGroup: "Security" + ruleDesc: "This is a rule description for my new rule" + ruleOwner: "admin" + common: "Y" + conditions: + - field: "user_type" + operator: "equals" + value: "employee" + - field: "department" + operator: "contains" + value: "IT" + response: + schema: + $ref: "#/schemas/createRuleResponse" + example: + hostId: "host123" + ruleId: "rule456" + ruleName: "My New Rule" + ruleVersion: "1.0" + ruleType: "Authorization" + ruleGroup: "Security" + ruleDesc: "This is a rule description for my new rule" + ruleOwner: "admin" + common: "Y" + conditions: + - field: "user_type" + operator: "equals" + value: "employee" + - field: "department" + operator: "contains" + value: "IT" + - name: updateRule + version: 0.1.0 + handler: UpdateRule + scope: portal.w + request: + schema: + $ref: "#/schemas/updateRuleRequest" + example: + ruleId: "rule456" + ruleName: "Updated Rule Name" + ruleVersion: "1.1" + ruleType: "Validation" + ruleGroup: "Compliance" + ruleDesc: "Updated rule description" + ruleOwner: "manager" + common: "N" + conditions: + - field: "status" + operator: "not_equals" + value: "pending" + response: + schema: + $ref: "#/schemas/updateRuleResponse" + example: + ruleId: "rule456" + ruleName: "Updated Rule Name" + ruleVersion: "1.1" + ruleType: "Validation" + ruleGroup: "Compliance" + ruleDesc: "Updated rule description" + ruleOwner: "manager" + common: "N" + conditions: + - field: "status" + operator: "not_equals" + value: "pending" + + - name: deleteRule + version: 0.1.0 + handler: DeleteRule + scope: portal.w + request: + schema: + $ref: "#/schemas/deleteRuleRequest" + example: + hostId: "host123" + ruleId: "rule456" + response: + schema: + $ref: "#/schemas/deleteRuleResponse" + example: + hostId: "host123" + ruleId: "rule456" +schemas: + createRuleRequest: + title: Create Rule + type: object + properties: + hostId: + type: string + description: Host Id + ruleId: + type: string + description: Rule id + ruleName: + type: string + description: Rule Name + ruleVersion: + type: string + description: Rule Version + ruleType: + type: string + description: Rule Type + ruleGroup: + type: string + description: Rule Group + ruleDesc: + type: string + description: Rule desc + ruleOwner: + type: string + description: Rule Owner + common: + type: string + enum: + - Y + - N + description: Common + conditions: + type: array + items: + type: object + description: Rule Conditions + required: + - hostId + - ruleId + - ruleName + - ruleVersion + - ruleType + - ruleOwner + - common + - conditions + createRuleResponse: + title: Create Rule + type: object + properties: + hostId: + type: string + description: Host Id + ruleId: + type: string + description: Rule id + ruleName: + type: string + description: Rule Name + ruleVersion: + type: string + description: Rule Version + ruleType: + type: string + description: Rule Type + ruleGroup: + type: string + description: Rule Group + ruleDesc: + type: string + description: Rule desc + ruleOwner: + type: string + description: Rule Owner + common: + type: string + enum: + - Y + - N + description: Common + conditions: + type: array + items: + type: object + description: Rule Conditions + required: + - hostId + - ruleId + - ruleName + - ruleVersion + - ruleType + - ruleOwner + - common + - conditions + updateRuleRequest: + title: Update Rule + type: object + properties: + ruleId: + type: string + description: Rule id + ruleName: + type: string + description: Rule Name + ruleVersion: + type: string + description: Rule Version + ruleType: + type: string + description: Rule Type + ruleGroup: + type: string + description: Rule Group + ruleDesc: + type: string + description: Rule Desc + ruleOwner: + type: string + description: Rule Owner + common: + type: string + description: Common Flag + conditions: + type: array + items: + type: object + description: Rule Conditions + required: + - ruleId + - ruleName + - ruleVersion + - ruleType + - ruleOwner + - common + - conditions + updateRuleResponse: + title: Update Rule + type: object + properties: + ruleId: + type: string + description: Rule id + ruleName: + type: string + description: Rule Name + ruleVersion: + type: string + description: Rule Version + ruleType: + type: string + description: Rule Type + ruleGroup: + type: string + description: Rule Group + ruleDesc: + type: string + description: Rule Desc + ruleOwner: + type: string + description: Rule Owner + common: + type: string + description: Common Flag + conditions: + type: array + items: + type: object + description: Rule Conditions + required: + - ruleId + - ruleName + - ruleVersion + - ruleType + - ruleOwner + - common + - conditions + deleteRuleRequest: + title: Delete Rule + type: object + properties: + hostId: + type: string + description: Host Id + ruleId: + type: string + description: Rule Id + required: + - hostId + - ruleId + deleteRuleResponse: + title: Delete Rule + type: object + properties: + hostId: + type: string + description: Host Id + ruleId: + type: string + description: Rule Id + required: + - hostId + - ruleId From 634e9a7d11df516f147aaac8cb7783260628105e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 18 Jan 2025 13:58:13 -0500 Subject: [PATCH 27/81] fixes #716 generate the spec.yaml to the resource folder --- .../com/networknt/codegen/hybrid/HybridServiceGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java index 437827cc..1f74501f 100644 --- a/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java +++ b/light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java @@ -161,7 +161,7 @@ public void generate(String targetPath, Object model, JsonNode config) throws IO // write the generated schema into the config folder for schema validation. try (InputStream is = new ByteArrayInputStream(Generator.yamlMapper.writeValueAsBytes(model))) { - Generator.copyFile(is, Paths.get(targetPath, ("src.main.resources.config").replace(".", separator), "spec.yaml")); + Generator.copyFile(is, Paths.get(targetPath, ("src.main.resources").replace(".", separator), "spec.yaml")); } } } From 7b53c3fc6d98ba115c7c021d6b4a1e7ef30b1d8d Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 18 Jan 2025 21:17:16 -0500 Subject: [PATCH 28/81] fixes #717 update license logback and gitignore --- .../templates/hybrid/LICENSE.rocker.raw | 2 +- .../templates/hybrid/gitignore.rocker.raw | 17 ++++++++++++++++- .../templates/hybrid/logback.rocker.raw | 8 ++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/LICENSE.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/LICENSE.rocker.raw index d26ed5e2..261eeb9e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/LICENSE.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/LICENSE.rocker.raw @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} [name of copyright owner] + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/gitignore.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/gitignore.rocker.raw index 7883fdc0..98967ea7 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/gitignore.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/gitignore.rocker.raw @@ -11,9 +11,24 @@ dist/ *.iml *.log *.tmp -*.zip *.bak dependency-reduced-pom.xml +# Compiled class file +*.class + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.tar.gz +*.rar +*.zip + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +replay_pid* diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw index 6c7f2a70..390e4c1e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/logback.rocker.raw @@ -61,8 +61,12 @@ - - + + + + + + From 12cbd6407d163b2a466755c8ec68a30faddc05a4 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Mon, 20 Jan 2025 22:51:00 -0500 Subject: [PATCH 29/81] fixes #718 upgrade hybrid to java 17 and remove release for service --- .../hybrid/server/pom.xml.rocker.raw | 2 +- .../hybrid/service/pom.xml.rocker.raw | 77 +------------------ 2 files changed, 2 insertions(+), 77 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 5367fdc3..38d549e9 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -9,7 +9,7 @@ @config.get("version").textValue() - 11 + 17 UTF-8 com.networknt.server.Server 2.2.0-SNAPSHOT diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 260ce5fe..d9323d05 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -9,7 +9,7 @@ @config.get("version").textValue() - 11 + 17 UTF-8 com.networknt.server.Server 2.2.0-SNAPSHOT @@ -363,81 +363,6 @@ - - release - - - - org.apache.maven.plugins - maven-shade-plugin - ${version.maven-shade} - - - package - - shade - - - ${project.build.directory}/dependency-reduced-pom.xml - - - *:* - - module-info.class - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.maven-source} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.maven-javadoc} - - - attach-javadocs - - jar - - - - - - org.codehaus.mojo - exec-maven-plugin - ${version.exec-maven} - - java - - -jar - ${project.build.directory}/${project.build.finalName}.${project.packaging} - - - - - - debug From 5a6156d4ef729dfe57bf1b981747816e2caa3c6d Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 21 Jan 2025 15:18:07 -0500 Subject: [PATCH 30/81] upgrade snakeyaml to 2.3 --- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 0321d7e5..ef29e78c 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.16 1.5.12 1.5.1 - 2.2 + 2.3 1.2.3 3.14.0 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 32b500ef..1eee2d8f 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.16 1.5.12 1.5.1 - 2.2 + 2.3 1.2.3 3.14.0 5.11.3 diff --git a/pom.xml b/pom.xml index 0d763f8e..1d95a2ce 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.8.0 2.1.10 1.5.1 - 2.2 + 2.3 1.2.1 1.82 22.2 From 54b3d3594b50f001171e117158761003527d3af8 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 7 Feb 2025 11:07:51 -0500 Subject: [PATCH 31/81] downgrade kafka to 3.8.1 --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 38d549e9..95719958 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.6.0 + 3.8.1 } 2.4 1.0.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index d9323d05..64fc0996 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.6.0 + 3.8.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index fc2edd40..c17b6b6c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.6.0 +kafkaVersion=3.8.1 light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 65673f9b..3aeed487 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.6.0 + 3.8.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index fc2edd40..c17b6b6c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.6.0 +kafkaVersion=3.8.1 light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 8de7f31c..ee5763ec 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.6.0 + 3.8.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 1167c6c7..f7f1a67b 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.6.0 +kafkaVersion=3.8.1 light4jVersion=2.2.0-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.18.Final From 6be0a1263d2f7cd7afe0ea872698feac52d2fafc Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 11 Feb 2025 17:30:12 -0500 Subject: [PATCH 32/81] upgrade to version 2.2.0 before release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 01ab53ff..8be10089 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 8febb8ee..1d97e44c 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 44fe0939..ef668434 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 8508b2ae..50e4e7f0 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 03c90065..198bf361 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 8639bfa9..8cfe4dec 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 8eee70c4..0de925d4 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 95719958..1a75c4bf 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 64fc0996..830a5556 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 8d5af710..62279dc3 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 213e1b68..80825be3 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.0-SNAPSHOT +light4jVersion=2.2.0 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index ef29e78c..4820c4a0 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 1.5.12 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index c17b6b6c..94ff8e81 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0-SNAPSHOT +light4jVersion=2.2.0 jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 3aeed487..e02df233 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index c17b6b6c..94ff8e81 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0-SNAPSHOT +light4jVersion=2.2.0 jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index ee5763ec..0766c3c2 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index f7f1a67b..5826fdbf 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0-SNAPSHOT +light4jVersion=2.2.0 jacksonVersion=2.18.1 undertowVersion=2.3.18.Final logbackVersion=1.5.12 diff --git a/pom.xml b/pom.xml index 1d95a2ce..47bc3313 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.0-SNAPSHOT + 2.2.0 pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.2.0-SNAPSHOT + 2.2.0 2.18.1 2.0.16 0.9.6 From 15576a98faf5e2aafed0e77da5f7aee8d88f83cd Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 11 Feb 2025 19:02:34 -0500 Subject: [PATCH 33/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9985f2bc..200168e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## [2.2.0](https://github.com/networknt/light-codegen/tree/2.2.0) (2025-02-11) + + +**Merged pull requests:** + + +- fixes \#710 update rest and hybrid generator [\#711](https://github.com/networknt/light-codegen/pull/711) ([stevehu](https://github.com/stevehu)) + + ## [2.1.37](https://github.com/networknt/light-codegen/tree/2.1.37) (2024-09-20) From a2f3a21c0c62a077ad0426f37e8479b6a578cbf5 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 12 Feb 2025 09:49:07 -0500 Subject: [PATCH 34/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 200168e8..8aa6670b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [2.2.0](https://github.com/networknt/light-codegen/tree/2.2.0) (2025-02-11) +## [2.2.0](https://github.com/networknt/light-codegen/tree/2.2.0) (2025-02-12) **Merged pull requests:** From 95888fb7dbb0eef99aa6d28c0697d692b5ef0299 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 12 Feb 2025 10:02:33 -0500 Subject: [PATCH 35/81] upgrade to version 2.2.1-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 8be10089..59ea450c 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 1d97e44c..aceed294 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index ef668434..9b028c42 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 50e4e7f0..82244727 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 198bf361..1fcab40c 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 8cfe4dec..4a3c7cd3 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 0de925d4..616d69ab 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 1a75c4bf..618f34d5 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 830a5556..e3270850 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 62279dc3..418c8654 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 80825be3..e5bd6cbd 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.0 +light4jVersion=2.2.1-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 4820c4a0..9a9327f0 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 1.5.12 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 94ff8e81..f0595d73 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0 +light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index e02df233..3678e49e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 94ff8e81..f0595d73 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0 +light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 0766c3c2..fc6d3c9e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 5826fdbf..213016b4 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.8.1 -light4jVersion=2.2.0 +light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.18.Final logbackVersion=1.5.12 diff --git a/pom.xml b/pom.xml index 47bc3313..8a591574 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.0 + 2.2.1-SNAPSHOT pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.2.0 + 2.2.1-SNAPSHOT 2.18.1 2.0.16 0.9.6 From 32a5a6b2721474e708adbfd4f77653cf58651f76 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 12 Feb 2025 10:49:50 -0500 Subject: [PATCH 36/81] update kafka to 3.7.2 --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 618f34d5..55bb2cb7 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.8.1 + 3.7.2 } 2.4 1.0.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e3270850..acd94a7d 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.8.1 + 3.7.2 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index f0595d73..3e2dbdd8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.8.1 +kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 3678e49e..1b3eea8b 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.8.1 + 3.7.2 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index f0595d73..3e2dbdd8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.8.1 +kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index fc6d3c9e..597f0c93 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.8.1 + 3.7.2 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 213016b4..705afe9c 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.8.1 +kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.18.Final From 895c60f4d5698214893382b56766f467459958d6 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 12 Feb 2025 14:59:13 -0500 Subject: [PATCH 37/81] update logback to 1.5.16 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 4a3c7cd3..528a8261 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.12 + 1.5.16 5.11.3 2.3.18.Final 22.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 55bb2cb7..32792cf0 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.12 + 1.5.16 5.11.3 2.3.18.Final 1.5.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index acd94a7d..75e5af77 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.12 + 1.5.16 5.11.3 2.3.18.Final 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index e5bd6cbd..53ddc6e9 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -3,5 +3,5 @@ light4jVersion=2.2.1-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 -logbackVersion=1.5.12 +logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 9a9327f0..a833b990 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.2.1-SNAPSHOT 2.18.1 2.0.16 - 1.5.12 + 1.5.16 1.5.1 2.3 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index a9346832..c4b2231a 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -4,5 +4,5 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.14.0 jacksonVersion=2.18.1 slf4jVersion=2.0.16 -logbackVersion=1.5.12 +logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 1eee2d8f..e21759a8 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.34-SNAPSHOT 2.18.1 2.0.16 - 1.5.12 + 1.5.16 1.5.1 2.3 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 3e2dbdd8..d766553b 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final -logbackVersion=1.5.12 +logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 1b3eea8b..598904c8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.12 + 1.5.16 8.0 5.11.3 2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 3e2dbdd8..d766553b 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final -logbackVersion=1.5.12 +logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 597f0c93..49159ffd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.1 2.0.16 0.9.6 - 1.5.12 + 1.5.16 7.0.1 5.11.3 2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 705afe9c..ef915402 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.1 undertowVersion=2.3.18.Final -logbackVersion=1.5.12 +logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 kotlinLoggingVersion=1.6.22 diff --git a/pom.xml b/pom.xml index 8a591574..648ab477 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.11.0 1.15 1.2.3 - 1.5.12 + 1.5.16 4.13.2 5.8.1 2.3.18.Final From 20af69e3ae8ec90e10b33faff9eaa37656c9e451 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 12 Feb 2025 15:15:03 -0500 Subject: [PATCH 38/81] update commons-io to 2.18.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 648ab477..ece83712 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 0.9.6 4.7 1.3 - 2.11.0 + 2.18.0 1.15 1.2.3 1.5.16 From 9f907dab352a7dcfc3e450df6bac606a7499c54c Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 13 Feb 2025 12:23:02 -0500 Subject: [PATCH 39/81] logging change --- .../com/networknt/codegen/handler/CodegenSingleHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java index a8d93836..168542a9 100644 --- a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java +++ b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java @@ -60,7 +60,7 @@ public ByteBuffer handle(HttpServerExchange exchange, Object input) { String projectFolder = codegenWebConfig.getTmpFolder() + separator + output; Map generatorMap = (Map)input; - if(logger.isDebugEnabled()) logger.debug("dataMap = " + JsonMapper.toJson(generatorMap)); + if(logger.isDebugEnabled()) logger.debug("dataMap = {}", JsonMapper.toJson(generatorMap)); if(generatorMap == null) { return NioUtils.toByteBuffer(getStatus(exchange, STATUS_MISSING_GENERATOR_ITEM)); From 72dab7889a48dcdc252e5af227c4df480bf73e43 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 18 Mar 2025 20:40:13 -0400 Subject: [PATCH 40/81] update lambda event to 3.15.0 --- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 53ddc6e9..956b2cce 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ # Versions of Frequently used Libraries light4jVersion=2.2.1-SNAPSHOT lambdaCoreVersion=1.2.3 -lambdaEventsVersion=3.14.0 +lambdaEventsVersion=3.15.0 jacksonVersion=2.18.1 logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index a833b990..0b3dacc4 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -19,7 +19,7 @@ 1.5.1 2.3 1.2.3 - 3.14.0 + 3.15.0 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index c4b2231a..bcc5cd92 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ # Versions of Frequently used Libraries light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 -lambdaEventsVersion=3.14.0 +lambdaEventsVersion=3.15.0 jacksonVersion=2.18.1 slf4jVersion=2.0.16 logbackVersion=1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index e21759a8..8ca925ee 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -19,7 +19,7 @@ 1.5.1 2.3 1.2.3 - 3.14.0 + 3.15.0 5.11.3 From 5258225aa7a8c81df2e4d35ce23ba2da0b83d63b Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 09:43:24 -0400 Subject: [PATCH 41/81] update jackson to 2.18.3 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 528a8261..f2628996 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 1.5.16 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 32792cf0..a312aeb5 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 1.5.16 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 75e5af77..9a390097 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 com.networknt.server.Server 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 956b2cce..00f4097d 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -2,6 +2,6 @@ light4jVersion=2.2.1-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 -jacksonVersion=2.18.1 +jacksonVersion=2.18.3 logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 0b3dacc4..94a340fa 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 1.5.16 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index bcc5cd92..574cd1f5 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 -jacksonVersion=2.18.1 +jacksonVersion=2.18.3 slf4jVersion=2.0.16 logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 8ca925ee..974be17d 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -13,7 +13,7 @@ 11 UTF-8 2.1.34-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 1.5.16 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index d766553b..42a41fad 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT -jacksonVersion=2.18.1 +jacksonVersion=2.18.3 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final logbackVersion=1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 598904c8..dea35230 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index d766553b..42a41fad 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT -jacksonVersion=2.18.1 +jacksonVersion=2.18.3 slf4jVersion=2.0.16 undertowVersion=2.3.18.Final logbackVersion=1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 49159ffd..0759b26c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -12,7 +12,7 @@ UTF-8 com.networknt.server.Server 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 1.5.16 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index ef915402..2f05237f 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -3,7 +3,7 @@ # Versions of Frequently used Libraries kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT -jacksonVersion=2.18.1 +jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 diff --git a/pom.xml b/pom.xml index ece83712..9e222b46 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 11 UTF-8 2.2.1-SNAPSHOT - 2.18.1 + 2.18.3 2.0.16 0.9.6 4.7 From f70e391bade3ea7a78cd76423b54c0e66d986ddb Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 09:49:24 -0400 Subject: [PATCH 42/81] update slf4j to 2.0.17 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index f2628996..e684910f 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 1.5.16 5.11.3 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index a312aeb5..d7bf6c59 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 1.5.16 5.11.3 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 9a390097..c70565b0 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -14,7 +14,7 @@ com.networknt.server.Server 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 1.5.16 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 94a340fa..6235f769 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -14,7 +14,7 @@ UTF-8 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 1.5.16 1.5.1 2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 574cd1f5..b91f044f 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -3,6 +3,6 @@ light4jVersion=2.1.34-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 -slf4jVersion=2.0.16 +slf4jVersion=2.0.17 logbackVersion=1.5.16 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 974be17d..b393a9b6 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -14,7 +14,7 @@ UTF-8 2.1.34-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 1.5.16 1.5.1 2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 42a41fad..0e687e24 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.3 -slf4jVersion=2.0.16 +slf4jVersion=2.0.17 undertowVersion=2.3.18.Final logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index dea35230..df9b2c55 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -13,7 +13,7 @@ com.networknt.server.Server 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 1.5.16 8.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 42a41fad..0e687e24 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.3 -slf4jVersion=2.0.16 +slf4jVersion=2.0.17 undertowVersion=2.3.18.Final logbackVersion=1.5.16 jsonSchemaValidatorVersion=1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 0759b26c..fef77f57 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -13,7 +13,7 @@ com.networknt.server.Server 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 1.5.16 7.0.1 diff --git a/pom.xml b/pom.xml index 9e222b46..80da7612 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ UTF-8 2.2.1-SNAPSHOT 2.18.3 - 2.0.16 + 2.0.17 0.9.6 4.7 1.3 From 8c067527c450aaab4f25d5a0da8acc4df464480f Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 10:00:14 -0400 Subject: [PATCH 43/81] update commons-codec to 1.17.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80da7612..2df53ff2 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.7 1.3 2.18.0 - 1.15 + 1.17.2 1.2.3 1.5.16 4.13.2 From 40709a1bea4a7414b98c0a6433982f448c9c911e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 10:09:47 -0400 Subject: [PATCH 44/81] update commons-codec to 1.18.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2df53ff2..8f427da6 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.7 1.3 2.18.0 - 1.17.2 + 1.18.0 1.2.3 1.5.16 4.13.2 From 5665fd01a12cec1509d5ff74b8997febf58cf611 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 10:19:49 -0400 Subject: [PATCH 45/81] update commons-codec to 1.18.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f427da6..90d5fa84 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.3 2.18.0 1.18.0 - 1.2.3 + 1.3.1 1.5.16 4.13.2 5.8.1 From 83015680fb5ae7c9f930fbabcb33c5a0ec3a939b Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 10:59:50 -0400 Subject: [PATCH 46/81] update logback to 1.5.18 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index e684910f..b37a4b8b 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.16 + 1.5.18 5.11.3 2.3.18.Final 22.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index d7bf6c59..608dbbe2 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.16 + 1.5.18 5.11.3 2.3.18.Final 1.5.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index c70565b0..75485fce 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.16 + 1.5.18 5.11.3 2.3.18.Final 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 00f4097d..f9c77b4d 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -3,5 +3,5 @@ light4jVersion=2.2.1-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 -logbackVersion=1.5.16 +logbackVersion=1.5.18 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 6235f769..1e17cb7a 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.2.1-SNAPSHOT 2.18.3 2.0.17 - 1.5.16 + 1.5.18 1.5.1 2.3 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index b91f044f..0e6f2aaa 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -4,5 +4,5 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 slf4jVersion=2.0.17 -logbackVersion=1.5.16 +logbackVersion=1.5.18 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index b393a9b6..a9dd7c72 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.34-SNAPSHOT 2.18.3 2.0.17 - 1.5.16 + 1.5.18 1.5.1 2.3 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 0e687e24..b057a37a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final -logbackVersion=1.5.16 +logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index df9b2c55..4a4b97b8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.16 + 1.5.18 8.0 5.11.3 2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 0e687e24..b057a37a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final -logbackVersion=1.5.16 +logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index fef77f57..9a80099d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.16 + 1.5.18 7.0.1 5.11.3 2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 2f05237f..bc8f42de 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.7.2 light4jVersion=2.2.1-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final -logbackVersion=1.5.16 +logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 kotlinLoggingVersion=1.6.22 diff --git a/pom.xml b/pom.xml index 90d5fa84..ed4efbef 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.18.0 1.18.0 1.3.1 - 1.5.16 + 1.5.18 4.13.2 5.8.1 2.3.18.Final From f63323fcfdd76fa5c70c968fb507c71e90caf6bc Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 11:32:45 -0400 Subject: [PATCH 47/81] update hdrhistogram to 2.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed4efbef..8d391877 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 2.3.18.Final 1.3 3.8.0 - 2.1.10 + 2.2.2 1.5.1 2.3 1.2.1 From fdb7b96f21979a40fe0e10542aa770098b9a5bfb Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 11:49:19 -0400 Subject: [PATCH 48/81] update snakeyaml to 2.4 --- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 1e17cb7a..eb4c0f79 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.17 1.5.18 1.5.1 - 2.3 + 2.4 1.2.3 3.15.0 5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index a9dd7c72..6e1f6f6f 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 2.0.17 1.5.18 1.5.1 - 2.3 + 2.4 1.2.3 3.15.0 5.11.3 diff --git a/pom.xml b/pom.xml index 8d391877..a3f03a01 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.8.0 2.2.2 1.5.1 - 2.3 + 2.4 1.2.1 1.82 22.2 From dfaf90c4b21cde478f219e7e7d3d106259d4e7f3 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 13:16:49 -0400 Subject: [PATCH 49/81] update hikaricp to 6.2.1 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index b37a4b8b..a095569a 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -22,7 +22,7 @@ 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ - 3.1.0 + 6.2.1 } @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 608dbbe2..9f3d7aa6 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 2.3.18.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ - 3.1.0 + 6.2.1 } @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 75485fce..0edc81d6 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 2.3.18.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || config.get("supportH2ForTest").booleanValue()){ - 3.1.0 + 6.2.1 } @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 4a4b97b8..357005d0 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ - 3.1.0 + 6.2.1 } @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 9a80099d..6011569f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 2.3.18.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ - 3.1.0 + 6.2.1 } @if(config.get("supportDb").booleanValue() && "oracle".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ 11.2.0.3 From 81aacbe20752a5a5165f22881d2bda16a59664ab Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 13:34:33 -0400 Subject: [PATCH 50/81] update h2 to 2.3.232 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index a095569a..befd0d9a 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -34,7 +34,7 @@ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ - 2.2.220 + 2.3.232 } 2.4 1.0.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 9f3d7aa6..444b2ffb 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -33,7 +33,7 @@ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ - 2.2.220 + 2.3.232 } @if(config.get("supportAvro").booleanValue()){ 7.6.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 0edc81d6..927afdea 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -33,7 +33,7 @@ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ - 2.2.220 + 2.3.232 } @if(config.get("supportAvro").booleanValue()){ 7.6.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 357005d0..ae43856f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -33,7 +33,7 @@ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ - 2.2.220 + 2.3.232 } @if(config.get("supportAvro").booleanValue()){ 7.6.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 6011569f..11106df0 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -33,7 +33,7 @@ 42.7.2 } @if(config.get("supportH2ForTest").booleanValue()){ - 2.2.220 + 2.3.232 } @if(config.get("supportAvro").booleanValue()){ 7.6.0 From 96f96f23a11f54a1373789d969229dfb0d87c814 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 13:57:59 -0400 Subject: [PATCH 51/81] update postgres to 42.7.5 --- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index b057a37a..e5165549 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -19,7 +19,7 @@ oracleVersion=11.2.0.3 mysqlVersion=8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ -postgresVersion=42.7.2 +postgresVersion=42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ h2Version=1.3.176 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index b057a37a..e5165549 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -19,7 +19,7 @@ oracleVersion=11.2.0.3 mysqlVersion=8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ -postgresVersion=42.7.2 +postgresVersion=42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ h2Version=1.3.176 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index bc8f42de..6f5ada23 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -20,7 +20,7 @@ oracleVersion=11.2.0.3 mysqlVersion=8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ -postgresVersion=42.7.2 +postgresVersion=42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ h2Version=1.3.176 From dd5159fcd39f92833b1f3c236b5515409d9b05e9 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 19 Mar 2025 14:25:37 -0400 Subject: [PATCH 52/81] update postgres to 42.7.5 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index befd0d9a..6b2ac512 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -31,7 +31,7 @@ 8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ - 42.7.2 + 42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ 2.3.232 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 444b2ffb..dc52f350 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -30,7 +30,7 @@ 8.0.32 } @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ - 42.7.2 + 42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ 2.3.232 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 927afdea..836fffbc 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -30,7 +30,7 @@ 8.0.32 } @if(config.get("supportDb") != null && config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ - 42.7.2 + 42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ 2.3.232 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index ae43856f..40b30a3c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -30,7 +30,7 @@ 8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ - 42.7.2 + 42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ 2.3.232 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 11106df0..0bd7ed6d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -30,7 +30,7 @@ 8.0.32 } @if(config.get("supportDb").booleanValue() && "postgres".equalsIgnoreCase(config.path("dbInfo").path("name").textValue())){ - 42.7.2 + 42.7.5 } @if(config.get("supportH2ForTest").booleanValue()){ 2.3.232 From 7039c80f28a1a48c68ea565afed604745281ece8 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 22 Mar 2025 09:40:51 -0400 Subject: [PATCH 53/81] upgrade to version 2.2.1 before release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 59ea450c..89160bd8 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index aceed294..f91376e6 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 9b028c42..7c9ff0bb 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 82244727..eebc17de 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 1fcab40c..917c5ba8 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 6b2ac512..75a89596 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 616d69ab..b3e78dc3 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index dc52f350..429ab07d 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 836fffbc..b6cb23f4 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 418c8654..0ca7aa35 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index f9c77b4d..3b818b60 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.1-SNAPSHOT +light4jVersion=2.2.1 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index eb4c0f79..773c2998 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index e5165549..99de892e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1-SNAPSHOT +light4jVersion=2.2.1 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 40b30a3c..4381c071 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index e5165549..99de892e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1-SNAPSHOT +light4jVersion=2.2.1 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 0bd7ed6d..b6d81bc3 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 6f5ada23..0e41b64d 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1-SNAPSHOT +light4jVersion=2.2.1 jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index a3f03a01..1666513a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.1-SNAPSHOT + 2.2.1 pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.2.1-SNAPSHOT + 2.2.1 2.18.3 2.0.17 0.9.6 From e1aff128f702e5e22d9682e72bb313a7b361ec5f Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 22 Mar 2025 09:58:16 -0400 Subject: [PATCH 54/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aa6670b..14ec72d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [2.2.1](https://github.com/networknt/light-codegen/tree/2.2.1) (2025-03-22) + + +**Merged pull requests:** + + + + ## [2.2.0](https://github.com/networknt/light-codegen/tree/2.2.0) (2025-02-12) From 4957898fa711f5dde767e188ae0057f19834d0e3 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 22 Mar 2025 11:17:14 -0400 Subject: [PATCH 55/81] upgrade nexus-staging verison --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3f03a01..d47a04d3 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 3.2.1 1.6.0 3.8.1 - 1.6.8 + 1.7.0 2.22.2 0.8.5 2.8.2 From 66101893792643dfc58af1fd304ec441e08c90f1 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sat, 22 Mar 2025 15:02:51 -0400 Subject: [PATCH 56/81] upgrade to version 2.2.2-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 89160bd8..5b893362 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index f91376e6..9957dfdc 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 7c9ff0bb..a0cf29c9 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index eebc17de..38700229 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 917c5ba8..a2f9089a 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 75a89596..227e2e7d 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index b3e78dc3..b0169c4b 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 429ab07d..9f49234d 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index b6cb23f4..c3686234 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 0ca7aa35..c651f74f 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 3b818b60..cac1ba8f 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.1 +light4jVersion=2.2.2-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 773c2998..12b87c47 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 99de892e..e5a51db8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1 +light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 4381c071..a2c591ca 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 99de892e..e5a51db8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1 +light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index b6d81bc3..740630a0 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 0e41b64d..01e84c26 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.7.2 -light4jVersion=2.2.1 +light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index 92d5ca42..6386d323 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.1 + 2.2.2-SNAPSHOT pom Parent POM Light Code Generator @@ -66,7 +66,7 @@ 11 UTF-8 - 2.2.1 + 2.2.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 From ab4453f56c0993e3634217b8a114625e0974fc96 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sun, 20 Apr 2025 10:53:04 -0400 Subject: [PATCH 57/81] fixes #719 update the uuid generator to v7 --- .../com/networknt/codegen/handler/CodegenMultipleHandler.java | 3 ++- .../com/networknt/codegen/handler/CodegenSingleHandler.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenMultipleHandler.java b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenMultipleHandler.java index 09c6b6dd..fcd10aca 100644 --- a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenMultipleHandler.java +++ b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenMultipleHandler.java @@ -13,6 +13,7 @@ import com.networknt.rpc.router.ServiceHandler; import com.networknt.utility.HashUtil; import com.networknt.utility.NioUtils; +import com.networknt.utility.UuidUtil; import io.undertow.server.HttpServerExchange; import io.undertow.util.HttpString; import org.slf4j.Logger; @@ -55,7 +56,7 @@ public class CodegenMultipleHandler implements HybridHandler { @Override public ByteBuffer handle(HttpServerExchange exchange, Object input) { // generate a destination folder name. - String output = HashUtil.generateUUID(); + String output = UuidUtil.uuidToBase64(UuidUtil.getUUID()); String zipFile = output + ".zip"; String projectFolder = codegenWebConfig.getTmpFolder() + separator + output; diff --git a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java index 168542a9..25a66c09 100644 --- a/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java +++ b/codegen-web/src/main/java/com/networknt/codegen/handler/CodegenSingleHandler.java @@ -13,6 +13,7 @@ import com.networknt.rpc.router.ServiceHandler; import com.networknt.utility.HashUtil; import com.networknt.utility.NioUtils; +import com.networknt.utility.UuidUtil; import io.undertow.server.HttpServerExchange; import io.undertow.util.HttpString; import org.slf4j.Logger; @@ -55,7 +56,7 @@ public class CodegenSingleHandler implements HybridHandler { @Override public ByteBuffer handle(HttpServerExchange exchange, Object input) { // generate a destination folder name. - String output = HashUtil.generateUUID(); + String output = UuidUtil.uuidToBase64(UuidUtil.getUUID()); String zipFile = output + ".zip"; String projectFolder = codegenWebConfig.getTmpFolder() + separator + output; From 22e408b95719bdfabb8986f97b0632dd860da812 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 23 May 2025 21:39:43 -0400 Subject: [PATCH 58/81] fixes #720 update the rpc-router.yml and update rocker templates --- codegen-web/src/main/resources/config/rpc-router.yml | 2 +- .../main/resources/templates/lambda/template.yaml.rocker.raw | 4 ++-- .../resources/templates/lambdanative/template.yaml.rocker.raw | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/codegen-web/src/main/resources/config/rpc-router.yml b/codegen-web/src/main/resources/config/rpc-router.yml index b5d71936..c8d27d57 100644 --- a/codegen-web/src/main/resources/config/rpc-router.yml +++ b/codegen-web/src/main/resources/config/rpc-router.yml @@ -1,4 +1,4 @@ --- description: RPC router description -handlerPackage: 'com.networknt.codegen' +handlerPackages: com.networknt.codegen jsonPath: /codegen diff --git a/light-rest-4j/src/main/resources/templates/lambda/template.yaml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/template.yaml.rocker.raw index 1d9ad3a9..e642d6d4 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/template.yaml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/template.yaml.rocker.raw @@ -1,7 +1,7 @@ @import java.util.Map @import java.util.List -@import com.networknt.codegen.rest.AbstractLambdaGenerator.OpenApiPath; -@import com.networknt.codegen.rest.AbstractLambdaGenerator.MethodFunction; +@import com.networknt.codegen.rest.AbstractLambdaGenerator.OpenApiPath +@import com.networknt.codegen.rest.AbstractLambdaGenerator.MethodFunction @args (String projectName, String handlerPackage, boolean packageDocker, boolean useLightProxy, List> operationList, List pathList) AWSTemplateFormatVersion: '2010-09-09' Transform: AWS::Serverless-2016-10-31 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/template.yaml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/template.yaml.rocker.raw index 5370a8c8..8e8eceae 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/template.yaml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/template.yaml.rocker.raw @@ -1,7 +1,7 @@ @import java.util.Map @import java.util.List -@import com.networknt.codegen.rest.AbstractLambdaGenerator.OpenApiPath; -@import com.networknt.codegen.rest.AbstractLambdaGenerator.MethodFunction; +@import com.networknt.codegen.rest.AbstractLambdaGenerator.OpenApiPath +@import com.networknt.codegen.rest.AbstractLambdaGenerator.MethodFunction @args (String artifactId, String serviceId, String handlerPackage, boolean packageDocker, String lambdaTrigger, List> operationList, List pathList) AWSTemplateFormatVersion: '2010-09-09' Transform: AWS::Serverless-2016-10-31 From f475a6100f74d96532c003267a6353b2c1f480b4 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 23 May 2025 21:43:28 -0400 Subject: [PATCH 59/81] fixes #721 switch to maven central portal for publishing --- pom.xml | 69 +++++++++++++-------------------------------------------- 1 file changed, 16 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index 6386d323..0864b466 100644 --- a/pom.xml +++ b/pom.xml @@ -53,14 +53,14 @@ - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com/service/local/staging/deploy/maven2/ + + central + https://central.sonatype.com/repository/maven-snapshots/ + @@ -385,22 +385,6 @@ - - org.codehaus.mojo - versions-maven-plugin - ${version.maven-version} - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${version.nexus-staging-maven} - true - - ossrh - https://oss.sonatype.org/ - true - - org.apache.maven.plugins maven-source-plugin @@ -469,11 +453,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - ${version.maven-deploy} - org.apache.maven.plugins maven-compiler-plugin @@ -538,32 +517,6 @@ - - - central - - https://oss.sonatype.org/content/repositories/releases - - - false - - - - snapshots - - https://oss.sonatype.org/content/repositories/snapshots - - - true - - - - - false - - - - @@ -599,6 +552,16 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + true + + central + true + + From 0c9bd412832a0aff94f825c74884bace2ad739e8 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Mon, 26 May 2025 10:15:30 -0400 Subject: [PATCH 60/81] fixes #722 add repositories in pom.xml --- pom.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pom.xml b/pom.xml index 0864b466..7a1fb04b 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,35 @@ + + + snapshot + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + + central + https://repo1.maven.org/maven2 + + true + + + + + + central + https://repo1.maven.org/maven2 + + true + + + + 11 UTF-8 From c34bec15f14926f4bc5e2ea62150a7f894cc4869 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Mon, 2 Jun 2025 13:23:12 -0400 Subject: [PATCH 61/81] update kafka to 7.9.1 --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 9f49234d..a1f46a73 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.7.2 + 3.9.1 } 2.4 1.0.0 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index c3686234..6f8eb4dc 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ - 3.7.2 + 3.9.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index e5a51db8..b7bbf66e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.7.2 +kafkaVersion=3.9.1 light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index a2c591ca..41e30d40 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.7.2 + 3.9.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index e5a51db8..b7bbf66e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.7.2 +kafkaVersion=3.9.1 light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 740630a0..45bae8e1 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -39,7 +39,7 @@ 7.6.0 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ - 3.7.2 + 3.9.1 } 2.4 1.0.0 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 01e84c26..5c034a35 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ @import com.fasterxml.jackson.databind.JsonNode @args (JsonNode config) # Versions of Frequently used Libraries -kafkaVersion=3.7.2 +kafkaVersion=3.9.1 light4jVersion=2.2.2-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final From fb818917a04e7b6a9598fb317fa068e6f0be104b Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Mon, 2 Jun 2025 13:30:55 -0400 Subject: [PATCH 62/81] update confluent to 7.9.1 --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index a1f46a73..3d591c11 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -36,7 +36,7 @@ 2.3.232 } @if(config.get("supportAvro").booleanValue()){ - 7.6.0 + 7.9.1 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ 3.9.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 6f8eb4dc..0e6e732a 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -36,7 +36,7 @@ 2.3.232 } @if(config.get("supportAvro").booleanValue()){ - 7.6.0 + 7.9.1 } @if(config.get("kafkaProducer").booleanValue() || config.get("kafkaConsumer").booleanValue()){ 3.9.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 41e30d40..a3f57237 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -36,7 +36,7 @@ 2.3.232 } @if(config.get("supportAvro").booleanValue()){ - 7.6.0 + 7.9.1 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ 3.9.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 45bae8e1..ce16946e 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -36,7 +36,7 @@ 2.3.232 } @if(config.get("supportAvro").booleanValue()){ - 7.6.0 + 7.9.1 } @if(config.get("kafkaProducer").booleanValue() ||config.get("kafkaConsumer").booleanValue()){ 3.9.1 From 33a57560953435313197007c84d459560ef8a399 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Jun 2025 14:37:37 -0400 Subject: [PATCH 63/81] upgrade to version 2.2.2 before release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 5b893362..ea087b9d 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 9957dfdc..f2b0eb9d 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index a0cf29c9..52eb2d2b 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 38700229..12e67150 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index a2f9089a..5b5f5151 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 227e2e7d..d8e82103 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index b0169c4b..77fafae9 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 3d591c11..2e8e5585 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 0e6e732a..e8d3bb47 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index c651f74f..886b3bd4 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index cac1ba8f..f4b97050 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.2-SNAPSHOT +light4jVersion=2.2.2 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 12b87c47..6e899b96 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index b7bbf66e..13a3fa2d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2-SNAPSHOT +light4jVersion=2.2.2 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index a3f57237..ea990b8d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index b7bbf66e..13a3fa2d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2-SNAPSHOT +light4jVersion=2.2.2 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index ce16946e..d06403bd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 5c034a35..cb06af53 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2-SNAPSHOT +light4jVersion=2.2.2 jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index 7a1fb04b..cff89c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.2-SNAPSHOT + 2.2.2 pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 11 UTF-8 - 2.2.2-SNAPSHOT + 2.2.2 2.18.3 2.0.17 0.9.6 From 8f06b42eb207b541a8f0a9b646effe243872726e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Jun 2025 14:51:58 -0400 Subject: [PATCH 64/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14ec72d0..482e51b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [2.2.2](https://github.com/networknt/light-codegen/tree/2.2.2) (2025-06-05) + + +**Merged pull requests:** + + ## [2.2.1](https://github.com/networknt/light-codegen/tree/2.2.1) (2025-03-22) From 137c72d36489f3ffd44b68d207e8a4d08b344549 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Jun 2025 15:33:51 -0400 Subject: [PATCH 65/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 482e51b7..38020077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Merged pull requests:** + + ## [2.2.1](https://github.com/networknt/light-codegen/tree/2.2.1) (2025-03-22) From a0fb18d1989c5bc0f05c571ac4c79d8ce2416253 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Jun 2025 20:37:14 -0400 Subject: [PATCH 66/81] upgrade maven-gpg to 3.2.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a1fb04b..95ee5439 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 2.22.2 0.8.5 2.8.2 - 1.6 + 3.2.7 From d03a0bf4a0275d0a532613e5f1bbb384caf1cd11 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Jun 2025 21:49:34 -0400 Subject: [PATCH 67/81] add name to the pom.xml for each module --- codegen-cli/pom.xml | 1 + codegen-core/pom.xml | 1 + codegen-fwk/pom.xml | 1 + codegen-web/pom.xml | 1 + light-graphql-4j/pom.xml | 1 + light-hybrid-4j/pom.xml | 1 + light-rest-4j/pom.xml | 1 + 7 files changed, 7 insertions(+) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index ea087b9d..73360ac1 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -27,6 +27,7 @@ codegen-cli jar + codegen-cli light-generator cli. diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index f2b0eb9d..51dd013e 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -27,6 +27,7 @@ codegen-core jar + codegen-core light generator core. diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 52eb2d2b..b2089225 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -27,6 +27,7 @@ codegen-fwk jar + codegen-fwk light-generator framework. diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 12e67150..61a4385a 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -27,6 +27,7 @@ codegen-web jar + codegen-web light-generator cli. diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 5b5f5151..775f452d 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -27,6 +27,7 @@ light-graphql-4j-generator jar + light-graphql-4j-generator light-graphql-4j code generator. diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 77fafae9..c1e171e8 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -27,6 +27,7 @@ light-hybrid-4j-generator jar + light-hybrid-4j-generator light-hybrid-4j code generator. diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 886b3bd4..7cde8d16 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -27,6 +27,7 @@ light-rest-4j-generator jar + light-rest-4j-generator light-rest-4j code generator. From fe85fa7df30cbb396d48a79f966e7e167932a00e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 6 Jun 2025 10:27:13 -0400 Subject: [PATCH 68/81] upgrade to version 2.2.3-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 73360ac1..e9301730 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 51dd013e..f56f07a3 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index b2089225..2ce0ac51 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 61a4385a..41962cd9 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 775f452d..c5cd825c 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index d8e82103..c7644f0e 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index c1e171e8..ea727652 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 2e8e5585..d534f291 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e8d3bb47..88aa54b1 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 17 UTF-8 com.networknt.server.Server - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 7cde8d16..1586d457 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index f4b97050..78144bd7 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.2 +light4jVersion=2.2.3-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 6e899b96..3a1c807a 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 13a3fa2d..309c73f9 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2 +light4jVersion=2.2.3-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index ea990b8d..7f89f0e6 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 13a3fa2d..309c73f9 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2 +light4jVersion=2.2.3-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index d06403bd..d0f459de 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 11 UTF-8 com.networknt.server.Server - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index cb06af53..b0de1fe8 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.2 +light4jVersion=2.2.3-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index d465d680..ba22958f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.2 + 2.2.3-SNAPSHOT pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 11 UTF-8 - 2.2.2 + 2.2.3-SNAPSHOT 2.18.3 2.0.17 0.9.6 From 18f787c09d67f0af1c41121bef8fe10adca59865 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 6 Jun 2025 13:03:16 -0400 Subject: [PATCH 69/81] upgrade to java 21 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index d8e82103..f0163d6e 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -9,7 +9,7 @@ @config.get("version").textValue() - 11 + 21 UTF-8 com.networknt.server.Server 2.2.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 2e8e5585..b802a6c1 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -9,7 +9,7 @@ @config.get("version").textValue() - 17 + 21 UTF-8 com.networknt.server.Server 2.2.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e8d3bb47..0344ca6d 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -9,7 +9,7 @@ @config.get("version").textValue() - 17 + 21 UTF-8 com.networknt.server.Server 2.2.2 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index ea990b8d..ec576ca5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -8,7 +8,7 @@ @config.get("version").textValue() - 11 + 21 UTF-8 com.networknt.server.Server 2.2.2 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index d06403bd..bb330ddf 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -8,7 +8,7 @@ @config.get("version").textValue() - 11 + 21 UTF-8 com.networknt.server.Server 2.2.2 diff --git a/pom.xml b/pom.xml index d465d680..02fc6ad5 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ - 11 + 21 UTF-8 2.2.2 2.18.3 From 505eaac7d55523b8c854a720e22ef814ce069eb7 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 25 Jun 2025 14:08:49 -0400 Subject: [PATCH 70/81] upgrade to version 2.3.0 before release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index e9301730..903cc8cd 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index f56f07a3..b61cdc12 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 2ce0ac51..70a7b887 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 41962cd9..cad94d61 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index c5cd825c..156c747b 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index b6dcdb97..587d67d3 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index ea727652..7fceb795 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index adba9a12..df068057 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 0698f3bd..45bcd644 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 1586d457..965d9e8d 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 78144bd7..e1742085 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.2.3-SNAPSHOT +light4jVersion=2.3.0 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 3a1c807a..001902d3 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 309c73f9..00a8eb24 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.3-SNAPSHOT +light4jVersion=2.3.0 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index ba2f8acf..4cef0f9f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 309c73f9..00a8eb24 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.3-SNAPSHOT +light4jVersion=2.3.0 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index f32961ad..c26d2a14 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index b0de1fe8..b319d0ee 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.2.3-SNAPSHOT +light4jVersion=2.3.0 jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index a002cea7..31d371fe 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.2.3-SNAPSHOT + 2.3.0 pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 21 UTF-8 - 2.2.3-SNAPSHOT + 2.3.0 2.18.3 2.0.17 0.9.6 From 5e591f663eceb237910a34011eec19c4d0d7c06e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 25 Jun 2025 14:47:09 -0400 Subject: [PATCH 71/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38020077..448e5efe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [2.3.0](https://github.com/networknt/light-codegen/tree/2.3.0) (2025-06-25) + + +**Merged pull requests:** + + + + ## [2.2.2](https://github.com/networknt/light-codegen/tree/2.2.2) (2025-06-05) From 7ce199655975d43fb38eb78a3d8cb3b9bc385d3c Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 25 Jun 2025 16:34:32 -0400 Subject: [PATCH 72/81] upgrade to version 2.3.1-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 903cc8cd..dd79d1a7 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index b61cdc12..7671826a 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 70a7b887..c46a611b 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index cad94d61..a96fc890 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 156c747b..4eb3bddb 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 587d67d3..83d19f0a 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 7fceb795..a13175d8 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index df068057..c8bf7ef4 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 45bcd644..7347c12f 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 965d9e8d..d2d75c09 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index e1742085..96b8ee58 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.3.0 +light4jVersion=2.3.1-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 001902d3..7ae584ad 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 00a8eb24..f325a6d5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.0 +light4jVersion=2.3.1-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 4cef0f9f..09972a09 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 00a8eb24..f325a6d5 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.0 +light4jVersion=2.3.1-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index c26d2a14..7c3ae15d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index b319d0ee..e96631f3 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.0 +light4jVersion=2.3.1-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index 31d371fe..55061b24 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.3.0 + 2.3.1-SNAPSHOT pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 21 UTF-8 - 2.3.0 + 2.3.1-SNAPSHOT 2.18.3 2.0.17 0.9.6 From 270badb870f3653d6c7cf4bbc10c4ac3d9fe71fb Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 19 Sep 2025 20:33:19 -0400 Subject: [PATCH 73/81] upgrade to version 2.3.1 before release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index dd79d1a7..9fa29857 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 7671826a..56986176 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index c46a611b..390ebb60 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index a96fc890..c34ad0bd 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 4eb3bddb..09cdfb9a 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 83d19f0a..a57e2db0 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index a13175d8..6670f375 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index c8bf7ef4..45bdaca5 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 7347c12f..e424e454 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index d2d75c09..2436bff2 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 96b8ee58..54142868 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.3.1-SNAPSHOT +light4jVersion=2.3.1 lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index 7ae584ad..a61878c6 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index f325a6d5..aa077c6f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1-SNAPSHOT +light4jVersion=2.3.1 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 09972a09..abbfc5cc 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index f325a6d5..aa077c6f 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1-SNAPSHOT +light4jVersion=2.3.1 jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 7c3ae15d..fb2378e6 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index e96631f3..899ce68d 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1-SNAPSHOT +light4jVersion=2.3.1 jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index 55061b24..d2cc2d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.3.1-SNAPSHOT + 2.3.1 pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 21 UTF-8 - 2.3.1-SNAPSHOT + 2.3.1 2.18.3 2.0.17 0.9.6 From d0c4737d385b5d2521c8635731f9a0d4e2ff1d9f Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 19 Sep 2025 20:39:27 -0400 Subject: [PATCH 74/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 448e5efe..b9307866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [2.3.1](https://github.com/networknt/light-codegen/tree/2.3.1) (2025-09-19) + + +**Merged pull requests:** + + ## [2.3.0](https://github.com/networknt/light-codegen/tree/2.3.0) (2025-06-25) From 0c180de5e787ed65f692f3ec3b14447a5c0e97b3 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 19 Sep 2025 21:26:46 -0400 Subject: [PATCH 75/81] light-bot checkin CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9307866..52e5cacb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Merged pull requests:** + + ## [2.3.0](https://github.com/networknt/light-codegen/tree/2.3.0) (2025-06-25) From 378fe2aa84a963ce95e06e7ecd2e16362fdc2444 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 19 Sep 2025 21:42:44 -0400 Subject: [PATCH 76/81] upgrade to version 2.3.2-SNAPSHOT after release in master branch --- codegen-cli/pom.xml | 2 +- codegen-core/pom.xml | 2 +- codegen-fwk/pom.xml | 2 +- codegen-web/pom.xml | 2 +- light-graphql-4j/pom.xml | 2 +- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- light-hybrid-4j/pom.xml | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- light-rest-4j/pom.xml | 2 +- .../resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../templates/rest/single/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 9fa29857..940db73a 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 56986176..3993df4b 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 390ebb60..096e5e53 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index c34ad0bd..7e60fcc4 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 09cdfb9a..3be0245b 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index a57e2db0..9de04d59 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 6670f375..5bd71926 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 45bdaca5..fefcdc31 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e424e454..8ef4611b 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 2436bff2..e890898f 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 54142868..90a6d511 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,5 +1,5 @@ # Versions of Frequently used Libraries -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index a61878c6..bfb4049d 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,7 +12,7 @@ 11 11 UTF-8 - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 1.5.18 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index aa077c6f..cebe6652 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index abbfc5cc..4baf1246 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index aa077c6f..cebe6652 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.18.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index fb2378e6..a9681c35 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,7 +11,7 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 899ce68d..d36f4dde 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,7 +2,7 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.18.Final logbackVersion=1.5.18 diff --git a/pom.xml b/pom.xml index d2cc2d3f..b4932692 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 21 UTF-8 - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 From b18d78548f187e3386933e40425af1f313eddf7e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 30 Oct 2025 09:32:25 -0400 Subject: [PATCH 77/81] update undertow to 2.3.20.Final --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 9de04d59..239885c1 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.18.Final + 2.3.20.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index fefcdc31..6e987d7e 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.18.Final + 2.3.20.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ 6.2.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 8ef4611b..1b58cb35 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.18.Final + 2.3.20.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index cebe6652..4dc5c4d6 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.18.Final +undertowVersion=2.3.20.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 4baf1246..b504ea91 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.18 8.0 5.11.3 - 2.3.18.Final + 2.3.20.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index cebe6652..4dc5c4d6 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.18.Final +undertowVersion=2.3.20.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index a9681c35..760a5b8c 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.18 7.0.1 5.11.3 - 2.3.18.Final + 2.3.20.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index d36f4dde..ce85de2e 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 -undertowVersion=2.3.18.Final +undertowVersion=2.3.20.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 diff --git a/pom.xml b/pom.xml index b4932692..64a1cf07 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.5.18 4.13.2 5.8.1 - 2.3.18.Final + 2.3.20.Final 1.3 3.8.0 2.2.2 From c79b880ce3bd2af536dbfdcbc4571259802929ae Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 22 Jan 2026 17:36:22 -0500 Subject: [PATCH 78/81] update undertow to 2.3.22.Final --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index 239885c1..bda11662 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.20.Final + 2.3.22.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 6e987d7e..103228b3 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.20.Final + 2.3.22.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ 6.2.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 1b58cb35..191e70bb 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 0.9.6 1.5.18 5.11.3 - 2.3.20.Final + 2.3.22.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 4dc5c4d6..50d0827a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.20.Final +undertowVersion=2.3.22.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index b504ea91..24b46626 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.18 8.0 5.11.3 - 2.3.20.Final + 2.3.22.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 4dc5c4d6..50d0827a 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.20.Final +undertowVersion=2.3.22.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 760a5b8c..2083c0cf 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.18 7.0.1 5.11.3 - 2.3.20.Final + 2.3.22.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index ce85de2e..6f2b9ac6 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -4,7 +4,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 -undertowVersion=2.3.20.Final +undertowVersion=2.3.22.Final logbackVersion=1.5.18 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 diff --git a/pom.xml b/pom.xml index 64a1cf07..63c4c99f 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.5.18 4.13.2 5.8.1 - 2.3.20.Final + 2.3.22.Final 1.3 3.8.0 2.2.2 From ebab43a0e27ea81cd7fd526824216092ab0a4cb6 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 28 Jan 2026 09:14:51 -0500 Subject: [PATCH 79/81] fixes #724 remove the response validation code in test cases --- .../resources/templates/rest/handlerTest.rocker.raw | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw index 41d4fb60..131d6774 100644 --- a/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw @@ -94,17 +94,8 @@ public class @className { client.restore(connectionToken); } String body = reference.get().getAttachment(Http2Client.RESPONSE_BODY); - Optional contentTypeName = Optional.ofNullable(reference.get().getResponseHeaders().get(Headers.CONTENT_TYPE)); - SchemaValidator schemaValidator = new SchemaValidator(OpenApiHandler.helper.openApi3); - ResponseValidator responseValidator = new ResponseValidator(schemaValidator); int statusCode = reference.get().getResponseCode(); - Status status; - if(contentTypeName.isPresent()) { - status = responseValidator.validateResponseContent(body, requestUri, httpMethod, String.valueOf(statusCode), contentTypeName.get().getFirst()); - } else { - status = responseValidator.validateResponseContent(body, requestUri, httpMethod, String.valueOf(statusCode), JSON_MEDIA_TYPE); - } - assertNotNull(status); + assertNotNull(body); } } } From 6588a86016039146a7a7b57f2224338939dc33c5 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 28 Jan 2026 11:42:19 -0500 Subject: [PATCH 80/81] update assertj-core to 3.27.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63c4c99f..678aa909 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 5.8.1 2.3.22.Final 1.3 - 3.8.0 + 3.27.7 2.2.2 1.5.1 2.4 From 22a791259dbd411f861154a4c75939edcea0e46c Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 29 Jan 2026 14:33:21 -0500 Subject: [PATCH 81/81] update logback to 1.5.26 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/lambda/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/lambda/pom.xml.rocker.raw | 2 +- .../templates/lambdanative/gradleProperties.rocker.raw | 2 +- .../main/resources/templates/lambdanative/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/parent/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/parent/pom.xml.rocker.raw | 2 +- .../resources/templates/rest/single/gradleProperties.rocker.raw | 2 +- .../src/main/resources/templates/rest/single/pom.xml.rocker.raw | 2 +- .../resources/templates/restkotlin/gradleProperties.rocker.raw | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index bda11662..126c8821 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 2.3.22.Final 22.2 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 103228b3..b47149c0 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 2.3.22.Final 1.5.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index 191e70bb..d9521bb5 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -16,7 +16,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 2.3.22.Final 1.5.1 diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 90a6d511..01d66cfa 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -3,5 +3,5 @@ light4jVersion=2.3.2-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 -logbackVersion=1.5.18 +logbackVersion=1.5.26 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index bfb4049d..374d9641 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.3.2-SNAPSHOT 2.18.3 2.0.17 - 1.5.18 + 1.5.26 1.5.1 2.4 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 0e6f2aaa..86f602ea 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -4,5 +4,5 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 slf4jVersion=2.0.17 -logbackVersion=1.5.18 +logbackVersion=1.5.26 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 6e1f6f6f..302fa0e9 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.34-SNAPSHOT 2.18.3 2.0.17 - 1.5.18 + 1.5.26 1.5.1 2.4 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index 50d0827a..73528665 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.22.Final -logbackVersion=1.5.18 +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index 24b46626..944b8177 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 8.0 5.11.3 2.3.22.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index 50d0827a..73528665 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -6,7 +6,7 @@ light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 undertowVersion=2.3.22.Final -logbackVersion=1.5.18 +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index 2083c0cf..29098fcd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 7.0.1 5.11.3 2.3.22.Final diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 6f2b9ac6..0d5a7fc6 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -5,7 +5,7 @@ kafkaVersion=3.9.1 light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 undertowVersion=2.3.22.Final -logbackVersion=1.5.18 +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 kotlinLoggingVersion=1.6.22 diff --git a/pom.xml b/pom.xml index 678aa909..6c4a2172 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 2.18.0 1.18.0 1.3.1 - 1.5.18 + 1.5.26 4.13.2 5.8.1 2.3.22.Final