Skip to content

get the latest from develop branch #142

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
GavinChenYan merged 19 commits into from
Apr 16, 2018
Merged

get the latest from develop branch #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5b6d939
bot checkin
stevehu Apr 4, 2018
eaa7b1d
bot checkin
stevehu Apr 4, 2018
cd7bf55
bot checkin
stevehu Apr 4, 2018
6adfd64
bot checkin
stevehu Apr 5, 2018
b8e10d0
bot checkin
stevehu Apr 5, 2018
66d7927
fixes #134 remove commons-text dependency and unused properties from …
stevehu Apr 5, 2018
f2f6dad
fixes #135 remove unused properties from server and service templates…
stevehu Apr 5, 2018
0eb8e0c
fixes #136 remove unused properties from light-graphql-4j template
stevehu Apr 5, 2018
dc2f15b
fixes #137 upgrade graphql-java to version 8.0
stevehu Apr 6, 2018
a251745
bot checkin
stevehu Apr 7, 2018
8872fd9
bot checkin
stevehu Apr 7, 2018
7d09118
bot checkin
stevehu Apr 7, 2018
4399c83
bot checkin
stevehu Apr 8, 2018
3bdb892
fixes #139 enable codegen-web service with cors so it can be consumed…
stevehu Apr 9, 2018
1bc3993
fixes #138 Light Codegen Web with express server
stevehu Apr 9, 2018
1470579
Fixes #141 Update REST API dependencies
ddobrin Apr 11, 2018
8638292
bot checkin
stevehu Apr 12, 2018
f12894f
bot checkin
stevehu Apr 12, 2018
c60b342
Merge branch 'develop_eventuate' into develop
GavinChenYan Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codegen-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion codegen-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion codegen-fwk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
6 changes: 5 additions & 1 deletion codegen-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -58,6 +58,10 @@
<groupId>com.networknt</groupId>
<artifactId>metrics</artifactId>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>cors</artifactId>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>traceability</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion codegen-web/src/main/resources/config/cors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions codegen-web/src/main/resources/config/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion light-graphql-4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
16 changes: 7 additions & 9 deletions light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-graphql-4j>1.5.12</version.light-graphql-4j>
<version.jackson>2.9.4</version.jackson>
<version.light-4j>1.5.13</version.light-4j>
<version.light-graphql-4j>1.5.13</version.light-graphql-4j>
<version.jackson>2.9.5</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.encoder>1.2.1</version.encoder>
<version.jose4j>0.6.3</version.jose4j>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.graphql>4.2</version.graphql>
<version.undertow>1.4.23.Final</version.undertow>
<version.graphql>8.0</version.graphql>
<version.rxjava>2.1.5</version.rxjava>
@if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
<version.hikaricp>2.6.2</version.hikaricp>
<version.hikaricp>3.0.0</version.hikaricp>
}
@if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
<version.oracle>11.2.0.3</version.oracle>
Expand Down
2 changes: 1 addition & 1 deletion light-hybrid-4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
20 changes: 9 additions & 11 deletions light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
<version.light-4j>1.5.13</version.light-4j>
<version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
@if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
<version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
<version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
}
<version.jackson>2.9.4</version.jackson>
<version.jackson>2.9.5</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.encoder>1.2.1</version.encoder>
<version.jose4j>0.6.3</version.jose4j>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.json-schema-validator>0.1.15</version.json-schema-validator>
<version.fastscanner>2.7.0</version.fastscanner>
<version.undertow>1.4.23.Final</version.undertow>
<version.json-schema-validator>0.1.18</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>
@if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
<version.hikaricp>2.6.2</version.hikaricp>
<version.hikaricp>3.0.0</version.hikaricp>
}
@if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
<version.oracle>11.2.0.3</version.oracle>
Expand Down
20 changes: 9 additions & 11 deletions light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
<version.light-4j>1.5.13</version.light-4j>
<version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
@if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
<version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
<version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
}
<version.jackson>2.9.4</version.jackson>
<version.jackson>2.9.5</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.encoder>1.2.1</version.encoder>
<version.jose4j>0.6.3</version.jose4j>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.json-schema-validator>0.1.15</version.json-schema-validator>
<version.fastscanner>2.7.0</version.fastscanner>
<version.undertow>1.4.23.Final</version.undertow>
<version.json-schema-validator>0.1.18</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>
@if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
<version.hikaricp>2.6.2</version.hikaricp>
<version.hikaricp>3.0.0</version.hikaricp>
}
@if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
<version.oracle>11.2.0.3</version.oracle>
Expand Down
2 changes: 1 addition & 1 deletion light-rest-4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<relativePath>..</relativePath>
</parent>

Expand Down
29 changes: 10 additions & 19 deletions light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,22 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-rest-4j>1.5.12</version.light-rest-4j>
<version.light-4j>1.5.13</version.light-4j>
<version.light-rest-4j>1.5.13</version.light-rest-4j>
@if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
<version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
<version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
}

