Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

ipu-server-lib/pom.xml

@@ -47,6 +47,7 @@
		<maven-surefire-plugin>2.5</maven-surefire-plugin>
		<maven-war-plugin>2.6</maven-war-plugin>
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
		<maven-dependency-plugin>2.4</maven-dependency-plugin>
		<!-- 本地jar路径 -->
		<jar-path>${project.basedir}/local1</jar-path>
@@ -415,6 +416,7 @@
				<plugin>
					<groupId>org.apache.maven.plugins</groupId>
					<artifactId>maven-dependency-plugin</artifactId>
					<version>${maven-dependency-plugin}</version>
					<executions>
						<execution>
							<id>copy-dep</id>