Skip to content

Commit 35379d1

Browse files
author
bzhangxmt
committed
Update android service pom.xml and enable eclipse maven project nature
Able to build android service jar from eclipse maven tool. Signed-off-by: bzhangxmt <zhbinbj@cn.ibm.com>
1 parent 06da39c commit 35379d1

3 files changed

Lines changed: 25 additions & 28 deletions

File tree

org.eclipse.paho.android.service/org.eclipse.paho.android.service/.classpath

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,22 @@
33
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
44
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
55
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
6-
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="src" output="target/classes" path="src">
7+
<attributes>
8+
<attribute name="optional" value="true"/>
9+
<attribute name="maven.pomderived" value="true"/>
10+
</attributes>
11+
</classpathentry>
712
<classpathentry kind="src" path="gen"/>
13+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
14+
<attributes>
15+
<attribute name="maven.pomderived" value="true"/>
16+
</attributes>
17+
</classpathentry>
18+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
19+
<attributes>
20+
<attribute name="maven.pomderived" value="true"/>
21+
</attributes>
22+
</classpathentry>
823
<classpathentry kind="output" path="bin/classes"/>
924
</classpath>

org.eclipse.paho.android.service/org.eclipse.paho.android.service/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
2328
<buildCommand>
2429
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
2530
<arguments>
@@ -28,6 +33,7 @@
2833
</buildSpec>
2934
<natures>
3035
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
36+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3137
<nature>org.eclipse.jdt.core.javanature</nature>
3238
</natures>
3339
</projectDescription>

org.eclipse.paho.android.service/org.eclipse.paho.android.service/pom.xml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,6 @@
2121
<target>${java.version}</target>
2222
</configuration>
2323
</plugin>
24-
<plugin>
25-
<groupId>org.apache.maven.plugins</groupId>
26-
<artifactId>maven-resources-plugin</artifactId>
27-
<version>2.4.2</version>
28-
<executions>
29-
<execution>
30-
<id>default-copy-resources</id>
31-
<phase>process-resources</phase>
32-
<goals>
33-
<goal>copy-resources</goal>
34-
</goals>
35-
<configuration>
36-
<overwrite>true</overwrite>
37-
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
38-
<resources>
39-
<resource>
40-
<!-- used in modules which relative to its parent -->
41-
<directory>../../</directory>
42-
<includes>
43-
<include>about.html</include>
44-
</includes>
45-
</resource>
46-
</resources>
47-
</configuration>
48-
</execution>
49-
</executions>
50-
</plugin>
5124
<plugin>
5225
<groupId>org.apache.maven.plugins</groupId>
5326
<artifactId>maven-source-plugin</artifactId>
@@ -73,7 +46,10 @@
7346
</goals>
7447
<configuration>
7548
<!-- http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete -->
49+
<!-- for java 8 -->
50+
<!--
7651
<additionalparam>-Xdoclint:none</additionalparam>
52+
-->
7753
</configuration>
7854
</execution>
7955
</executions>

0 commit comments

Comments
 (0)