Skip to content

Commit bd27463

Browse files
Al Stockdill-ManderGerrit Code Review @ Eclipse.org
Al Stockdill-Mander
authored and
Gerrit Code Review @ Eclipse.org
committed
Merge "Fix bug 442921 to add maven build for MQTT android service" into develop
2 parents c49a670 + 06da39c commit bd27463

3 files changed

Lines changed: 136 additions & 23 deletions

File tree

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.eclipse.paho</groupId>
6+
<artifactId>android-service-parent</artifactId>
7+
<version>1.0.1-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>org.eclipse.paho.android.service</artifactId>
11+
<packaging>jar</packaging>
12+
13+
<build>
14+
<sourceDirectory>${basedir}/src</sourceDirectory>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-compiler-plugin</artifactId>
19+
<configuration>
20+
<source>${java.version}</source>
21+
<target>${java.version}</target>
22+
</configuration>
23+
</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>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-source-plugin</artifactId>
54+
<version>2.3</version>
55+
<executions>
56+
<execution>
57+
<id>attach-sources</id>
58+
<goals>
59+
<goal>jar</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-javadoc-plugin</artifactId>
67+
<version>2.9</version>
68+
<executions>
69+
<execution>
70+
<id>attach-javadocs</id>
71+
<goals>
72+
<goal>jar</goal>
73+
</goals>
74+
<configuration>
75+
<!-- http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete -->
76+
<additionalparam>-Xdoclint:none</additionalparam>
77+
</configuration>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
84+
<dependencies>
85+
<dependency>
86+
<groupId>org.eclipse.paho</groupId>
87+
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
88+
<version>1.0.1-SNAPSHOT</version>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>com.google.android</groupId>
93+
<artifactId>android</artifactId>
94+
</dependency>
95+
</dependencies>
96+
</project>

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

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,43 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.eclipse.paho</groupId>
6+
<artifactId>java-parent</artifactId>
7+
<version>1.0.1-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>android-service-parent</artifactId>
11+
<packaging>pom</packaging>
12+
13+
<name>Eclipse Paho - MQTT Android Service</name>
14+
15+
<properties>
16+
<android.version>4.1.1.4</android.version>
17+
</properties>
18+
19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.google.android</groupId>
23+
<artifactId>android</artifactId>
24+
<version>${android.version}</version>
25+
<scope>provided</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.google.android</groupId>
29+
<artifactId>android-test</artifactId>
30+
<version>${android.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>junit</groupId>
34+
<artifactId>junit</artifactId>
35+
<version>4.11</version>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
339

4-
<parent>
5-
<groupId>org.eclipse.paho</groupId>
6-
<artifactId>java-parent</artifactId>
7-
<version>1.0.1-SNAPSHOT</version>
8-
</parent>
9-
<modelVersion>4.0.0</modelVersion>
10-
<artifactId>android-service-parent</artifactId>
11-
<packaging>pom</packaging>
12-
<version>0.1</version>
13-
<build>
14-
<plugins></plugins>
15-
</build>
16-
<dependencies>
17-
<dependency>
18-
<groupId>org.eclipse.paho</groupId>
19-
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
20-
<version>1.0.1-SNAPSHOT</version>
21-
</dependency>
22-
<dependency>
23-
<groupId>junit</groupId>
24-
<artifactId>junit</artifactId>
25-
</dependency>
26-
</dependencies>
40+
<modules>
41+
<module>org.eclipse.paho.android.service</module>
42+
</modules>
2743
</project>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,6 @@
208208
<module>org.eclipse.paho.client.mqttv3.repository</module>
209209
<module>org.eclipse.paho.sample.utility</module>
210210
<module>org.eclipse.paho.ui</module>
211+
<module>org.eclipse.paho.android.service</module>
211212
</modules>
212213
</project>

0 commit comments

Comments
 (0)