From 5b6d939c63f81a3463aad84bfd38e3b67f9f73f4 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 13:24:14 -0400 Subject: [PATCH 01/18] bot checkin --- .../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/rest/openapi/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/swagger/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 659ca6dcb..e8b2b2ef7 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 1.5.12 1.5.12 - 2.9.4 + 2.9.5 1.7.25 0.6.1 4.7 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 2aa732f95..b310399de 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 1.5.12 1.5.12 - 2.9.4 + 2.9.5 1.7.25 0.6.1 4.7 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 d95beef5e..c15e6c3f6 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 1.5.12 1.5.12 - 2.9.4 + 2.9.5 1.7.25 0.6.1 4.7 diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index 54940f372..d5ac90872 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -17,7 +17,7 @@ 1.5.12 } 1.5.12 - 2.9.4 + 2.9.5 1.7.25 0.6.1 4.7 diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 164587c9c..52daaca38 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -13,7 +13,7 @@ UTF-8 1.5.12 1.5.12 - 2.9.4 + 2.9.5 @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){ 1.5.12 } From eaa7b1dc01a552921b8821e48e347b3697759430 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 13:47:30 -0400 Subject: [PATCH 02/18] bot checkin --- .../main/resources/templates/rest/swagger/pom.xml.rocker.raw | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 52daaca38..ed0868acd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -25,7 +25,7 @@ 1.2.3 4.12 1.4.20.Final - 1.0.32 + 1.0.34 0.1.15 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ @@ -187,7 +187,7 @@ io.swagger swagger-parser - ${version.swagger} + ${version.swagger-parser} @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){ diff --git a/pom.xml b/pom.xml index b92620082..e32e29f25 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 1.2.3 4.12 1.4.20.Final - 1.0.32 + 1.0.34 1.3 3.8.0 2.1.10 From cd7bf552fd25ae839601e18512bb32dbef96cb9d Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 17:07:41 -0400 Subject: [PATCH 03/18] bot checkin --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/openapi/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/swagger/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 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 b310399de..380421215 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 @@ 1.2.3 4.12 1.4.20.Final - 0.1.15 + 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.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 c15e6c3f6..968d0ec2d 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 @@ 1.2.3 4.12 1.4.20.Final - 0.1.15 + 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.2 diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index d5ac90872..e2910b868 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -26,7 +26,7 @@ 1.2.3 4.12 1.4.20.Final - 0.1.15 + 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.2 diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index ed0868acd..17a082a82 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -26,7 +26,7 @@ 4.12 1.4.20.Final 1.0.34 - 0.1.15 + 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.2 diff --git a/pom.xml b/pom.xml index e32e29f25..91f5d9154 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 3.8.0 2.1.10 3.0.2 - 0.1.15 + 0.1.18 1.2.4 3.5.3-beta 0.3 From 6adfd6442f47e0c8d26951d9b1617e95eef7bf06 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 21:47:11 -0400 Subject: [PATCH 04/18] bot checkin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91f5d9154..e3fc0ec15 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 4.7 1.1 2.5 - 1.10 + 1.11 1.2.1 1.2.3 4.12 From b8e10d0e94c89a5d5a9047852531f5b10485a693 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 21:56:27 -0400 Subject: [PATCH 05/18] bot checkin --- .../main/resources/templates/rest/openapi/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/swagger/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/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index e2910b868..f3105b411 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 1.7.25 0.6.1 4.7 - 1.1 + 1.3 1.2.1 1.2.3 4.12 diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 17a082a82..b3d281d91 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -20,7 +20,7 @@ 1.7.25 0.6.1 4.7 - 1.1 + 1.3 1.2.1 1.2.3 4.12 diff --git a/pom.xml b/pom.xml index e3fc0ec15..d6e340567 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.7.25 0.6.1 4.7 - 1.1 + 1.3 2.5 1.11 1.2.1 From 66d79271813bca4d1a644783ee9300d3d0145b29 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 22:18:50 -0400 Subject: [PATCH 06/18] fixes #134 remove commons-text dependency and unused properties from light-rest-4j templates --- .../resources/templates/rest/openapi/pom.xml.rocker.raw | 8 -------- .../resources/templates/rest/swagger/pom.xml.rocker.raw | 8 -------- 2 files changed, 16 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index f3105b411..b9667642d 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -20,9 +20,6 @@ 2.9.5 1.7.25 0.6.1 - 4.7 - 1.3 - 1.2.1 1.2.3 4.12 1.4.20.Final @@ -243,11 +240,6 @@ logback-classic ${version.logback} - - org.apache.commons - commons-text - ${version.commons-text} - io.undertow undertow-core diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index b3d281d91..5da191769 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -19,9 +19,6 @@ } 1.7.25 0.6.1 - 4.7 - 1.3 - 1.2.1 1.2.3 4.12 1.4.20.Final @@ -242,11 +239,6 @@ logback-classic ${version.logback} - - org.apache.commons - commons-text - ${version.commons-text} - io.undertow undertow-core From f2f6dad79c0b8b09b4cd5c939f1e312b4cc1cb4a Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 22:23:41 -0400 Subject: [PATCH 07/18] fixes #135 remove unused properties from server and service templates of hybrid --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 -- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 -- 2 files changed, 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 380421215..3376d72d2 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,8 +16,6 @@ 2.9.5 1.7.25 0.6.1 - 4.7 - 1.2.1 1.2.3 4.12 1.4.20.Final 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 968d0ec2d..d42c25b55 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,8 +16,6 @@ 2.9.5 1.7.25 0.6.1 - 4.7 - 1.2.1 1.2.3 4.12 1.4.20.Final From 0eb8e0cc2bb6bb4fe3b8ffadb177d5baf0d9fbfd Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 4 Apr 2018 22:26:03 -0400 Subject: [PATCH 08/18] fixes #136 remove unused properties from light-graphql-4j template --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 -- 1 file changed, 2 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 e8b2b2ef7..786ca41f5 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,8 +16,6 @@ 2.9.5 1.7.25 0.6.1 - 4.7 - 1.2.1 1.2.3 4.12 1.4.20.Final From dc2f15b542d829419c44fb27d6ddc331dff1bfa2 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 5 Apr 2018 22:47:02 -0400 Subject: [PATCH 09/18] fixes #137 upgrade graphql-java to version 8.0 --- .../src/main/resources/templates/graphql/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 786ca41f5..a42719163 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 @@ -19,7 +19,7 @@ 1.2.3 4.12 1.4.20.Final - 4.2 + 8.0 2.1.5 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.2 diff --git a/pom.xml b/pom.xml index d6e340567..e7d24e196 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 0.22.0 1.72 2.7.0 - 4.2 + 8.0 2.4 -Xmx512m -XX:MaxPermSize=256m From a251745d2aec0427e50641fd334d049b8853c76d Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 6 Apr 2018 22:08:11 -0400 Subject: [PATCH 10/18] bot checkin --- .../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/rest/openapi/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/swagger/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 a42719163..7747d3646 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 @@ -15,7 +15,7 @@ 1.5.12 2.9.5 1.7.25 - 0.6.1 + 0.6.3 1.2.3 4.12 1.4.20.Final 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 3376d72d2..f1573647e 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 @@ -15,7 +15,7 @@ 1.5.12 2.9.5 1.7.25 - 0.6.1 + 0.6.3 1.2.3 4.12 1.4.20.Final 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 d42c25b55..2bf542ec4 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 @@ -15,7 +15,7 @@ 1.5.12 2.9.5 1.7.25 - 0.6.1 + 0.6.3 1.2.3 4.12 1.4.20.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index b9667642d..c40237583 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -19,7 +19,7 @@ 1.5.12 2.9.5 1.7.25 - 0.6.1 + 0.6.3 1.2.3 4.12 1.4.20.Final diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 5da191769..63ccac1e6 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -18,7 +18,7 @@ 1.5.12 } 1.7.25 - 0.6.1 + 0.6.3 1.2.3 4.12 1.4.20.Final diff --git a/pom.xml b/pom.xml index e7d24e196..b53363029 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 0.9.15 3.21.0-GA 1.7.25 - 0.6.1 + 0.6.3 4.7 1.3 2.5 From 8872fd9ef14d102ca9a24d2ad3a67ff1e129ea4b Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 6 Apr 2018 22:31:37 -0400 Subject: [PATCH 11/18] bot checkin --- .../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/rest/openapi/pom.xml.rocker.raw | 2 +- .../main/resources/templates/rest/swagger/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 7747d3646..2e91bd426 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.6.3 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 8.0 2.1.5 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 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 f1573647e..09465375e 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.6.3 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 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 2bf542ec4..34727bd41 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.6.3 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index c40237583..274aed5e8 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -22,7 +22,7 @@ 0.6.3 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 0.1.18 2.7.0 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 63ccac1e6..8ab63f742 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -21,7 +21,7 @@ 0.6.3 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 1.0.34 0.1.18 2.7.0 diff --git a/pom.xml b/pom.xml index b53363029..714210662 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 1.2.1 1.2.3 4.12 - 1.4.20.Final + 1.4.23.Final 1.0.34 1.3 3.8.0 From 7d0911876b1ca1bc9c748695bd5bc85b2bc197ec Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Fri, 6 Apr 2018 23:02:06 -0400 Subject: [PATCH 12/18] bot checkin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 714210662..fdcc3dd8e 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.5.3-beta 0.3 4.0.0 - 1.18 + 1.20 0.22.0 1.72 2.7.0 From 4399c834ae654c4c03aa5c32a07d19b5a0e120d9 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sun, 8 Apr 2018 16:24:39 -0400 Subject: [PATCH 13/18] bot checkin --- 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 +- .../resources/templates/graphql/pom.xml.rocker.raw | 4 ++-- light-hybrid-4j/pom.xml | 2 +- .../templates/hybrid/server/pom.xml.rocker.raw | 4 ++-- .../templates/hybrid/service/pom.xml.rocker.raw | 4 ++-- light-rest-4j/pom.xml | 2 +- .../templates/rest/openapi/pom.xml.rocker.raw | 8 ++++---- .../templates/rest/swagger/pom.xml.rocker.raw | 6 +++--- pom.xml | 10 +++++----- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index fa1c7e47e..428602d8d 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index a281bffba..86a2e01a8 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 422bedb30..1bdb77702 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 1f413cabf..46ef7f7e9 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 6bfcd6ec7..c9554a13c 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. 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 2e91bd426..f3af6a656 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 @@ -11,8 +11,8 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 2.9.5 1.7.25 0.6.3 diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index fad6a5cce..fa6fa0cf9 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. 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 09465375e..da9f7f260 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 @@ -11,8 +11,8 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 2.9.5 1.7.25 0.6.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 34727bd41..94b478dbd 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 @@ -11,8 +11,8 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 2.9.5 1.7.25 0.6.3 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 819ab82a9..4f3950789 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 1.5.12 + 1.5.13 .. diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index 274aed5e8..3922643b7 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -11,12 +11,12 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){ - 1.5.12 + 1.5.13 } - 1.5.12 + 1.5.13 2.9.5 1.7.25 0.6.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 8ab63f742..52359f157 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -11,11 +11,11 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 2.9.5 @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){ - 1.5.12 + 1.5.13 } 1.7.25 0.6.3 diff --git a/pom.xml b/pom.xml index fdcc3dd8e..14ee807bc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 1.5.12 + 1.5.13 pom Parent POM Light Code Generator @@ -66,10 +66,10 @@ 1.8 UTF-8 - 1.5.12 - 1.5.12 - 1.5.12 - 1.5.12 + 1.5.13 + 1.5.13 + 1.5.13 + 1.5.13 0.9.15 3.21.0-GA 1.7.25 From 3bdb8929f3802653dd73aab8a61fafed85cc9b72 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sun, 8 Apr 2018 20:07:56 -0400 Subject: [PATCH 14/18] fixes #139 enable codegen-web service with cors so it can be consumed by SPA --- codegen-web/pom.xml | 4 ++++ codegen-web/src/main/resources/config/service.yml | 2 ++ pom.xml | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index 46ef7f7e9..3a23d11da 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -58,6 +58,10 @@ com.networknt metrics + + com.networknt + cors + com.networknt traceability diff --git a/codegen-web/src/main/resources/config/service.yml b/codegen-web/src/main/resources/config/service.yml index ad49b0dc3..70f070fcd 100644 --- a/codegen-web/src/main/resources/config/service.yml +++ b/codegen-web/src/main/resources/config/service.yml @@ -21,6 +21,8 @@ singletons: - com.networknt.traceability.TraceabilityHandler # Correlation Create correlationId if it doesn't exist in the request header and put it into the request header - com.networknt.correlation.CorrelationHandler + # Cors handler to handler post/put pre-flight + - com.networknt.cors.CorsHttpHandler # SimpleAudit Log important info about the request into audit log - com.networknt.audit.AuditHandler # Generator interface implementations diff --git a/pom.xml b/pom.xml index 14ee807bc..1eeb64f00 100644 --- a/pom.xml +++ b/pom.xml @@ -171,6 +171,11 @@ metrics ${version.light-4j} + + com.networknt + cors + ${version.light-4j} + com.networknt correlation From 1bc399356f9483f7a4dada9c673812d0a11bb6ff Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Sun, 8 Apr 2018 22:41:20 -0400 Subject: [PATCH 15/18] fixes #138 Light Codegen Web with express server --- codegen-web/src/main/resources/config/cors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen-web/src/main/resources/config/cors.yml b/codegen-web/src/main/resources/config/cors.yml index 47a2248b1..fc7155c01 100644 --- a/codegen-web/src/main/resources/config/cors.yml +++ b/codegen-web/src/main/resources/config/cors.yml @@ -7,7 +7,7 @@ enabled: true allowedOrigins: - http://localhost # Support for react dev server. -- http://localhost:3000 +- http://localhost:3001 # Allowed methods list. allowedMethods: - GET From 14705799844dffc2d79d2c4ac0c16479940ba738 Mon Sep 17 00:00:00 2001 From: ddobrin Date: Wed, 11 Apr 2018 12:29:59 -0400 Subject: [PATCH 16/18] Fixes #141 Update REST API dependencies --- .../main/resources/templates/rest/openapi/pom.xml.rocker.raw | 4 ++-- .../main/resources/templates/rest/swagger/pom.xml.rocker.raw | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw index 3922643b7..d4d98d0b3 100644 --- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw @@ -24,9 +24,9 @@ 4.12 1.4.23.Final 0.1.18 - 2.7.0 + 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ - 2.6.2 + 3.0.0 } @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){ 11.2.0.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw index 52359f157..87d112394 100644 --- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw @@ -24,9 +24,9 @@ 1.4.23.Final 1.0.34 0.1.18 - 2.7.0 + 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ - 2.6.2 + 3.0.0 } @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){ 11.2.0.3 From 863829247d9762f014c4edc6b731ee22592071ff Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 11 Apr 2018 20:42:05 -0400 Subject: [PATCH 17/18] bot checkin --- .../main/resources/templates/hybrid/server/pom.xml.rocker.raw | 2 +- .../main/resources/templates/hybrid/service/pom.xml.rocker.raw | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 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 da9f7f260..67e92a063 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,7 +20,7 @@ 4.12 1.4.23.Final 0.1.18 - 2.7.0 + 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.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 94b478dbd..9ab1a7a19 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,7 +20,7 @@ 4.12 1.4.23.Final 0.1.18 - 2.7.0 + 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ 2.6.2 } diff --git a/pom.xml b/pom.xml index 1eeb64f00..9572d6b0d 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 1.20 0.22.0 1.72 - 2.7.0 + 2.18.1 8.0 2.4 -Xmx512m -XX:MaxPermSize=256m From f12894fd72ed09e05ca9648ab54b855f4138ff86 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Wed, 11 Apr 2018 20:51:40 -0400 Subject: [PATCH 18/18] bot checkin --- .../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 +- 3 files changed, 3 insertions(+), 3 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 f3af6a656..85d06dd66 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 @@ 8.0 2.1.5 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ - 2.6.2 + 3.0.0 } @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){ 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 67e92a063..b7854d699 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 @@ -22,7 +22,7 @@ 0.1.18 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ - 2.6.2 + 3.0.0 } @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){ 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 9ab1a7a19..fb075ec84 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 @@ -22,7 +22,7 @@ 0.1.18 2.18.1 @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){ - 2.6.2 + 3.0.0 } @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){ 11.2.0.3