fixes #35 upgrade to framework 1.3.1

networknt · Jun 3, 2017 · 90b7e17 · 90b7e17
1 parent fc9190a
commit 90b7e17
Show file tree

Hide file tree

Showing 32 changed files with 80 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 
+### Changed
+
+## 1.3.1 - 2017-06-02
+### Added
+
 ### Changed
 - Update Dockerfile to reflect the version change. Thanks @gonzalovazquez
 - Fixes #24 createDt and updateDt not populated in in-memory data grid
 - Fixes #23 default allowed origin in CORS to http://localhost:8080 for market place development. 
+- Fixes #25 return clear text client secret after creating a new client
+- Fixes #26 Oracle XE vesion to 16.04 in docker-compose-oracle.yml
+- Fixes #27 remove client secret for all get endpoints for client
+- Fixes #28 all client authenticated by form data Thanks @smerschjohann
+- Fixes #32 add one more test case to ensure that one of the scope matches with multiple scopes
+- Fixes #35 upgrade light-4j and light-rest-4j to 1.3.1
 
 ## 1.2.4 - 2017-02-19
 ### Added

diff --git a/cache/pom.xml b/cache/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cache/src/test/resources/config/service.yml b/cache/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/client/dependency-reduced-pom.xml b/client/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-client</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/client/src/test/resources/config/service.yml b/client/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/code/dependency-reduced-pom.xml b/code/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-code</artifactId>

diff --git a/code/pom.xml b/code/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/code/src/main/resources/config/jwt.json b/code/src/main/resources/config/jwt.json
diff --git a/code/src/main/resources/config/jwt.yml b/code/src/main/resources/config/jwt.yml
@@ -0,0 +1,13 @@
+# This is the default JWT configuration and need to be updated when used to issue JWT tokens. It is a component that used to
+# issue JWT token. Normally, it should be used by light-oauth2 only but can be used to issue tokens distributely.
+---
+# Signature private key that used to sign JWT tokens.
+key:
+  kid: '100'                               # kid that used to sign the JWT tokens. It will be shown up in the token header.
+  filename: "/config/oauth/primary.jks"    # private key that is used to sign JWT tokens.
+  password: password                       # password for the private key. It should be set during deployment time along with pk
+  keyName: selfsigned                      # key name that is used to identify the right key in keystore.
+issuer: urn:com:networknt:oauth2:v1        # default issuer of the JWT token
+audience: urn:com.networknt                # default audience of the JWT token
+expiredInMinutes: 10                       # expired in 10 minutes by default for issued JWT tokens
+version: '1.0'                             # JWT token version
diff --git a/code/src/test/resources/config/service.yml b/code/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/key/dependency-reduced-pom.xml b/key/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-key</artifactId>

diff --git a/key/pom.xml b/key/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/key/src/test/resources/config/service.yml b/key/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>light-oauth2</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
     <packaging>pom</packaging>
     <name>Parent POM</name>
     <description>OAuth2 provider microservices based on Light-Java and SQL</description>
@@ -52,8 +52,8 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-java>1.2.7</version.light-java>
-        <version.light-java-rest>1.2.7</version.light-java-rest>
+        <version.light-4j>1.3.1</version.light-4j>
+        <version.light-rest-4j>1.3.1</version.light-rest-4j>
         <version.jackson>2.8.7</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
         <version.jose4j>0.5.5</version.jose4j>
@@ -143,128 +143,128 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>config</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>client</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>info</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>body</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>mask</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>metrics</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>handler</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>sanitizer</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>traceability</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>correlation</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>service</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>utility</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>security</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>audit</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>status</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>exception</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>registry</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>balance</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>cluster</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>consul</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>cors</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>server</artifactId>
-                <version>${version.light-java}</version>
+                <version>${version.light-4j}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-meta</artifactId>
-                <version>${version.light-java-rest}</version>
+                <version>${version.light-rest-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-security</artifactId>
-                <version>${version.light-java-rest}</version>
+                <version>${version.light-rest-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-validator</artifactId>
-                <version>${version.light-java-rest}</version>
+                <version>${version.light-rest-4j}</version>
             </dependency>
 
             <dependency>

diff --git a/refresh-token/dependency-reduced-pom.xml b/refresh-token/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-refresh-token</artifactId>

diff --git a/refresh-token/pom.xml b/refresh-token/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/refresh-token/src/main/resources/config/cors.yml b/refresh-token/src/main/resources/config/cors.yml
@@ -2,7 +2,6 @@
 # from light-portal single page application which might served
 # from another domain/host. You may need to update allowedOrigins.
 ---
-description: Cors Http Handler
 enabled: true
 allowedOrigins:
 - http://localhost:8080

diff --git a/refresh-token/src/test/resources/config/service.yml b/refresh-token/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/service/dependency-reduced-pom.xml b/service/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-service</artifactId>

diff --git a/service/pom.xml b/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/service/src/main/resources/config/cors.yml b/service/src/main/resources/config/cors.yml
@@ -2,7 +2,6 @@
 # from light-portal single page application which might served
 # from another domain/host. You may need to update allowedOrigins.
 ---
-description: Cors Http Handler
 enabled: true
 allowedOrigins:
 - http://localhost:8080

diff --git a/service/src/test/resources/config/service.yml b/service/src/test/resources/config/service.yml
@@ -1,5 +1,4 @@
 ---
-description: singleton service factory configuration
 singletons:
 - javax.sql.DataSource:
   - com.zaxxer.hikari.HikariDataSource:

diff --git a/token/dependency-reduced-pom.xml b/token/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>light-oauth2</artifactId>
     <groupId>com.networknt</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>oauth2-token</artifactId>

diff --git a/token/pom.xml b/token/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-oauth2</artifactId>
-        <version>1.2.4</version>
+        <version>1.3.1</version>
         <relativePath>..</relativePath>
     </parent>