Skip to content

Commit 2a64711

Browse files
Ranjan-DasguptaRanjan-Dasgupta
Ranjan-Dasgupta
authored and
Ranjan-Dasgupta
committed
Updates to fix Eclipse Hudson build failure
Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>
1 parent 7c08874 commit 2a64711

2 files changed

Lines changed: 226 additions & 4 deletions

File tree

  • org.eclipse.paho.mqttv5.client
  • org.eclipse.paho.mqttv5.common

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

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,63 @@
7272
</configuration>
7373
</plugin>
7474

75+
<plugin>
76+
<groupId>org.eclipse.tycho</groupId>
77+
<artifactId>tycho-maven-plugin</artifactId>
78+
</plugin>
79+
80+
<plugin>
81+
<groupId>org.codehaus.mojo</groupId>
82+
<artifactId>templating-maven-plugin</artifactId>
83+
<version>1.0.0</version>
84+
<executions>
85+
<execution>
86+
<id>filter-src</id>
87+
<goals>
88+
<goal>filter-sources</goal>
89+
</goals>
90+
</execution>
91+
</executions>
92+
</plugin>
93+
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-resources-plugin</artifactId>
97+
<version>3.0.2</version>
98+
<executions>
99+
<execution>
100+
<id>default-copy-resources</id>
101+
<phase>process-resources</phase>
102+
<goals>
103+
<goal>copy-resources</goal>
104+
</goals>
105+
<configuration>
106+
<overwrite>true</overwrite>
107+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
108+
<resources>
109+
<resource>
110+
<!-- used in modules which relative to its parent -->
111+
<directory>../</directory>
112+
<includes>
113+
<include>about.html</include>
114+
</includes>
115+
</resource>
116+
</resources>
117+
</configuration>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
122+
<plugin>
123+
<groupId>org.eclipse.tycho</groupId>
124+
<artifactId>tycho-compiler-plugin</artifactId>
125+
<version>${tycho.version}</version>
126+
<configuration>
127+
<source>1.8</source>
128+
<target>1.8</target>
129+
</configuration>
130+
</plugin>
131+
75132
<plugin>
76133
<groupId>org.apache.maven.plugins</groupId>
77134
<artifactId>maven-javadoc-plugin</artifactId>
@@ -104,6 +161,44 @@
104161
</executions>
105162
</plugin>
106163
</plugins>
164+
165+
<pluginManagement>
166+
<plugins>
167+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the M
168+
aven build itself.-->
169+
<plugin>
170+
<groupId>org.eclipse.m2e</groupId>
171+
<artifactId>lifecycle-mapping</artifactId>
172+
<version>1.0.0</version>
173+
<configuration>
174+
<lifecycleMappingMetadata>
175+
<pluginExecutions>
176+
<pluginExecution>
177+
<pluginExecutionFilter>
178+
<groupId>
179+
org.codehaus.mojo
180+
</groupId>
181+
<artifactId>
182+
templating-maven-plugin
183+
</artifactId>
184+
<versionRange>
185+
[1.0-alpha-3,)
186+
</versionRange>
187+
<goals>
188+
<goal>filter-sources</goal>
189+
</goals>
190+
</pluginExecutionFilter>
191+
<action>
192+
<ignore />
193+
</action>
194+
</pluginExecution>
195+
</pluginExecutions>
196+
</lifecycleMappingMetadata>
197+
</configuration>
198+
</plugin>
199+
</plugins>
200+
</pluginManagement>
201+
107202
</build>
108203
</project>
109204

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

Lines changed: 131 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
2-
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
@@ -13,7 +13,6 @@
1313
<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
1414
<name>org.eclipse.paho.mqttv5.common</name>
1515

16-
1716
<dependencies>
1817
<dependency>
1918
<groupId>junit</groupId>
@@ -46,7 +45,135 @@
4645
<target>1.8</target>
4746
</configuration>
4847
</plugin>
48+
49+
<plugin>
50+
<groupId>org.eclipse.tycho</groupId>
51+
<artifactId>tycho-maven-plugin</artifactId>
52+
</plugin>
53+
54+
<plugin>
55+
<groupId>org.codehaus.mojo</groupId>
56+
<artifactId>templating-maven-plugin</artifactId>
57+
<version>1.0.0</version>
58+
<executions>
59+
<execution>
60+
<id>filter-src</id>
61+
<goals>
62+
<goal>filter-sources</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-resources-plugin</artifactId>
71+
<version>3.0.2</version>
72+
<executions>
73+
<execution>
74+
<id>default-copy-resources</id>
75+
<phase>process-resources</phase>
76+
<goals>
77+
<goal>copy-resources</goal>
78+
</goals>
79+
<configuration>
80+
<overwrite>true</overwrite>
81+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
82+
<resources>
83+
<resource>
84+
<!-- used in modules which relative to its parent -->
85+
<directory>../</directory>
86+
<includes>
87+
<include>about.html</include>
88+
</includes>
89+
</resource>
90+
</resources>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
96+
<plugin>
97+
<groupId>org.eclipse.tycho</groupId>
98+
<artifactId>tycho-compiler-plugin</artifactId>
99+
<version>${tycho.version}</version>
100+
<configuration>
101+
<source>1.8</source>
102+
<target>1.8</target>
103+
</configuration>
104+
</plugin>
105+
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-javadoc-plugin</artifactId>
109+
<version>${javadoc.version}</version>
110+
<executions>
111+
<execution>
112+
<id>attach-javadocs</id>
113+
<goals>
114+
<goal>javadoc-no-fork</goal>
115+
<goal>jar</goal>
116+
</goals>
117+
<configuration>
118+
<additionalparam>${javadoc.opts}</additionalparam>
119+
</configuration>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-source-plugin</artifactId>
127+
<version>${mvnsource.version}</version>
128+
<executions>
129+
<execution>
130+
<id>attach-sources</id>
131+
<goals>
132+
<goal>jar</goal>
133+
</goals>
134+
</execution>
135+
</executions>
136+
</plugin>
49137
</plugins>
138+
139+
<pluginManagement>
140+
<plugins>
141+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the M
142+
aven build itself.-->
143+
<plugin>
144+
<groupId>org.eclipse.m2e</groupId>
145+
<artifactId>lifecycle-mapping</artifactId>
146+
<version>1.0.0</version>
147+
<configuration>
148+
<lifecycleMappingMetadata>
149+
<pluginExecutions>
150+
<pluginExecution>
151+
<pluginExecutionFilter>
152+
<groupId>
153+
org.codehaus.mojo
154+
</groupId>
155+
<artifactId>
156+
templating-maven-plugin
157+
</artifactId>
158+
<versionRange>
159+
[1.0-alpha-3,)
160+
</versionRange>
161+
<goals>
162+
<goal>filter-sources</goal>
163+
</goals>
164+
</pluginExecutionFilter>
165+
<action>
166+
<ignore />
167+
</action>
168+
</pluginExecution>
169+
</pluginExecutions>
170+
</lifecycleMappingMetadata>
171+
</configuration>
172+
</plugin>
173+
</plugins>
174+
</pluginManagement>
175+
50176
</build>
51177
</project>
52178

179+

0 commit comments

Comments
 (0)