Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevehu
stevehu committed Feb 25, 2021
2 parents 4da2f6f + a7106a1 commit ea02de6
Show file tree
Hide file tree
Showing 523 changed files with 14,147 additions and 4,764 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ target/
bower_components/
node_modules/
dist/
build/
.gradle/
.idea/
.tmp/
.project
Expand Down
2 changes: 1 addition & 1 deletion client/consul/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>1.5.20</version.light-4j>
<version.undertow>2.1.3.Final</version.undertow>
<version.undertow>2.2.4.Final</version.undertow>
<version.assertj>2.1.0</version.assertj>
<version.hamcrest>1.3</version.hamcrest>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions client/pdf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.16-SNAPSHOT</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>

<versions.maven-version>2.4</versions.maven-version>
Expand Down
2 changes: 1 addition & 1 deletion client/standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>2.0.1</version.light-4j>
<version.undertow>2.1.3.Final</version.undertow>
<version.undertow>2.2.4.Final</version.undertow>
<version.assertj>2.1.0</version.assertj>
<version.hamcrest>1.3</version.hamcrest>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion client/tableau/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>2.0.1</version.light-4j>
<version.undertow>2.1.3.Final</version.undertow>
<version.undertow>2.2.4.Final</version.undertow>
<version.assertj>2.1.0</version.assertj>
<version.hamcrest>1.3</version.hamcrest>
<version.logback>1.2.3</version.logback>
Expand Down
2 changes: 1 addition & 1 deletion client/tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>2.0.1</version.light-4j>
<version.undertow>2.1.3.Final</version.undertow>
<version.undertow>2.2.4.Final</version.undertow>
<version.assertj>2.1.0</version.assertj>
<version.hamcrest>1.3</version.hamcrest>
</properties>
Expand Down
8 changes: 4 additions & 4 deletions common/multidb/dbconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.3</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.commons-text>1.3</version.commons-text>
<version.encoder>1.2.1</version.encoder>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>2.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>
<version.hikaricp>3.1.0</version.hikaricp>
<version.h2>1.3.176</version.h2>
Expand Down
8 changes: 4 additions & 4 deletions common/multidb/generated/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</version.jackson>
<version.slf4j>1.7.25</version.slf4j>
<version.jose4j>0.6.3</version.jose4j>
<version.antlr4>4.7</version.antlr4>
<version.commons-text>1.3</version.commons-text>
<version.encoder>1.2.1</version.encoder>
<version.logback>1.2.3</version.logback>
<version.junit>4.12</version.junit>
<version.undertow>2.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>

<version.hikaricp>3.1.0</version.hikaricp>
Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/consul-tls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/consul/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/consuldocker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/dynamic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/generated/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/http-health/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/kubernetes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/multiple/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/open-tracing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/portal-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/static/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/tag/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_a/token/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
8 changes: 4 additions & 4 deletions discovery/api_b/consul-tls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.class>com.networknt.server.Server</project.main.class>
<version.light-4j>2.0.23</version.light-4j>
<version.jackson>2.10.4</version.jackson>
<version.light-4j>2.0.24</version.light-4j>
<version.jackson>2.12.1</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.1.3.Final</version.undertow>
<version.json-schema-validator>1.0.29</version.json-schema-validator>
<version.undertow>2.2.4.Final</version.undertow>
<version.json-schema-validator>1.0.49</version.json-schema-validator>
<version.fastscanner>2.18.1</version.fastscanner>


Expand Down
Loading

0 comments on commit ea02de6

Please sign in to comment.