Skip to content

Commit ac4ff8c

Browse files
Ranjan-DasguptaRanjan-Dasgupta
Ranjan-Dasgupta
authored and
Ranjan-Dasgupta
committed
Change mqttv5 client packaging
Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>
1 parent 815543a commit ac4ff8c

3 files changed

Lines changed: 98 additions & 9 deletions

File tree

‎org.eclipse.paho.mqttv5.client/META-INF/MANIFEST.MF‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: org.eclipse.paho.mqttv5.client
4+
Bundle-SymbolicName: org.eclipse.paho.mqttv5.client
5+
Bundle-Version: 1.2.5.qualifier
6+
Bundle-Localization: bundle
7+
Export-Package: org.eclipse.paho.mqttv5.client;version="1.2.5.qualifier"
8+
Bundle-Vendor: %bundle.provider
9+
Bundle-ActivationPolicy: lazy
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
11+
Import-Package: javax.net;resolution:=optional,
12+
javax.net.ssl;resolution:=optional

‎org.eclipse.paho.mqttv5.client/build.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source.. = src/main/resources/,\
2+
src/main/java/
3+
bin.includes = META-INF/,\
4+
.

‎org.eclipse.paho.mqttv5.client/pom.xml‎

Lines changed: 82 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
1414
<name>org.eclipse.paho.mqttv5.client</name>
15+
<packaging>eclipse-plugin</packaging>
1516

1617
<dependencies>
1718
<dependency>
@@ -43,6 +44,25 @@
4344
</executions>
4445
</plugin>
4546

47+
<plugin>
48+
<groupId>org.eclipse.tycho</groupId>
49+
<artifactId>tycho-maven-plugin</artifactId>
50+
</plugin>
51+
52+
<plugin>
53+
<groupId>org.codehaus.mojo</groupId>
54+
<artifactId>templating-maven-plugin</artifactId>
55+
<version>1.0.0</version>
56+
<executions>
57+
<execution>
58+
<id>filter-src</id>
59+
<goals>
60+
<goal>filter-sources</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
4666
<!--
4767
Submit code coverage report to coveralls.io
4868
https://coveralls.io/github/ibm-watson-iot/iot-java
@@ -69,36 +89,89 @@
6989

7090
<plugin>
7191
<groupId>org.apache.maven.plugins</groupId>
72-
<artifactId>maven-javadoc-plugin</artifactId>
73-
<version>${javadoc.version}</version>
92+
<artifactId>maven-resources-plugin</artifactId>
93+
<version>3.0.2</version>
7494
<executions>
7595
<execution>
76-
<id>attach-javadocs</id>
96+
<id>default-copy-resources</id>
97+
<phase>process-resources</phase>
7798
<goals>
78-
<goal>javadoc-no-fork</goal>
79-
<goal>jar</goal>
99+
<goal>copy-resources</goal>
80100
</goals>
81101
<configuration>
82-
<additionalparam>${javadoc.opts}</additionalparam>
102+
<overwrite>true</overwrite>
103+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
104+
<resources>
105+
<resource>
106+
<!-- used in modules which relative to its parent -->
107+
<directory>../</directory>
108+
<includes>
109+
<include>about.html</include>
110+
</includes>
111+
</resource>
112+
</resources>
83113
</configuration>
84114
</execution>
85115
</executions>
86116
</plugin>
87117

88118
<plugin>
89119
<groupId>org.apache.maven.plugins</groupId>
90-
<artifactId>maven-source-plugin</artifactId>
91-
<version>${mvnsource.version}</version>
120+
<artifactId>maven-javadoc-plugin</artifactId>
121+
<version>${javadoc.version}</version>
92122
<executions>
93123
<execution>
94-
<id>attach-sources</id>
124+
<id>attach-javadocs</id>
95125
<goals>
126+
<goal>javadoc-no-fork</goal>
96127
<goal>jar</goal>
97128
</goals>
129+
<configuration>
130+
<additionalparam>${javadoc.opts}</additionalparam>
131+
</configuration>
98132
</execution>
99133
</executions>
100134
</plugin>
135+
101136
</plugins>
137+
138+
<pluginManagement>
139+
<plugins>
140+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the M
141+
aven build itself.-->
142+
<plugin>
143+
<groupId>org.eclipse.m2e</groupId>
144+
<artifactId>lifecycle-mapping</artifactId>
145+
<version>1.0.0</version>
146+
<configuration>
147+
<lifecycleMappingMetadata>
148+
<pluginExecutions>
149+
<pluginExecution>
150+
<pluginExecutionFilter>
151+
<groupId>
152+
org.codehaus.mojo
153+
</groupId>
154+
<artifactId>
155+
templating-maven-plugin
156+
</artifactId>
157+
<versionRange>
158+
[1.0-alpha-3,)
159+
</versionRange>
160+
<goals>
161+
<goal>filter-sources</goal>
162+
</goals>
163+
</pluginExecutionFilter>
164+
<action>
165+
<ignore />
166+
</action>
167+
</pluginExecution>
168+
</pluginExecutions>
169+
</lifecycleMappingMetadata>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</pluginManagement>
174+
102175
</build>
103176
</project>
104177

0 commit comments

Comments
 (0)