diff --git a/LICENSE b/LICENSE index f5012512..8738a902 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,15 @@ -The MIT License (MIT) +The Apache License -Copyright (c) 2014 jy.hu +Copyright (c) 2014 jinyu -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + http://www.apache.org/licenses/LICENSE-2.0 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index dd1a9680..c229030c 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,14 @@ weixin4j com.foxinmy weixin4j-mp-api - 1.0 + x.x 微信企业号API com.foxinmy weixin4j-qy-api - 1.0 + x.x 以上依赖如果出现Missing artifact错误 请尝试在eclipse里这么做 diff --git a/pom.xml b/pom.xml index 53add63e..8792588e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.1-SNAPSHOT + 1.0-SNAPSHOT pom weixin4j https://github.com/foxinmy/weixin4j @@ -12,14 +12,17 @@ 2014 - MIT - https://github.com/foxinmy/weixin4j/blob/master/LICENSE + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license https://github.com/foxinmy/weixin4j scm:git:git://github.com/foxinmy/weixin4j.git scm:git:git@github.com:foxinmy/weixin4j.git + HEAD https://github.com/foxinmy/weixin4j/issues @@ -30,7 +33,7 @@ jinyu jinyu https://github.com/foxinmy - 8 + +8 java developer @@ -144,7 +147,7 @@ attach-sources - jar + jar-no-fork @@ -220,15 +223,6 @@ - - dev - - true - - - true - - release @@ -254,11 +248,11 @@ - oss + oss-snapshot https://oss.sonatype.org/content/repositories/snapshots/ - oss + oss-release https://oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index cef135ad..e136700d 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 com.foxinmy weixin4j - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-base weixin4j-base @@ -25,10 +26,6 @@ httpclient ${httpclient.version} - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index a33a1ae8..500e3ff7 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-mp weixin4j-mp diff --git a/weixin4j-mp/weixin4j-mp-api/pom.xml b/weixin4j-mp/weixin4j-mp-api/pom.xml index 87b67627..5c495e49 100644 --- a/weixin4j-mp/weixin4j-mp-api/pom.xml +++ b/weixin4j-mp/weixin4j-mp-api/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j-mp - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-mp-api weixin4j-mp-api diff --git a/weixin4j-mp/weixin4j-mp-server/pom.xml b/weixin4j-mp/weixin4j-mp-server/pom.xml index 2b988304..a94fd69b 100644 --- a/weixin4j-mp/weixin4j-mp-server/pom.xml +++ b/weixin4j-mp/weixin4j-mp-server/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j-mp - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-mp-server weixin4j-mp-server diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 3fa21e78..03b10e73 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-qy weixin4j-qy diff --git a/weixin4j-qy/weixin4j-qy-api/pom.xml b/weixin4j-qy/weixin4j-qy-api/pom.xml index 565ef631..f90e29d7 100644 --- a/weixin4j-qy/weixin4j-qy-api/pom.xml +++ b/weixin4j-qy/weixin4j-qy-api/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j-qy - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-qy-api weixin4j-qy-api diff --git a/weixin4j-qy/weixin4j-qy-server/pom.xml b/weixin4j-qy/weixin4j-qy-server/pom.xml index b8888293..86a2f3f6 100644 --- a/weixin4j-qy/weixin4j-qy-server/pom.xml +++ b/weixin4j-qy/weixin4j-qy-server/pom.xml @@ -4,7 +4,7 @@ com.foxinmy weixin4j-qy - 1.1-SNAPSHOT + 1.0-SNAPSHOT weixin4j-qy-server weixin4j-qy-server