diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddc0227435..112513447e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed
+
+## 1.2.1 - 2017-02-03
+### Added
+- Add Cluster module to work with Client module for service discovery and load balance
+- Add Https support in server module.
+
+### Changed
+- Update consul registry to make it simpler and streamline.
+- Update cluster to work with registrator and docker
+
+
## 1.2.1 - 2017-01-25
### Added
diff --git a/audit/pom.xml b/audit/pom.xml
index 8b1c1524d7..157862d0ac 100644
--- a/audit/pom.xml
+++ b/audit/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/balance/pom.xml b/balance/pom.xml
index 4d97e16bd5..df116a86a7 100644
--- a/balance/pom.xml
+++ b/balance/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/body/pom.xml b/body/pom.xml
index 0c956b41c4..c0ac3f473e 100644
--- a/body/pom.xml
+++ b/body/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/client/pom.xml b/client/pom.xml
index 6687e6963f..d9430ff00f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/cluster/pom.xml b/cluster/pom.xml
index 9e889db281..49503c5a90 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/config/pom.xml b/config/pom.xml
index e040504165..3690349156 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/consul/pom.xml b/consul/pom.xml
index 59a33e241e..4dc03722b3 100644
--- a/consul/pom.xml
+++ b/consul/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/correlation/pom.xml b/correlation/pom.xml
index 129fe1f7f4..bdacb4a6e8 100644
--- a/correlation/pom.xml
+++ b/correlation/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/cors/pom.xml b/cors/pom.xml
index 09bff54577..5cf1e1d8ca 100644
--- a/cors/pom.xml
+++ b/cors/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/dump/pom.xml b/dump/pom.xml
index 47bae0c6e9..df11ef8d80 100644
--- a/dump/pom.xml
+++ b/dump/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/exception/pom.xml b/exception/pom.xml
index dfbd804983..cbd0c28ca8 100644
--- a/exception/pom.xml
+++ b/exception/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/handler/pom.xml b/handler/pom.xml
index 7cbdc02099..16e4b1c586 100644
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/health/pom.xml b/health/pom.xml
index 70ddcd9004..9e65af1256 100644
--- a/health/pom.xml
+++ b/health/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/info/pom.xml b/info/pom.xml
index 9c518e9af0..55e21a2e10 100644
--- a/info/pom.xml
+++ b/info/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/mask/pom.xml b/mask/pom.xml
index 3ba00655e4..86899b4c09 100644
--- a/mask/pom.xml
+++ b/mask/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/metrics/pom.xml b/metrics/pom.xml
index d4bd7fd741..c987dddbb0 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/pom.xml b/pom.xml
index 7bf1e203ad..3980def207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
4.0.0
com.networknt
light-java
- 1.2.1
+ 1.2.2
pom
Parent POM
Light Java Framework Components
diff --git a/registry/pom.xml b/registry/pom.xml
index 1f9c7023ef..e04f3a1420 100644
--- a/registry/pom.xml
+++ b/registry/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/sanitizer/pom.xml b/sanitizer/pom.xml
index a32ec49066..b29b0f6ef3 100644
--- a/sanitizer/pom.xml
+++ b/sanitizer/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/security/pom.xml b/security/pom.xml
index 976c87cc5d..fba4597fb7 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/server/pom.xml b/server/pom.xml
index 8d476e6334..71823c8a07 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/server/src/test/resources/config/client.json b/server/src/test/resources/config/client.json
deleted file mode 100644
index f0f5b67b48..0000000000
--- a/server/src/test/resources/config/client.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "description": "client configuration, all timing is milli-second",
- "sync": {
- "maxConnectionTotal": 100,
- "maxConnectionPerRoute": 10,
- "routes": {
- "api.google.com": 20,
- "api.facebook.com": 10
- },
- "timeout": 10000,
- "keepAlive": 15000
- },
- "async": {
- "maxConnectionTotal": 100,
- "maxConnectionPerRoute": 10,
- "routes": {
- "api.google.com": 20,
- "api.facebook.com": 10
- },
- "reactor": {
- "ioThreadCount": 1,
- "connectTimeout": 10000,
- "soTimeout": 10000
- },
- "timeout": 10000,
- "keepAlive": 15000
- },
- "tls": {
- "verifyHostname": false,
- "loadTrustStore": false,
- "trustStore": "trust.keystore",
- "trustPass": "password",
- "loadKeyStore": false,
- "keyStore": "key.jks",
- "keyPass": "password"
- },
- "oauth": {
- "tokenRenewBeforeExpired": 600000,
- "expiredRefreshRetryDelay": 5000,
- "earlyRefreshRetryDelay": 30000,
- "server_url": "http://localhost:8888",
- "authorization_code": {
- "uri": "/oauth2/token",
- "client_id": "3798d583-275c-47d7-bf46-a3c436846336",
- "client_secret": "CeHJjNRjRiS1dH1qqme2LQ",
- "redirect_uri": "https://localhost:8080/authorization_code",
- "scope": [
- "customer.r",
- "customer.w"
- ]
- },
- "client_credentials": {
- "uri": "/oauth2/token",
- "client_id": "6e9d1db3-2feb-4c1f-a5ad-9e93ae8ca59d",
- "client_secret": "sQesTWAnTwaw-Nn0oK35GA",
- "scope": [
- "account.r",
- "account.w"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/service/pom.xml b/service/pom.xml
index dd310ca7ac..1caaa50dfc 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/status/pom.xml b/status/pom.xml
index 7dedc2767a..9a818dd758 100644
--- a/status/pom.xml
+++ b/status/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/switcher/pom.xml b/switcher/pom.xml
index d8207cc38b..e3bff783b5 100644
--- a/switcher/pom.xml
+++ b/switcher/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/traceability/pom.xml b/traceability/pom.xml
index 1564440373..5f5aca7c47 100644
--- a/traceability/pom.xml
+++ b/traceability/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/utility/pom.xml b/utility/pom.xml
index 8a2b299d11..bcb85e2448 100644
--- a/utility/pom.xml
+++ b/utility/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..
diff --git a/zookeeper/pom.xml b/zookeeper/pom.xml
index 5d503c5d97..527275e3b6 100644
--- a/zookeeper/pom.xml
+++ b/zookeeper/pom.xml
@@ -21,7 +21,7 @@
com.networknt
light-java
- 1.2.1
+ 1.2.2
..