From 4163acf2891dc68910333b3a36faa8f2ddef3c9a Mon Sep 17 00:00:00 2001 From: shimingxy Date: Tue, 24 Mar 2020 20:08:07 +0800 Subject: [PATCH] v1.2.1 GA --- build.gradle | 27 +++++++++------------------ gradle.properties | 1 - settings.gradle | 10 ++-------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index fb9ef4be4..a8f3f01fd 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ configurations.all { transitive = false// 为本依赖关闭依赖传递特性 } - // Apply the java plugin to add support for Java //apply plugin: 'java' allprojects { @@ -119,10 +118,13 @@ subprojects { //all dependencies dependencies { + //for Test and Compile testCompile 'junit:junit:4.11' compileOnly 'junit:junit:4.11' testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' + testCompile group: 'xmlunit', name: 'xmlunit', version: '1.6' //apache compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' compile group: 'commons-codec', name: 'commons-codec', version: '1.14' @@ -158,9 +160,7 @@ subprojects { compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}" compile group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}" compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" - compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.4.1.Final' - //spring compile group: 'org.springframework', name: 'spring-aop', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-aspects', version: "${springVersion}" @@ -201,22 +201,19 @@ subprojects { compile group: 'org.opensaml', name: 'opensaml', version: '2.6.4' compile group: 'org.opensaml', name: 'openws', version: '1.5.4' compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4' - //jose-jwt compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.10' compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0' compile group: 'net.minidev', name: 'json-smart', version: '2.3' compile group: 'net.minidev', name: 'asm', version: '1.0.2' - //oauth third party + //oauth third party JustAuth compile group: 'cn.hutool', name: 'hutool-core', version: '5.2.2' compile group: 'cn.hutool', name: 'hutool-http', version: '5.2.2' compile group: 'me.zhyd.oauth', name: 'JustAuth', version: '1.13.2' - + //common compile group: 'org.javassist', name: 'javassist', version: '3.23.0-GA' compile group: 'org.owasp.esapi', name: 'esapi', version: '2.2.0.0' compile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2' - compile group: 'taglibs', name: 'standard', version: '1.1.2' - compile group: 'javax.servlet.jsp.jstl', name: 'jstl', version: '1.2' compile group: 'javax.activation', name: 'activation', version: '1.1.1' compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' compile group: 'javax.transaction', name: 'jta', version: '1.1' @@ -243,18 +240,18 @@ subprojects { compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}" compile group: 'com.fasterxml', name: 'classmate', version: '1.5.0' compile group: 'com.alibaba', name: 'fastjson', version: '1.2.66' - + //reactive compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.2' compile group: 'io.projectreactor', name: 'reactor-core', version: '3.2.10.RELEASE' compile group: 'eu.tekul', name: 'szxcvbn_2.9.2', version: '0.2' //quartz compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2' - //database compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.48' compile group: 'com.alibaba', name: 'druid', version: '1.1.21' compile group: 'redis.clients', name: 'jedis', version: '3.2.0' compile group: 'org.ehcache', name: 'ehcache', version: '3.8.1' + compile group: 'javax.cache', name: 'cache-api', version: '1.1.0' //mybatis compile group: 'org.mybatis', name: 'mybatis', version: '3.5.4' compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.4' @@ -262,7 +259,7 @@ subprojects { compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: "${hibernateVersion}" compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: "${hibernateVersion}" compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: "${hibernateVersion}" - + //usefull compile group: 'joda-time', name: 'joda-time', version: '2.10.5' compile group: 'org.yaml', name: 'snakeyaml', version: '1.26' compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22' @@ -280,15 +277,9 @@ subprojects { compile group: 'org.apache.santuario', name: 'xmlsec', version: '1.5.8' compile group: 'org.ogce', name: 'xpp3', version: '1.1.6' compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10' - testCompile group: 'xmlunit', name: 'xmlunit', version: '1.6' - - //compile group: 'com.belerweb', name: 'pinyin4j', version: '2.5.1' - - testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' - //local jars compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar') - //tomcat + //tomcat embed 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: '8.5.2' } diff --git a/gradle.properties b/gradle.properties index 89bf47bb6..581d9622b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ group =org.maxkey version =1.2.1.RELEASE vendor =https://github.com/shimingxy/MaxKey author =shimingxy - #Version For use jar jackson2Version =2.9.8 log4jVersion =2.13.1 diff --git a/settings.gradle b/settings.gradle index 55aae80be..a122ea4d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,15 +2,11 @@ * in the user guide at https://docs.gradle.org */ rootProject.name = 'MaxKey' - //Common include 'maxkey-client-sdk' include 'maxkey-core' include 'maxkey-dao' -//include 'maxkey-jose-jwt' - include 'maxkey-authentications' - //Protocol //include 'maxkey-protocols' include 'maxkey-protocols:maxkey-protocol-oauth-2.0' @@ -21,10 +17,8 @@ include 'maxkey-protocols:maxkey-protocol-extendapi' include 'maxkey-protocols:maxkey-protocol-formbased' include 'maxkey-protocols:maxkey-protocol-tokenbased' include 'maxkey-protocols:maxkey-protocol-cas' - //include 'maxkey-webs' +//maxkey include 'maxkey-web-maxkey' -//IM +//maxkey-mgt include 'maxkey-web-manage' - -