Merge branch '1.6.x' of https://github.com/networknt/light-codegen in…

…to fix/#314-config-parameterization
networknt · Jun 25, 2019 · a515b3f · a515b3f
2 parents db30663 + 94827bd
commit a515b3f
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [1.6.4](https://github.com/networknt/light-codegen/tree/1.6.4) (2019-06-10)
+
+
+**Merged pull requests:**
+
+
+- fixes \#312 update openapi readme template for maven command line [\#313](https://github.com/networknt/light-codegen/pull/313) ([stevehu](https://github.com/stevehu))
+- fixes \#308 add both release and snapshot repositories [\#309](https://github.com/networknt/light-codegen/pull/309) ([stevehu](https://github.com/stevehu))
+- fixes \#304 update values.yml to ensure that the newly generated proje… [\#305](https://github.com/networknt/light-codegen/pull/305) ([stevehu](https://github.com/stevehu))
+- fixes \#301 service running error caused by config.yml file [\#303](https://github.com/networknt/light-codegen/pull/303) ([stevehu](https://github.com/stevehu))
+- fixes \#300 decryptor module is missing in the generated pom.xml file [\#302](https://github.com/networknt/light-codegen/pull/302) ([stevehu](https://github.com/stevehu))
 ## [1.6.2](https://github.com/networknt/light-codegen/tree/1.6.2) (2019-05-17)
 
 

diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/light-eventuate-4j/pom.xml b/light-eventuate-4j/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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
@@ -15,14 +15,14 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

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
@@ -15,14 +15,14 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

diff --git a/...-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw b/...-4j/src/main/resources/templates/eventuate/rest/openapi/commandservice/pom.xml.rocker.raw
@@ -22,7 +22,7 @@
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

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
@@ -15,7 +15,7 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.openapi-parser>1.6.0</version.openapi-parser>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
@@ -24,7 +24,7 @@
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
         <version.mockito>2.10.0</version.mockito>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

diff --git a/...te-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw b/...te-4j/src/main/resources/templates/eventuate/rest/openapi/queryservice/pom.xml.rocker.raw
@@ -22,7 +22,7 @@
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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
@@ -15,7 +15,7 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>

diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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
@@ -15,14 +15,14 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

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
@@ -15,14 +15,14 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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
@@ -15,14 +15,14 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

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
@@ -15,15 +15,15 @@
         }
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.main.class>com.networknt.server.Server</project.main.class>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jackson>2.9.9</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.undertow>2.0.16.Final</version.undertow>
         <version.swagger-parser>1.0.34</version.swagger-parser>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
         <version.hikaricp>3.1.0</version.hikaricp>

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>light-codegen</artifactId>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Parent POM</name>
     <description>Light Code Generator</description>
@@ -67,7 +67,7 @@
         <java.version>1.8</java.version>
         <javac.version>9+181-r4173-1</javac.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.6.3-SNAPSHOT</version.light-4j>
+        <version.light-4j>1.6.5-SNAPSHOT</version.light-4j>
         <version.jsoniter>0.9.15</version.jsoniter>
         <version.javassist>3.21.0-GA</version.javassist>
         <version.slf4j>1.7.25</version.slf4j>
@@ -85,7 +85,7 @@
         <version.assertj>3.8.0</version.assertj>
         <version.hdrhistogram>2.1.10</version.hdrhistogram>
         <version.jsr305>3.0.2</version.jsr305>
-        <version.json-schema-validator>1.0.13</version.json-schema-validator>
+        <version.json-schema-validator>1.0.14</version.json-schema-validator>
         <version.consul>1.2.4</version.consul>
         <version.zookeeper>3.5.3-beta</version.zookeeper>
         <version.zkclient>0.3</version.zkclient>