update springversions

update springversions

.gitignore

@@ -1,10 +1,10 @@
 # Compiled class file
 #.gitignore
 *.class
-*/bin/*
 bin/*
-*/build/*
-build/*
+*/bin/*
+
+/.gradle/
 .gradle/*
 /.gradle/*
 
@@ -12,10 +12,15 @@ build/*
 *.log
 *.log.*
 */logs/*
-*/jdk/*
+
 jdk/*
+*/jdk/*
+
+
 
-*/org/apache/mybatis/jpa/*
 org/apache/mybatis/jpa/*
-/.gradle/
+*/org/apache/mybatis/jpa/*
+
 /build/
+build/*
+*/build/*

build.gradle

@@ -8,9 +8,9 @@ defaultTasks "clean", "build"
 ext {
 	jackson2Version      = "2.9.8"
 	log4jVersion         = "2.12.0"
-	springVersion        = "5.1.9.RELEASE"
-	springBootVersion    = "2.1.9.RELEASE"
-	springSecurityVersion= "5.2.0.RELEASE"
+	springVersion        = "5.2.2.RELEASE"
+	springBootVersion    = "2.2.1.RELEASE"
+	springSecurityVersion= "5.2.1.RELEASE"
 	hibernateVersion	 = "5.4.2.Final"
 	slf4jVersion	 	 = "1.7.26"
 	jacksonVersion		 = "2.9.9"
@@ -299,8 +299,8 @@ subprojects {
     	 //local jars
     	 compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*/*.jar')
     	 
-    	 compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.5.47'
-    	 compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2'
+    	 compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.29'
+    	 compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.0.29'
     	 
     	 //compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1'
     	 //compile group: 'javax.el', name: 'javax.el-api', version: '3.0.0'

maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl

@@ -125,10 +125,10 @@ $(function(){
 								<td colspan =3>
 									<select id="selectAdapter" name="selectAdapter"   class="form-control">
 										<option value="">No Adapter</option>
-										<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedDefaultAdapter" <#if "com.connsec.web.authorize.endpoint.adapter.TokenBasedDefaultAdapter"==model.adapter!>selected</#if>>DefaultAdapter</option>
-										<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedSimpleAdapter"  <#if  "com.connsec.web.authorize.endpoint.adapter.TokenBasedSimpleAdapter"==model.adapter!>selected</#if> >SimpleAdapter</option>
-										<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTAdapter" 	<#if  "com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTAdapter"==model.adapter!>selected</#if>>JWTAdapter</option>
-										<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if  "com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTHS256Adapter"==model.adapter!>selected</#if>>JWTHS256Adapter</option>
+										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter" <#if "org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter"==model.adapter!>selected</#if>>DefaultAdapter</option>
+										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"  <#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"==model.adapter!>selected</#if> >SimpleAdapter</option>
+										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter" 	<#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter"==model.adapter!>selected</#if>>JWTAdapter</option>
+										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter"==model.adapter!>selected</#if>>JWTHS256Adapter</option>
 									</select>
 								</td>
 							</tr>

maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl

@@ -132,10 +132,10 @@ $(function(){
 									<td colspan =3>
 										<select id="selectAdapter" name="selectAdapter"  class="form-control">
 											<option value="">No Adapter</option>
-											<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedDefaultAdapter" <#if 'com.connsec.web.authorize.endpoint.adapter.TokenBasedDefaultAdapter'==model.adapter!false>selected</#if>>DefaultAdapter</option>
-											<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedSimpleAdapter"  <#if 'com.connsec.web.authorize.endpoint.adapter.TokenBasedSimpleAdapter'==model.adapter!>selected</#if> >SimpleAdapter</option>
-											<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTAdapter" <#if 'com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTAdapter'==model.adapter!>selected</#if>>JWTAdapter</option>
-											<option value="com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if 'com.connsec.web.authorize.endpoint.adapter.TokenBasedJWTHS256Adapter'==model.adapter!>selected</#if>>JWTHS256Adapter</option>
+											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter'==model.adapter!false>selected</#if>>DefaultAdapter</option>
+											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"  <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter'==model.adapter!>selected</#if> >SimpleAdapter</option>
+											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter'==model.adapter!>selected</#if>>JWTAdapter</option>
+											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter'==model.adapter!>selected</#if>>JWTHS256Adapter</option>
 										</select>
 									</td>
 								</tr>