Merge pull request #347 from deedee/jwttoken_update

Jwttoken update

Author: skyhit

build-dependencies.xml

@@ -353,11 +353,11 @@
     <property name="asm-commons-5.2.jar" value="${ext_libdir}/asm/asm-commons-5.2.jar"/>
     <property name="asm-tree-5.2.jar" value="${ext_libdir}/asm/asm-tree-5.2.jar"/>
     <property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
-    <property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
-    <property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
-    <property name="jackson-annotations-2.3.0.jar" value="${ext_libdir}/jackson/1.9.7/jackson-annotations-2.3.0.jar"/>
-    <property name="jackson-core-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-2.3.2.jar"/>
-    <property name="jackson-databind-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-databind-2.3.2.jar"/>
+    <property name="jackson-core.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-asl.jar"/>
+    <property name="jackson-mapper.jar" value="${ext_libdir}/jackson/2.8.1/jackson-mapper-asl.jar"/>
+    <property name="jackson-annotations-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-annotations-2.8.1.jar"/>
+    <property name="jackson-core-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-2.8.1.jar"/>
+    <property name="jackson-databind-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-databind-2.8.1.jar"/>
     <property name="axis.jar" value="${ext_libdir}/axis/1.3/axis.jar"/>
     <property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
     <property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
@@ -442,7 +442,10 @@
     <property name="dom4j-1.6.1.jar" value="${poi_libdir}/ooxml-lib/dom4j-1.6.1.jar"/>
     <property name="xmlbeans-2.3.0.jar" value="${poi_libdir}/ooxml-lib/xmlbeans-2.3.0.jar"/>
 
-    <property name="java-jwt-1.0.0.jar" value="${ext_libdir}/jwt/java-jwt-1.0.0.jar"/>
+    <property name="java-jwt-3.3.0.jar" value="${ext_libdir}/jwt/java-jwt-3.3.0.jar"/>
+    <property name="jwks-rsa-0.3.0.jar" value="${ext_libdir}/jwt/jwks-rsa-0.3.0.jar"/>
+    <property name="guava-19.0.jar" value="${ext_libdir}/jwt/guava-19.0.jar"/>
+    <property name="commons-codec-1.9.jar" value="${ext_libdir}/jwt/commons-codec-1.9.jar"/>
 
     <!-- Http Client libs -->
     <property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
@@ -641,16 +644,18 @@
         <pathelement location="${yuicompressor.jar}"/>
         <pathelement location="${jackson-core.jar}"/>
         <pathelement location="${jackson-mapper.jar}"/>
-        <pathelement location="${jackson-annotations-2.3.0.jar}"/>
-        <pathelement location="${jackson-core-2.3.2.jar}"/>
-        <pathelement location="${jackson-databind-2.3.2.jar}"/>
+        <pathelement location="${jackson-annotations-2.8.1.jar}"/>
+        <pathelement location="${jackson-core-2.8.1.jar}"/>
+        <pathelement location="${jackson-databind-2.8.1.jar}"/>
         <pathelement location="${scribe.jar}"/>
         <pathelement location="${jedis.jar}"/>
 <!--
         <pathelement location="${jsr311.jar}"/>
         <pathelement location="${cxf.jar}"/>
 -->
-        <pathelement location="${java-jwt-1.0.0.jar}"/>
+        <pathelement location="${java-jwt-3.3.0.jar}"/>
+        <pathelement location="${jwks-rsa-0.3.0.jar}"/>
+        <pathelement location="${guava-19.0.jar}"/>
     </path>
 
 </project>

build.xml

@@ -309,13 +309,16 @@
         </copy>
     	<copy file="${jackson-core.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
     	<copy file="${jackson-mapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-annotations-2.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-core-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-databind-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-annotations-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-core-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-databind-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${encoder.jar}" todir="${ear_shared_libdir}" overwrite="true" />
 
     	<copy file="${yuicompressor.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${java-jwt-1.0.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${java-jwt-3.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jwks-rsa-0.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${guava-19.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-codec-1.9.jar}" tofile="${jboss_lib}/commons-codec.jar" overwrite="true"/>
 
         <!-- EJB components -->
         <copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>

components/topcoder_cockpit_asset_services/build-dependencies.xml

@@ -23,7 +23,7 @@
     <property name="spring-framework.dir" value="${ext_libdir}/spring/"/>
     <property name="commons-logging.jar" value="${ext_libdir}/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
     <property name="hibernate.dir" value="${ext_libdir}/hibernate"/>
-    <property name="jackson.dir" value="${ext_libdir}/jackson/1.9.7"/>
+    <property name="jackson.dir" value="${ext_libdir}/jackson/2.8.1"/>
     <property name="aspectj.dir" value="${ext_libdir}/aspectj/"/>
 
     <path id="component.tcs-dependencies">
@@ -58,4 +58,4 @@
         <pathelement location="${ifxjdbc.jar}"/>
     </path>
 
-</project>
+</project>

conf/Direct.properties

@@ -17,6 +17,7 @@ JWT_EXPIRATION_SECONDS = @JWT_EXPIRATION_SECONDS@
 LDAP_AUTH0_CONNECTION_NAME = @LDAP_AUTH0_CONNECTION_NAME@
 REDIRECT_URL_AUTH0 = /reg2/callback.action
 REG_SERVER_NAME= @REG_SERVER_NAME@
+JWT_VALID_ISSUERS=@JWT_VALID_ISSUERS@
 
 #Parameter whether we use login processor or not
 USE_LOGIN_PROCESSOR = @useLoginProcessor@