Browse Source

去掉tools.jar的配置,使用系统自带

huangbo 8 years ago
parent
commit
acc1057242

+ 1 - 1
display-client/AndroidManifest.xml

@ -6,7 +6,7 @@
6 6

7 7
    <uses-sdk
8 8
        android:minSdkVersion="8"
9
        android:targetSdkVersion="15" />
9
        android:targetSdkVersion="22" />
10 10

11 11
    <uses-permission android:name="android.permission.CAMERA" />
12 12
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

+ 1 - 1
display-client/project.properties

@ -11,7 +11,7 @@
11 11
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12 12
13 13
# Project target.
14
target=android-15
14
target=android-22
15 15
android.library=false
16 16
android.library.reference.1=..\\wade-mobile-lib
17 17
android.library.reference.2=..\\wade-mobile-common

+ 0 - 4
display-server/pom.xml

@ -30,10 +30,6 @@
30 30
			<artifactId>junit</artifactId>
31 31
		</dependency>
32 32
		<dependency>
33
			<groupId>com.sun</groupId>
34
			<artifactId>tools</artifactId>
35
		</dependency>
36
		<dependency>
37 33
			<groupId>javax.servlet</groupId>
38 34
			<artifactId>servlet-api</artifactId>
39 35
		</dependency>

+ 0 - 8
ipu-server-lib/pom.xml

@ -14,7 +14,6 @@
14 14
		<encoding>UTF-8</encoding>
15 15
		<!-- 公共必选依赖 -->
16 16
		<junit>3.8.1</junit>
17
		<jdk-tools>1.6.0</jdk-tools>
18 17
		<servlet-api>2.5</servlet-api>
19 18
		<log4j>1.2.8</log4j>
20 19
		<unirest-java>1.3.8</unirest-java>
@ -53,13 +52,6 @@
53 52
				<scope>test</scope>
54 53
			</dependency>
55 54
			<dependency>
56
				<groupId>com.sun</groupId>
57
				<artifactId>tools</artifactId>
58
				<version>${jdk-tools}</version>
59
				<scope>system</scope>
60
				<systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
61
			</dependency>
62
			<dependency>
63 55
				<groupId>javax.servlet</groupId>
64 56
				<artifactId>servlet-api</artifactId>
65 57
				<version>${servlet-api}</version>