<version.openapi-parser>1.5.12</version.openapi-parser>
<version.jackson>2.9.4</version.jackson>
<version.openapi-parser>1.5.13</version.openapi-parser>
<version.jackson>2.9.5</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.commons-text>1.1</version.commons-text>
<version.encoder>1.2.1</version.encoder>
<version.jose4j>0.6.3</version.jose4j>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.json-schema-validator>0.1.15</version.json-schema-validator>
<version.fastscanner>2.7.0</version.fastscanner>
<version.undertow>1.4.23.Final</version.undertow>
<version.json-schema-validator>0.1.18</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>
@if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
<version.hikaricp>2.6.2</version.hikaricp>
<version.hikaricp>3.0.0</version.hikaricp>
}
@if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
<version.oracle>11.2.0.3</version.oracle>
Expand Down Expand Up @@ -244,11 +240,6 @@
<artifactId>logback-classic</artifactId>
<version>${version.logback}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${version.commons-text}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
Expand Down
30 changes: 11 additions & 19 deletions light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,22 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-rest-4j>1.5.12</version.light-rest-4j>
<version.jackson>2.9.4</version.jackson>
<version.light-4j>1.5.13</version.light-4j>
<version.light-rest-4j>1.5.13</version.light-rest-4j>
<version.jackson>2.9.5</version.jackson>
@if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
<version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
<version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
}
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.commons-text>1.1</version.commons-text>
<version.encoder>1.2.1</version.encoder>
<version.jose4j>0.6.3</version.jose4j>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.swagger>1.0.32</version.swagger>
<version.json-schema-validator>0.1.15</version.json-schema-validator>
<version.fastscanner>2.7.0</version.fastscanner>
<version.undertow>1.4.23.Final</version.undertow>
<version.swagger-parser>1.0.34</version.swagger-parser>
<version.json-schema-validator>0.1.18</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>
@if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
<version.hikaricp>2.6.2</version.hikaricp>
<version.hikaricp>3.0.0</version.hikaricp>
}
@if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
<version.oracle>11.2.0.3</version.oracle>
Expand Down Expand Up @@ -187,7 +184,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-parser</artifactId>
<version>${version.swagger}</version>
<version>${version.swagger-parser}</version>
</dependency>

@if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
Expand Down Expand Up @@ -242,11 +239,6 @@
<artifactId>logback-classic</artifactId>
<version>${version.logback}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${version.commons-text}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
Expand Down
33 changes: 19 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.networknt</groupId>
<artifactId>light-codegen</artifactId>
<version>1.5.12</version>
<version>1.5.13</version>
<packaging>pom</packaging>
<name>Parent POM</name>
<description>Light Code Generator</description>
Expand Down Expand Up @@ -66,37 +66,37 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.12</version.light-4j>
<version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
<version.light-rest-4j>1.5.12</version.light-rest-4j>
<version.openapi-parser>1.5.12</version.openapi-parser>
<version.light-4j>1.5.13</version.light-4j>
<version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
<version.light-rest-4j>1.5.13</version.light-rest-4j>
<version.openapi-parser>1.5.13</version.openapi-parser>
<version.jsoniter>0.9.15</version.jsoniter>
<version.javassist>3.21.0-GA</version.javassist>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.1</version.jose4j>
<version.jose4j>0.6.3</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.commons-text>1.1</version.commons-text>
<version.commons-text>1.3</version.commons-text>
<version.commons.io>2.5</version.commons.io>
<version.commons.codec>1.10</version.commons.codec>
<version.commons.codec>1.11</version.commons.codec>
<version.encoder>1.2.1</version.encoder>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>1.4.20.Final</version.undertow>
<version.swagger>1.0.32</version.swagger>
<version.undertow>1.4.23.Final</version.undertow>
<version.swagger-parser>1.0.34</version.swagger-parser>
<version.hamcrest>1.3</version.hamcrest>
<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>0.1.15</version.json-schema-validator>
<version.json-schema-validator>0.1.18</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>
<version.curator>4.0.0</version.curator>
<version.snakeyaml>1.18</version.snakeyaml>
<version.snakeyaml>1.20</version.snakeyaml>
<version.rocker>0.22.0</version.rocker>
<version.jcommander>1.72</version.jcommander>
<version.fastscanner>2.7.0</version.fastscanner>
<version.graphql>4.2</version.graphql>
<version.fastscanner>2.18.1</version.fastscanner>
<version.graphql>8.0</version.graphql>
<versions.maven-version>2.4</versions.maven-version>
<argLine>-Xmx512m -XX:MaxPermSize=256m</argLine>
</properties>
Expand Down Expand Up @@ -171,6 +171,11 @@
<artifactId>metrics</artifactId>
<version>${version.light-4j}</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>cors</artifactId>
<version>${version.light-4j}</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>correlation</artifactId>
Expand Down