license调整为apache

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
+Licensed under the Apache License, Version 2.0 (the "License");
-of this software and associated documentation files (the "Software"), to deal
+you may not use this file except in compliance with the License.
-in the Software without restriction, including without limitation the rights
+You may obtain a copy of the License at
-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:
 
-The above copyright notice and this permission notice shall be included in all
+     http://www.apache.org/licenses/LICENSE-2.0
-copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+Unless required by applicable law or agreed to in writing, software
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+distributed under the License is distributed on an "AS IS" BASIS,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+See the License for the specific language governing permissions and
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+limitations under the License.
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -36,14 +36,14 @@ weixin4j
 	<dependency>
 	    <groupId>com.foxinmy</groupId>
 	    <artifactId>weixin4j-mp-api</artifactId>
-	    <version>1.0</version>
+	    <version>x.x</version>
 	</dependency>
 微信企业号API
 
 	<dependency>
 	    <groupId>com.foxinmy</groupId>
 	    <artifactId>weixin4j-qy-api</artifactId>
-	    <version>1.0</version>
+	    <version>x.x</version>
 	</dependency>
 以上依赖如果出现Missing artifact错误 请尝试在eclipse里这么做
 

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.foxinmy</groupId>
 	<artifactId>weixin4j</artifactId>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>weixin4j</name>
 	<url>https://github.com/foxinmy/weixin4j</url>
@@ -12,14 +12,17 @@
 	<inceptionYear>2014</inceptionYear>
 	<licenses>
 		<license>
-			<name>MIT</name>
+			<name>Apache License, Version 2.0</name>
-			<url>https://github.com/foxinmy/weixin4j/blob/master/LICENSE</url>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>A business-friendly OSS license</comments>
 		</license>
 	</licenses>
 	<scm>
 		<url>https://github.com/foxinmy/weixin4j</url>
 		<connection>scm:git:git://github.com/foxinmy/weixin4j.git</connection>
 		<developerConnection>scm:git:git@github.com:foxinmy/weixin4j.git</developerConnection>
+		<tag>HEAD</tag>
 	</scm>
 	<issueManagement>
 		<url>https://github.com/foxinmy/weixin4j/issues</url>
@@ -30,7 +33,7 @@
 			<id>jinyu</id>
 			<name>jinyu</name>
 			<url>https://github.com/foxinmy</url>
-			<timezone>8</timezone>
+			<timezone>+8</timezone>
 			<roles>
 				<role>java developer</role>
 			</roles>
@@ -144,7 +147,7 @@
 						<execution>
 							<id>attach-sources</id>
 							<goals>
-								<goal>jar</goal>
+								<goal>jar-no-fork</goal>
 							</goals>
 						</execution>
 					</executions>
@@ -220,15 +223,6 @@
 		</dependencies>
 	</dependencyManagement>
 	<profiles>
-		<profile>
-			<id>dev</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<maven.test.skip>true</maven.test.skip>
-			</properties>
-		</profile>
 		<profile>
 			<id>release</id>
 			<build>
@@ -254,11 +248,11 @@
 	</profiles>
 	<distributionManagement>
 		<snapshotRepository>
-			<id>oss</id>
+			<id>oss-snapshot</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
 		</snapshotRepository>
 		<repository>
-			<id>oss</id>
+			<id>oss-release</id>
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>

weixin4j-base/pom.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-base</artifactId>
 	<name>weixin4j-base</name>
@@ -25,10 +26,6 @@
 			<artifactId>httpclient</artifactId>
 			<version>${httpclient.version}</version>
 			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
 				<exclusion>
 					<groupId>commons-codec</groupId>
 					<artifactId>commons-codec</artifactId>

weixin4j-mp/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp</artifactId>
 	<name>weixin4j-mp</name>

weixin4j-mp/weixin4j-mp-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-mp</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp-api</artifactId>
 	<name>weixin4j-mp-api</name>

weixin4j-mp/weixin4j-mp-server/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-mp</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp-server</artifactId>
 	<name>weixin4j-mp-server</name>

weixin4j-qy/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy</artifactId>
 	<name>weixin4j-qy</name>

weixin4j-qy/weixin4j-qy-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-qy</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy-api</artifactId>
 	<name>weixin4j-qy-api</name>

weixin4j-qy/weixin4j-qy-server/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-qy</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy-server</artifactId>
 	<name>weixin4j-qy-server</name>