From e02e70e3a9f8dd964b49f1295fa5c4ca84401319 Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Tue, 9 Apr 2019 13:46:50 -0400 Subject: [PATCH] fixes #276 upgrade pom.xml template to have only one light-4j version --- .../hybrid/server/pom.xml.rocker.raw | 22 +++++++--------- .../hybrid/service/pom.xml.rocker.raw | 20 ++++++-------- .../openapi/commandservice/pom.xml.rocker.raw | 25 ++++++++---------- .../eventuate/rest/openapi/pom.xml.rocker.raw | 26 +++++++++---------- .../openapi/queryservice/pom.xml.rocker.raw | 25 ++++++++---------- .../templates/graphql/pom.xml.rocker.raw | 9 +++---- .../hybrid/server/pom.xml.rocker.raw | 10 ++++--- .../hybrid/service/pom.xml.rocker.raw | 5 ++-- .../templates/rest/openapi/pom.xml.rocker.raw | 12 ++++----- .../templates/rest/swagger/pom.xml.rocker.raw | 7 +++-- pom.xml | 7 ++--- 11 files changed, 74 insertions(+), 94 deletions(-) diff --git a/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/server/pom.xml.rocker.raw b/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/server/pom.xml.rocker.raw index 41f079b30..35a042c97 100644 --- a/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/server/pom.xml.rocker.raw +++ b/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/server/pom.xml.rocker.raw @@ -12,10 +12,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 - @if(config.toBoolean("eventuateQueryModule") || config.toBoolean("eventuateCommandModule")){ - 1.6.0 - } 2.9.8 1.7.25 0.6.3 @@ -76,12 +72,12 @@ com.networknt rpc-router - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt rpc-security - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt @@ -93,32 +89,32 @@ com.networknt eventuate-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-event - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-server-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} } @@ -134,7 +130,7 @@ com.fasterxml.jackson.datatype - jackson-datatype-jdk + jackson-datatype-jdk8 ${version.jackson} diff --git a/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/service/pom.xml.rocker.raw b/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/service/pom.xml.rocker.raw index 5e5f6fde4..3a862101d 100644 --- a/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/service/pom.xml.rocker.raw +++ b/light-eventuate-4j/src/main/resources/templates/eventuate/hybrid/service/pom.xml.rocker.raw @@ -12,10 +12,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 - @if(config.toBoolean("eventuateQueryModule") || config.toBoolean("eventuateCommandModule")){ - 1.6.0 - } 2.9.8 1.7.25 0.6.3 @@ -66,12 +62,12 @@ com.networknt rpc-router - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt rpc-security - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt @@ -141,32 +137,32 @@ com.networknt eventuate-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-event - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-server-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} } diff --git a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw index cfe66d07b..dfc3c27a9 100644 --- a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw +++ b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw @@ -11,10 +11,7 @@ 1.8 UTF-8 - 1.5.18 - 1.5.18 - 1.5.18 - 1.5.18 + 1.6.0 2.9.8 1.7.25 0.6.3 @@ -167,52 +164,52 @@ com.networknt openapi-parser - ${version.openapi-parser} + ${version.light-4j} com.networknt openapi-meta - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-security - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-validator - ${version.light-rest-4j} + ${version.light-4j} com.networknt eventuate-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-event - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-server-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} diff --git a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/pom.xml.rocker.raw b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/pom.xml.rocker.raw index d5db826db..224383650 100644 --- a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/pom.xml.rocker.raw +++ b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/pom.xml.rocker.raw @@ -11,10 +11,8 @@ 1.8 UTF-8 - 1.5.18 - 1.5.18 - 1.5.18 - 1.5.18 + 1.6.0 + 1.6.0 2.9.8 1.7.25 0.6.3 @@ -204,53 +202,53 @@ com.networknt openapi-parser - ${version.openapi-parser} + ${version.light-4j} com.networknt openapi-meta - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-security - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-validator - ${version.light-rest-4j} + ${version.light-4j} com.networknt eventuate-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-event - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-server-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} org.slf4j diff --git a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw index 67a164f30..095fecb5a 100644 --- a/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw +++ b/light-eventuate-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw @@ -11,10 +11,7 @@ 1.8 UTF-8 - 1.5.18 - 1.5.18 - 1.5.18 - 1.5.18 + 1.6.0 2.9.8 1.7.25 0.6.3 @@ -167,53 +164,53 @@ com.networknt openapi-parser - ${version.openapi-parser} + ${version.light-4j} com.networknt openapi-meta - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-security - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-validator - ${version.light-rest-4j} + ${version.light-4j} com.networknt eventuate-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-event - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc-common - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-client-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.networknt eventuate-server-jdbc - ${version.light-eventuate-4j} + ${version.light-4j} com.fasterxml.jackson.core 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 ba0e93979..37d48ec99 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,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 2.9.8 1.7.25 0.6.3 @@ -149,22 +148,22 @@ com.networknt graphql-common - ${version.light-graphql-4j} + ${version.light-4j} com.networknt graphql-router - ${version.light-graphql-4j} + ${version.light-4j} com.networknt graphql-security - ${version.light-graphql-4j} + ${version.light-4j} com.networknt graphql-validator - ${version.light-graphql-4j} + ${version.light-4j} 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 15224de67..a908b59e9 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,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 2.9.8 1.7.25 0.6.3 @@ -73,12 +72,12 @@ com.networknt rpc-router - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt rpc-security - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt @@ -101,6 +100,11 @@ jackson-datatype-jdk8 ${version.jackson} + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${version.jackson} + ch.qos.logback logback-classic 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 f2c391083..6c7f8f634 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,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 2.9.8 1.7.25 0.6.3 @@ -63,12 +62,12 @@ com.networknt rpc-router - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt rpc-security - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt 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 e062e1af6..b482e0888 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 @@ -13,8 +13,6 @@ UTF-8 com.networknt.server.Server 1.6.0 - 1.6.0 - 1.6.0 2.9.8 1.7.25 0.6.3 @@ -172,27 +170,27 @@ com.networknt openapi-parser - ${version.openapi-parser} + ${version.light-4j} com.networknt openapi-meta - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-security - ${version.light-rest-4j} + ${version.light-4j} com.networknt openapi-validator - ${version.light-rest-4j} + ${version.light-4j} com.networknt specification - ${version.light-rest-4j} + ${version.light-4j} com.fasterxml.jackson.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 c05bafc5a..0e802f3a5 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 @@ -12,7 +12,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 2.9.8 1.7.25 0.6.3 @@ -161,17 +160,17 @@ com.networknt swagger-meta - ${version.light-rest-4j} + ${version.light-4j} com.networknt swagger-security - ${version.light-rest-4j} + ${version.light-4j} com.networknt swagger-validator - ${version.light-rest-4j} + ${version.light-4j} com.networknt diff --git a/pom.xml b/pom.xml index 9aea798eb..bc3208103 100644 --- a/pom.xml +++ b/pom.xml @@ -67,9 +67,6 @@ 1.8 UTF-8 1.6.0 - 1.6.0 - 1.6.0 - 1.6.0 0.9.15 3.21.0-GA 1.7.25 @@ -161,7 +158,7 @@ com.networknt rpc-router - ${version.light-hybrid-4j} + ${version.light-4j} com.networknt @@ -211,7 +208,7 @@ com.networknt openapi-parser - ${version.openapi-parser} + ${version.light-4j}