Brian O'Connor

Bumping onos-maven-plugin version to 1.5 for release

Also, removing build dependency from root pom and updating version there.

Change-Id: I7dfb98f2b3377a715a075f4396d686e3112ad15d
1 -<?xml version="1.0" encoding="UTF-8"?> 1 +<?xml version="1.0" encoding="UTF-8"?>
2 -<!-- 2 +<!--
3 - ~ Copyright 2014 Open Networking Laboratory 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ 4 + ~
5 - ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 - ~ you may not use this file except in compliance with the License. 6 + ~ you may not use this file except in compliance with the License.
7 - ~ You may obtain a copy of the License at 7 + ~ You may obtain a copy of the License at
8 - ~ 8 + ~
9 - ~ http://www.apache.org/licenses/LICENSE-2.0 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 - ~ 10 + ~
11 - ~ Unless required by applicable law or agreed to in writing, software 11 + ~ Unless required by applicable law or agreed to in writing, software
12 - ~ distributed under the License is distributed on an "AS IS" BASIS, 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 - ~ See the License for the specific language governing permissions and 14 + ~ See the License for the specific language governing permissions and
15 - ~ limitations under the License. 15 + ~ limitations under the License.
16 - --> 16 + -->
17 -<project xmlns="http://maven.apache.org/POM/4.0.0" 17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 - <modelVersion>4.0.0</modelVersion> 20 + <modelVersion>4.0.0</modelVersion>
21 - 21 +
22 - <prerequisites> 22 + <prerequisites>
23 - <maven>3.0.1</maven> 23 + <maven>3.0.1</maven>
24 - </prerequisites> 24 + </prerequisites>
25 - 25 +
26 - <parent> 26 + <parent>
27 - <groupId>org.onosproject</groupId> 27 + <groupId>org.onosproject</groupId>
28 - <artifactId>onos-base</artifactId> 28 + <artifactId>onos-base</artifactId>
29 - <version>1</version> 29 + <version>1</version>
30 - <relativePath>tools/build/pom.xml</relativePath> 30 + <relativePath>tools/build/pom.xml</relativePath>
31 - </parent> 31 + </parent>
32 - 32 +
33 - <artifactId>onos</artifactId> 33 + <artifactId>onos</artifactId>
34 - <packaging>pom</packaging> 34 + <packaging>pom</packaging>
35 - <version>1.3.0-SNAPSHOT</version> 35 + <version>1.3.0-SNAPSHOT</version>
36 - 36 +
37 - <name>${project.artifactId}</name> 37 + <name>${project.artifactId}</name>
38 - <description>Open Network Operating System root project</description> 38 + <description>Open Network Operating System root project</description>
39 - 39 +
40 - <modules> 40 + <modules>
41 - <module>utils</module> 41 + <module>utils</module>
42 - <module>core</module> 42 + <module>core</module>
43 - <module>web</module> 43 + <module>web</module>
44 - <module>cli</module> 44 + <module>cli</module>
45 - 45 +
46 - <module>openflow</module> 46 + <module>openflow</module>
47 - <module>ovsdb</module> 47 + <module>ovsdb</module>
48 - <module>pcep</module> 48 + <module>pcep</module>
49 - 49 +
50 - <module>providers</module> 50 + <module>providers</module>
51 - <module>drivers</module> 51 + <module>drivers</module>
52 - 52 +
53 - <module>apps</module> 53 + <module>apps</module>
54 - <module>incubator</module> 54 + <module>incubator</module>
55 - <module>features</module> 55 + <module>features</module>
56 - 56 +
57 - <module>tools/package/archetypes</module> 57 + <module>tools/package/archetypes</module>
58 - <module>tools/package/branding</module> 58 + <module>tools/package/branding</module>
59 - 59 + </modules>
60 - <!-- FIXME remove before release --> 60 +
61 - <module>tools/package/maven-plugin</module> 61 + <url>http://onosproject.org/</url>
62 - </modules> 62 +
63 - 63 + <scm>
64 - <url>http://onosproject.org/</url> 64 + <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
65 - 65 + <developerConnection>scm:git:https://gerrit.onosproject.org/onos
66 - <scm> 66 + </developerConnection>
67 - <connection>scm:git:https://gerrit.onosproject.org/onos</connection> 67 + <url>http://gerrit.onosproject.org/</url>
68 - <developerConnection>scm:git:https://gerrit.onosproject.org/onos 68 + </scm>
69 - </developerConnection> 69 +
70 - <url>http://gerrit.onosproject.org/</url> 70 + <licenses>
71 - </scm> 71 + <license>
72 - 72 + <name>Apache License, Version 2.0</name>
73 - <licenses> 73 + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
74 - <license> 74 + </license>
75 - <name>Apache License, Version 2.0</name> 75 + </licenses>
76 - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> 76 +
77 - </license> 77 + <properties>
78 - </licenses> 78 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
79 - 79 + <netty4.version>4.0.23.Final</netty4.version>
80 - <properties> 80 + <copycat.version>0.5.0.onos12-SNAPSHOT</copycat.version>
81 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 81 + <openflowj.version>0.4.1.onos-SNAPSHOT</openflowj.version>
82 - <netty4.version>4.0.23.Final</netty4.version> 82 + <karaf.version>3.0.3</karaf.version>
83 - <copycat.version>0.5.0.onos12-SNAPSHOT</copycat.version> 83 + <jersey.version>1.19</jersey.version>
84 - <openflowj.version>0.4.1.onos-SNAPSHOT</openflowj.version> 84 + </properties>
85 - <karaf.version>3.0.3</karaf.version> 85 +
86 - <jersey.version>1.19</jersey.version> 86 + <distributionManagement>
87 - </properties> 87 + <snapshotRepository>
88 - 88 + <id>ossrh</id>
89 - <distributionManagement> 89 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
90 - <snapshotRepository> 90 + </snapshotRepository>
91 - <id>ossrh</id> 91 + </distributionManagement>
92 - <url>https://oss.sonatype.org/content/repositories/snapshots</url> 92 +
93 - </snapshotRepository> 93 + <!--- Needed for copycat. Remove before official release -->
94 - </distributionManagement> 94 + <repositories>
95 - 95 + <repository>
96 - <!--- Needed for copycat. Remove before official release --> 96 + <id>snapshots</id>
97 - <repositories> 97 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
98 - <repository> 98 + </repository>
99 - <id>snapshots</id> 99 + </repositories>
100 - <url>https://oss.sonatype.org/content/repositories/snapshots</url> 100 +
101 - </repository> 101 + <!--- FIXME Needed for onos-maven-plugin. Remove before official release -->
102 - </repositories> 102 + <pluginRepositories>
103 - 103 + <pluginRepository>
104 - <!--- FIXME Needed for onos-maven-plugin. Remove before official release --> 104 + <id>snapshots</id>
105 - <pluginRepositories> 105 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
106 - <pluginRepository> 106 + </pluginRepository>
107 - <id>snapshots</id> 107 + </pluginRepositories>
108 - <url>https://oss.sonatype.org/content/repositories/snapshots</url> 108 +
109 - </pluginRepository> 109 + <dependencyManagement>
110 - </pluginRepositories> 110 + <dependencies>
111 - 111 + <dependency>
112 - <dependencyManagement> 112 + <groupId>junit</groupId>
113 - <dependencies> 113 + <artifactId>junit</artifactId>
114 - <dependency> 114 + <version>4.11</version>
115 - <groupId>junit</groupId> 115 + <scope>test</scope>
116 - <artifactId>junit</artifactId> 116 + </dependency>
117 - <version>4.11</version> 117 +
118 - <scope>test</scope> 118 + <dependency>
119 - </dependency> 119 + <groupId>org.hamcrest</groupId>
120 - 120 + <artifactId>hamcrest-core</artifactId>
121 - <dependency> 121 + <version>1.3</version>
122 - <groupId>org.hamcrest</groupId> 122 + <scope>test</scope>
123 - <artifactId>hamcrest-core</artifactId> 123 + </dependency>
124 - <version>1.3</version> 124 + <dependency>
125 - <scope>test</scope> 125 + <groupId>org.hamcrest</groupId>
126 - </dependency> 126 + <artifactId>hamcrest-library</artifactId>
127 - <dependency> 127 + <version>1.3</version>
128 - <groupId>org.hamcrest</groupId> 128 + <scope>test</scope>
129 - <artifactId>hamcrest-library</artifactId> 129 + </dependency>
130 - <version>1.3</version> 130 +
131 - <scope>test</scope> 131 + <dependency>
132 - </dependency> 132 + <groupId>org.slf4j</groupId>
133 - 133 + <artifactId>slf4j-api</artifactId>
134 - <dependency> 134 + <version>1.7.6</version>
135 - <groupId>org.slf4j</groupId> 135 + <scope>provided</scope>
136 - <artifactId>slf4j-api</artifactId> 136 + </dependency>
137 - <version>1.7.6</version> 137 +
138 - <scope>provided</scope> 138 + <dependency>
139 - </dependency> 139 + <groupId>org.slf4j</groupId>
140 - 140 + <artifactId>slf4j-core</artifactId>
141 - <dependency> 141 + <version>1.7.6</version>
142 - <groupId>org.slf4j</groupId> 142 + <scope>test</scope>
143 - <artifactId>slf4j-core</artifactId> 143 + </dependency>
144 - <version>1.7.6</version> 144 +
145 - <scope>test</scope> 145 + <dependency>
146 - </dependency> 146 + <groupId>org.slf4j</groupId>
147 - 147 + <artifactId>slf4j-jdk14</artifactId>
148 - <dependency> 148 + <version>1.7.6</version>
149 - <groupId>org.slf4j</groupId> 149 + <scope>test</scope>
150 - <artifactId>slf4j-jdk14</artifactId> 150 + </dependency>
151 - <version>1.7.6</version> 151 +
152 - <scope>test</scope> 152 + <dependency>
153 - </dependency> 153 + <groupId>com.google.guava</groupId>
154 - 154 + <artifactId>guava</artifactId>
155 - <dependency> 155 + <version>18.0</version>
156 - <groupId>com.google.guava</groupId> 156 + </dependency>
157 - <artifactId>guava</artifactId> 157 +
158 - <version>18.0</version> 158 + <dependency>
159 - </dependency> 159 + <groupId>io.netty</groupId>
160 - 160 + <artifactId>netty</artifactId>
161 - <dependency> 161 + <version>3.9.0.Final</version>
162 - <groupId>io.netty</groupId> 162 + </dependency>
163 - <artifactId>netty</artifactId> 163 +
164 - <version>3.9.0.Final</version> 164 + <dependency>
165 - </dependency> 165 + <groupId>com.google.guava</groupId>
166 - 166 + <artifactId>guava-testlib</artifactId>
167 - <dependency> 167 + <version>18.0</version>
168 - <groupId>com.google.guava</groupId> 168 + <scope>test</scope>
169 - <artifactId>guava-testlib</artifactId> 169 + </dependency>
170 - <version>18.0</version> 170 +
171 - <scope>test</scope> 171 + <dependency>
172 - </dependency> 172 + <groupId>com.googlecode.concurrent-trees</groupId>
173 - 173 + <artifactId>concurrent-trees</artifactId>
174 - <dependency> 174 + <version>2.4.0</version>
175 - <groupId>com.googlecode.concurrent-trees</groupId> 175 + </dependency>
176 - <artifactId>concurrent-trees</artifactId> 176 +
177 - <version>2.4.0</version> 177 + <dependency>
178 - </dependency> 178 + <groupId>commons-lang</groupId>
179 - 179 + <artifactId>commons-lang</artifactId>
180 - <dependency> 180 + <version>2.6</version>
181 - <groupId>commons-lang</groupId> 181 + </dependency>
182 - <artifactId>commons-lang</artifactId> 182 +
183 - <version>2.6</version> 183 + <dependency>
184 - </dependency> 184 + <groupId>org.apache.commons</groupId>
185 - 185 + <artifactId>commons-lang3</artifactId>
186 - <dependency> 186 + <version>3.3.2</version>
187 - <groupId>org.apache.commons</groupId> 187 + </dependency>
188 - <artifactId>commons-lang3</artifactId> 188 +
189 - <version>3.3.2</version> 189 + <dependency>
190 - </dependency> 190 + <groupId>commons-configuration</groupId>
191 - 191 + <artifactId>commons-configuration</artifactId>
192 - <dependency> 192 + <version>1.10</version>
193 - <groupId>commons-configuration</groupId> 193 + </dependency>
194 - <artifactId>commons-configuration</artifactId> 194 +
195 - <version>1.10</version> 195 + <dependency>
196 - </dependency> 196 + <groupId>commons-collections</groupId>
197 - 197 + <artifactId>commons-collections</artifactId>
198 - <dependency> 198 + <version>3.2.1</version>
199 - <groupId>commons-collections</groupId> 199 + </dependency>
200 - <artifactId>commons-collections</artifactId> 200 +
201 - <version>3.2.1</version> 201 + <dependency>
202 - </dependency> 202 + <groupId>org.codehaus.jackson</groupId>
203 - 203 + <artifactId>jackson-core-asl</artifactId>
204 - <dependency> 204 + <version>1.9.13</version>
205 - <groupId>org.codehaus.jackson</groupId> 205 + </dependency>
206 - <artifactId>jackson-core-asl</artifactId> 206 + <dependency>
207 - <version>1.9.13</version> 207 + <groupId>org.codehaus.jackson</groupId>
208 - </dependency> 208 + <artifactId>jackson-mapper-asl</artifactId>
209 - <dependency> 209 + <version>1.9.13</version>
210 - <groupId>org.codehaus.jackson</groupId> 210 + </dependency>
211 - <artifactId>jackson-mapper-asl</artifactId> 211 +
212 - <version>1.9.13</version> 212 + <dependency>
213 - </dependency> 213 + <groupId>org.easymock</groupId>
214 - 214 + <artifactId>easymock</artifactId>
215 - <dependency> 215 + <version>3.2</version>
216 - <groupId>org.easymock</groupId> 216 + <scope>test</scope>
217 - <artifactId>easymock</artifactId> 217 + </dependency>
218 - <version>3.2</version> 218 +
219 - <scope>test</scope> 219 + <!-- Web related -->
220 - </dependency> 220 + <dependency>
221 - 221 + <groupId>com.sun.jersey</groupId>
222 - <!-- Web related --> 222 + <artifactId>jersey-servlet</artifactId>
223 - <dependency> 223 + <version>${jersey.version}</version>
224 - <groupId>com.sun.jersey</groupId> 224 + <scope>provided</scope>
225 - <artifactId>jersey-servlet</artifactId> 225 + </dependency>
226 - <version>${jersey.version}</version> 226 + <dependency>
227 - <scope>provided</scope> 227 + <groupId>com.sun.jersey.contribs</groupId>
228 - </dependency> 228 + <artifactId>jersey-multipart</artifactId>
229 - <dependency> 229 + <version>${jersey.version}</version>
230 - <groupId>com.sun.jersey.contribs</groupId> 230 + <scope>provided</scope>
231 - <artifactId>jersey-multipart</artifactId> 231 + </dependency>
232 - <version>${jersey.version}</version> 232 + <dependency>
233 - <scope>provided</scope> 233 + <groupId>com.sun.jersey.jersey-test-framework</groupId>
234 - </dependency> 234 + <artifactId>jersey-test-framework-core</artifactId>
235 - <dependency> 235 + <version>${jersey.version}</version>
236 - <groupId>com.sun.jersey.jersey-test-framework</groupId> 236 + <scope>test</scope>
237 - <artifactId>jersey-test-framework-core</artifactId> 237 + </dependency>
238 - <version>${jersey.version}</version> 238 + <dependency>
239 - <scope>test</scope> 239 + <groupId>com.sun.jersey.jersey-test-framework</groupId>
240 - </dependency> 240 + <artifactId>jersey-test-framework-grizzly2</artifactId>
241 - <dependency> 241 + <version>${jersey.version}</version>
242 - <groupId>com.sun.jersey.jersey-test-framework</groupId> 242 + <scope>test</scope>
243 - <artifactId>jersey-test-framework-grizzly2</artifactId> 243 + </dependency>
244 - <version>${jersey.version}</version> 244 + <dependency>
245 - <scope>test</scope> 245 + <groupId>com.fasterxml.jackson.core</groupId>
246 - </dependency> 246 + <artifactId>jackson-databind</artifactId>
247 - <dependency> 247 + <version>2.4.2</version>
248 - <groupId>com.fasterxml.jackson.core</groupId> 248 + <scope>provided</scope>
249 - <artifactId>jackson-databind</artifactId> 249 + </dependency>
250 - <version>2.4.2</version> 250 + <dependency>
251 - <scope>provided</scope> 251 + <groupId>com.fasterxml.jackson.core</groupId>
252 - </dependency> 252 + <artifactId>jackson-annotations</artifactId>
253 - <dependency> 253 + <version>2.4.2</version>
254 - <groupId>com.fasterxml.jackson.core</groupId> 254 + <scope>provided</scope>
255 - <artifactId>jackson-annotations</artifactId> 255 + </dependency>
256 - <version>2.4.2</version> 256 +
257 - <scope>provided</scope> 257 + <!-- OSGi related -->
258 - </dependency> 258 + <dependency>
259 - 259 + <groupId>org.osgi</groupId>
260 - <!-- OSGi related --> 260 + <artifactId>org.osgi.core</artifactId>
261 - <dependency> 261 + <version>4.3.1</version>
262 - <groupId>org.osgi</groupId> 262 + <scope>provided</scope>
263 - <artifactId>org.osgi.core</artifactId> 263 + </dependency>
264 - <version>4.3.1</version> 264 + <dependency>
265 - <scope>provided</scope> 265 + <groupId>org.osgi</groupId>
266 - </dependency> 266 + <artifactId>org.osgi.compendium</artifactId>
267 - <dependency> 267 + <version>4.3.1</version>
268 - <groupId>org.osgi</groupId> 268 + <scope>provided</scope>
269 - <artifactId>org.osgi.compendium</artifactId> 269 + </dependency>
270 - <version>4.3.1</version> 270 + <dependency>
271 - <scope>provided</scope> 271 + <groupId>org.apache.felix</groupId>
272 - </dependency> 272 + <artifactId>org.apache.felix.scr.annotations</artifactId>
273 - <dependency> 273 + <version>1.9.8</version>
274 - <groupId>org.apache.felix</groupId> 274 + <scope>provided</scope>
275 - <artifactId>org.apache.felix.scr.annotations</artifactId> 275 + </dependency>
276 - <version>1.9.8</version> 276 +
277 - <scope>provided</scope> 277 + <dependency>
278 - </dependency> 278 + <groupId>org.apache.karaf.features</groupId>
279 - 279 + <artifactId>org.apache.karaf.features.core</artifactId>
280 - <dependency> 280 + <version>${karaf.version}</version>
281 - <groupId>org.apache.karaf.features</groupId> 281 + <scope>provided</scope>
282 - <artifactId>org.apache.karaf.features.core</artifactId> 282 + </dependency>
283 - <version>${karaf.version}</version> 283 + <dependency>
284 - <scope>provided</scope> 284 + <groupId>org.apache.karaf.system</groupId>
285 - </dependency> 285 + <artifactId>org.apache.karaf.system.core</artifactId>
286 - <dependency> 286 + <version>${karaf.version}</version>
287 - <groupId>org.apache.karaf.system</groupId> 287 + <scope>provided</scope>
288 - <artifactId>org.apache.karaf.system.core</artifactId> 288 + </dependency>
289 - <version>${karaf.version}</version> 289 + <dependency>
290 - <scope>provided</scope> 290 + <groupId>org.apache.karaf.shell</groupId>
291 - </dependency> 291 + <artifactId>org.apache.karaf.shell.console</artifactId>
292 - <dependency> 292 + <version>${karaf.version}</version>
293 - <groupId>org.apache.karaf.shell</groupId> 293 + <scope>provided</scope>
294 - <artifactId>org.apache.karaf.shell.console</artifactId> 294 + </dependency>
295 - <version>${karaf.version}</version> 295 +
296 - <scope>provided</scope> 296 + <dependency>
297 - </dependency> 297 + <groupId>org.livetribe.slp</groupId>
298 - 298 + <artifactId>livetribe-slp</artifactId>
299 - <dependency> 299 + <version>2.2.1</version>
300 - <groupId>org.livetribe.slp</groupId> 300 + </dependency>
301 - <artifactId>livetribe-slp</artifactId> 301 +
302 - <version>2.2.1</version> 302 + <dependency>
303 - </dependency> 303 + <groupId>com.eclipsesource.minimal-json</groupId>
304 - 304 + <artifactId>minimal-json</artifactId>
305 - <dependency> 305 + <version>0.9.1</version>
306 - <groupId>com.eclipsesource.minimal-json</groupId> 306 + </dependency>
307 - <artifactId>minimal-json</artifactId> 307 + <dependency>
308 - <version>0.9.1</version> 308 + <groupId>com.esotericsoftware</groupId>
309 - </dependency> 309 + <artifactId>kryo</artifactId>
310 - <dependency> 310 + <version>3.0.0</version>
311 - <groupId>com.esotericsoftware</groupId> 311 + </dependency>
312 - <artifactId>kryo</artifactId> 312 + <dependency>
313 - <version>3.0.0</version> 313 + <groupId>com.esotericsoftware</groupId>
314 - </dependency> 314 + <artifactId>reflectasm</artifactId>
315 - <dependency> 315 + <version>1.10.0</version>
316 - <groupId>com.esotericsoftware</groupId> 316 + <type>bundle</type>
317 - <artifactId>reflectasm</artifactId> 317 + </dependency>
318 - <version>1.10.0</version> 318 + <dependency>
319 - <type>bundle</type> 319 + <groupId>org.ow2.asm</groupId>
320 - </dependency> 320 + <artifactId>asm</artifactId>
321 - <dependency> 321 + <version>4.2</version>
322 - <groupId>org.ow2.asm</groupId> 322 + </dependency>
323 - <artifactId>asm</artifactId> 323 + <dependency>
324 - <version>4.2</version> 324 + <groupId>com.esotericsoftware</groupId>
325 - </dependency> 325 + <artifactId>minlog</artifactId>
326 - <dependency> 326 + <version>1.3.0</version>
327 - <groupId>com.esotericsoftware</groupId> 327 + </dependency>
328 - <artifactId>minlog</artifactId> 328 + <dependency>
329 - <version>1.3.0</version> 329 + <groupId>org.objenesis</groupId>
330 - </dependency> 330 + <artifactId>objenesis</artifactId>
331 - <dependency> 331 + <version>2.1</version>
332 - <groupId>org.objenesis</groupId> 332 + </dependency>
333 - <artifactId>objenesis</artifactId> 333 +
334 - <version>2.1</version> 334 + <!-- ONOS related -->
335 - </dependency> 335 + <dependency>
336 - 336 + <groupId>org.onosproject</groupId>
337 - <!-- ONOS related --> 337 + <artifactId>onlab-misc</artifactId>
338 - <dependency> 338 + <version>${project.version}</version>
339 - <groupId>org.onosproject</groupId> 339 + </dependency>
340 - <artifactId>onlab-misc</artifactId> 340 + <dependency>
341 - <version>${project.version}</version> 341 + <groupId>org.onosproject</groupId>
342 - </dependency> 342 + <artifactId>onlab-nio</artifactId>
343 - <dependency> 343 + <version>${project.version}</version>
344 - <groupId>org.onosproject</groupId> 344 + </dependency>
345 - <artifactId>onlab-nio</artifactId> 345 + <dependency>
346 - <version>${project.version}</version> 346 + <groupId>org.onosproject</groupId>
347 - </dependency> 347 + <artifactId>onlab-osgi</artifactId>
348 - <dependency> 348 + <version>${project.version}</version>
349 - <groupId>org.onosproject</groupId> 349 + </dependency>
350 - <artifactId>onlab-osgi</artifactId> 350 + <dependency>
351 - <version>${project.version}</version> 351 + <groupId>org.onosproject</groupId>
352 - </dependency> 352 + <artifactId>onlab-osgi</artifactId>
353 - <dependency> 353 + <version>${project.version}</version>
354 - <groupId>org.onosproject</groupId> 354 + <classifier>tests</classifier>
355 - <artifactId>onlab-osgi</artifactId> 355 + <scope>test</scope>
356 - <version>${project.version}</version> 356 + </dependency>
357 - <classifier>tests</classifier> 357 + <dependency>
358 - <scope>test</scope> 358 + <groupId>org.onosproject</groupId>
359 - </dependency> 359 + <artifactId>onlab-junit</artifactId>
360 - <dependency> 360 + <version>${project.version}</version>
361 - <groupId>org.onosproject</groupId> 361 + <scope>test</scope>
362 - <artifactId>onlab-junit</artifactId> 362 + </dependency>
363 - <version>${project.version}</version> 363 +
364 - <scope>test</scope> 364 + <dependency>
365 - </dependency> 365 + <groupId>org.onosproject</groupId>
366 - 366 + <artifactId>onos-api</artifactId>
367 - <dependency> 367 + <version>${project.version}</version>
368 - <groupId>org.onosproject</groupId> 368 + </dependency>
369 - <artifactId>onos-api</artifactId> 369 + <dependency>
370 - <version>${project.version}</version> 370 + <groupId>org.onosproject</groupId>
371 - </dependency> 371 + <artifactId>onos-api</artifactId>
372 - <dependency> 372 + <version>${project.version}</version>
373 - <groupId>org.onosproject</groupId> 373 + <classifier>tests</classifier>
374 - <artifactId>onos-api</artifactId> 374 + <scope>test</scope>
375 - <version>${project.version}</version> 375 + </dependency>
376 - <classifier>tests</classifier> 376 +
377 - <scope>test</scope> 377 + <dependency>
378 - </dependency> 378 + <groupId>org.onosproject</groupId>
379 - 379 + <artifactId>onos-incubator-api</artifactId>
380 - <dependency> 380 + <version>${project.version}</version>
381 - <groupId>org.onosproject</groupId> 381 + </dependency>
382 - <artifactId>onos-incubator-api</artifactId> 382 +
383 - <version>${project.version}</version> 383 + <dependency>
384 - </dependency> 384 + <groupId>org.onosproject</groupId>
385 - 385 + <artifactId>onos-core-common</artifactId>
386 - <dependency> 386 + <version>${project.version}</version>
387 - <groupId>org.onosproject</groupId> 387 + </dependency>
388 - <artifactId>onos-core-common</artifactId> 388 + <dependency>
389 - <version>${project.version}</version> 389 + <groupId>org.onosproject</groupId>
390 - </dependency> 390 + <artifactId>onos-core-common</artifactId>
391 - <dependency> 391 + <version>${project.version}</version>
392 - <groupId>org.onosproject</groupId> 392 + <classifier>tests</classifier>
393 - <artifactId>onos-core-common</artifactId> 393 + <scope>test</scope>
394 - <version>${project.version}</version> 394 + </dependency>
395 - <classifier>tests</classifier> 395 +
396 - <scope>test</scope> 396 + <dependency>
397 - </dependency> 397 + <groupId>org.onosproject</groupId>
398 - 398 + <artifactId>onos-of-api</artifactId>
399 - <dependency> 399 + <version>${project.version}</version>
400 - <groupId>org.onosproject</groupId> 400 + </dependency>
401 - <artifactId>onos-of-api</artifactId> 401 + <dependency>
402 - <version>${project.version}</version> 402 + <groupId>org.onosproject</groupId>
403 - </dependency> 403 + <artifactId>onos-ovsdb-rfc</artifactId>
404 - <dependency> 404 + <version>${project.version}</version>
405 - <groupId>org.onosproject</groupId> 405 + </dependency>
406 - <artifactId>onos-ovsdb-rfc</artifactId> 406 + <dependency>
407 - <version>${project.version}</version> 407 + <groupId>org.onosproject</groupId>
408 - </dependency> 408 + <artifactId>onos-ovsdb-api</artifactId>
409 - <dependency> 409 + <version>${project.version}</version>
410 - <groupId>org.onosproject</groupId> 410 + </dependency>
411 - <artifactId>onos-ovsdb-api</artifactId> 411 + <dependency>
412 - <version>${project.version}</version> 412 + <groupId>org.onosproject</groupId>
413 - </dependency> 413 + <artifactId>onos-pcepio</artifactId>
414 - <dependency> 414 + <version>${project.version}</version>
415 - <groupId>org.onosproject</groupId> 415 + </dependency>
416 - <artifactId>onos-pcepio</artifactId> 416 +
417 - <version>${project.version}</version> 417 + <dependency>
418 - </dependency> 418 + <groupId>org.onosproject</groupId>
419 - 419 + <artifactId>onos-pcep-controller-api</artifactId>
420 - <dependency> 420 + <version>${project.version}</version>
421 - <groupId>org.onosproject</groupId> 421 + </dependency>
422 - <artifactId>onos-pcep-controller-api</artifactId> 422 +
423 - <version>${project.version}</version> 423 + <dependency>
424 - </dependency> 424 + <groupId>org.onosproject</groupId>
425 - 425 + <artifactId>onos-app-pcep-api</artifactId>
426 - <dependency> 426 + <version>${project.version}</version>
427 - <groupId>org.onosproject</groupId> 427 + </dependency>
428 - <artifactId>onos-app-pcep-api</artifactId> 428 + <dependency>
429 - <version>${project.version}</version> 429 + <groupId>org.onosproject</groupId>
430 - </dependency> 430 + <artifactId>onlab-thirdparty</artifactId>
431 - <dependency> 431 + <version>${project.version}</version>
432 - <groupId>org.onosproject</groupId> 432 + </dependency>
433 - <artifactId>onlab-thirdparty</artifactId> 433 +
434 - <version>${project.version}</version> 434 + <dependency>
435 - </dependency> 435 + <groupId>org.onosproject</groupId>
436 - 436 + <artifactId>onos-of-api</artifactId>
437 - <dependency> 437 + <version>${project.version}</version>
438 - <groupId>org.onosproject</groupId> 438 + <classifier>tests</classifier>
439 - <artifactId>onos-of-api</artifactId> 439 + <scope>test</scope>
440 - <version>${project.version}</version> 440 + </dependency>
441 - <classifier>tests</classifier> 441 + <dependency>
442 - <scope>test</scope> 442 + <groupId>commons-pool</groupId>
443 - </dependency> 443 + <artifactId>commons-pool</artifactId>
444 - <dependency> 444 + <version>1.6</version>
445 - <groupId>commons-pool</groupId> 445 + </dependency>
446 - <artifactId>commons-pool</artifactId> 446 + <dependency>
447 - <version>1.6</version> 447 + <groupId>io.netty</groupId>
448 - </dependency> 448 + <artifactId>netty-common</artifactId>
449 - <dependency> 449 + <version>${netty4.version}</version>
450 - <groupId>io.netty</groupId> 450 + </dependency>
451 - <artifactId>netty-common</artifactId> 451 + <dependency>
452 - <version>${netty4.version}</version> 452 + <groupId>io.netty</groupId>
453 - </dependency> 453 + <artifactId>netty-buffer</artifactId>
454 - <dependency> 454 + <version>${netty4.version}</version>
455 - <groupId>io.netty</groupId> 455 + </dependency>
456 - <artifactId>netty-buffer</artifactId> 456 + <dependency>
457 - <version>${netty4.version}</version> 457 + <groupId>io.netty</groupId>
458 - </dependency> 458 + <artifactId>netty-transport</artifactId>
459 - <dependency> 459 + <version>${netty4.version}</version>
460 - <groupId>io.netty</groupId> 460 + </dependency>
461 - <artifactId>netty-transport</artifactId> 461 + <dependency>
462 - <version>${netty4.version}</version> 462 + <groupId>io.netty</groupId>
463 - </dependency> 463 + <artifactId>netty-handler</artifactId>
464 - <dependency> 464 + <version>${netty4.version}</version>
465 - <groupId>io.netty</groupId> 465 + </dependency>
466 - <artifactId>netty-handler</artifactId> 466 + <dependency>
467 - <version>${netty4.version}</version> 467 + <groupId>io.netty</groupId>
468 - </dependency> 468 + <artifactId>netty-codec</artifactId>
469 - <dependency> 469 + <version>${netty4.version}</version>
470 - <groupId>io.netty</groupId> 470 + </dependency>
471 - <artifactId>netty-codec</artifactId> 471 + <dependency>
472 - <version>${netty4.version}</version> 472 + <groupId>io.netty</groupId>
473 - </dependency> 473 + <artifactId>netty-transport-native-epoll</artifactId>
474 - <dependency> 474 + <version>${netty4.version}</version>
475 - <groupId>io.netty</groupId> 475 + <classifier>${os.detected.classifier}</classifier>
476 - <artifactId>netty-transport-native-epoll</artifactId> 476 + </dependency>
477 - <version>${netty4.version}</version> 477 + <dependency>
478 - <classifier>${os.detected.classifier}</classifier> 478 + <groupId>joda-time</groupId>
479 - </dependency> 479 + <artifactId>joda-time</artifactId>
480 - <dependency> 480 + <version>2.5</version>
481 - <groupId>joda-time</groupId> 481 + </dependency>
482 - <artifactId>joda-time</artifactId> 482 + </dependencies>
483 - <version>2.5</version> 483 + </dependencyManagement>
484 - </dependency> 484 +
485 - </dependencies> 485 + <dependencies>
486 - </dependencyManagement> 486 + <dependency>
487 - 487 + <groupId>junit</groupId>
488 - <dependencies> 488 + <artifactId>junit</artifactId>
489 - <dependency> 489 + </dependency>
490 - <groupId>junit</groupId> 490 + <dependency>
491 - <artifactId>junit</artifactId> 491 + <groupId>org.hamcrest</groupId>
492 - </dependency> 492 + <artifactId>hamcrest-core</artifactId>
493 - <dependency> 493 + </dependency>
494 - <groupId>org.hamcrest</groupId> 494 + <dependency>
495 - <artifactId>hamcrest-core</artifactId> 495 + <groupId>org.hamcrest</groupId>
496 - </dependency> 496 + <artifactId>hamcrest-library</artifactId>
497 - <dependency> 497 + </dependency>
498 - <groupId>org.hamcrest</groupId> 498 + <dependency>
499 - <artifactId>hamcrest-library</artifactId> 499 + <groupId>org.slf4j</groupId>
500 - </dependency> 500 + <artifactId>slf4j-api</artifactId>
501 - <dependency> 501 + </dependency>
502 - <groupId>org.slf4j</groupId> 502 + <dependency>
503 - <artifactId>slf4j-api</artifactId> 503 + <groupId>org.slf4j</groupId>
504 - </dependency> 504 + <artifactId>slf4j-jdk14</artifactId>
505 - <dependency> 505 + </dependency>
506 - <groupId>org.slf4j</groupId> 506 + </dependencies>
507 - <artifactId>slf4j-jdk14</artifactId> 507 +
508 - </dependency> 508 + <build>
509 - </dependencies> 509 + <pluginManagement>
510 - 510 + <plugins>
511 - <build> 511 + <plugin>
512 - <pluginManagement> 512 + <groupId>org.apache.maven.plugins</groupId>
513 - <plugins> 513 + <artifactId>maven-compiler-plugin</artifactId>
514 - <plugin> 514 + <!-- TODO: update once following issue is fixed. -->
515 - <groupId>org.apache.maven.plugins</groupId> 515 + <!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
516 - <artifactId>maven-compiler-plugin</artifactId> 516 + <version>2.5.1</version>
517 - <!-- TODO: update once following issue is fixed. --> 517 + <configuration>
518 - <!-- https://jira.codehaus.org/browse/MCOMPILER-205 --> 518 + <source>1.8</source>
519 - <version>2.5.1</version> 519 + <target>1.8</target>
520 - <configuration> 520 + </configuration>
521 - <source>1.8</source> 521 + </plugin>
522 - <target>1.8</target> 522 +
523 - </configuration> 523 + <plugin>
524 - </plugin> 524 + <groupId>org.apache.maven.plugins</groupId>
525 - 525 + <artifactId>maven-surefire-plugin</artifactId>
526 - <plugin> 526 + <version>2.18.1</version>
527 - <groupId>org.apache.maven.plugins</groupId> 527 + <configuration>
528 - <artifactId>maven-surefire-plugin</artifactId> 528 + <redirectTestOutputToFile>true
529 - <version>2.18.1</version> 529 + </redirectTestOutputToFile>
530 - <configuration> 530 + <printSummary>true</printSummary>
531 - <redirectTestOutputToFile>true 531 + <excludedGroups>org.onlab.junit.IntegrationTest
532 - </redirectTestOutputToFile> 532 + </excludedGroups>
533 - <printSummary>true</printSummary> 533 + <rerunFailingTestsCount>1</rerunFailingTestsCount>
534 - <excludedGroups>org.onlab.junit.IntegrationTest 534 + </configuration>
535 - </excludedGroups> 535 + </plugin>
536 - <rerunFailingTestsCount>1</rerunFailingTestsCount> 536 +
537 - </configuration> 537 + <plugin>
538 - </plugin> 538 + <groupId>org.apache.maven.plugins</groupId>
539 - 539 + <artifactId>maven-jar-plugin</artifactId>
540 - <plugin> 540 + <version>2.3.1</version>
541 - <groupId>org.apache.maven.plugins</groupId> 541 + <executions>
542 - <artifactId>maven-jar-plugin</artifactId> 542 + <execution>
543 - <version>2.3.1</version> 543 + <phase>package</phase>
544 - <executions> 544 + <goals>
545 - <execution> 545 + <goal>test-jar</goal>
546 - <phase>package</phase> 546 + </goals>
547 - <goals> 547 + </execution>
548 - <goal>test-jar</goal> 548 + </executions>
549 - </goals> 549 + </plugin>
550 - </execution> 550 +
551 - </executions> 551 + <plugin>
552 - </plugin> 552 + <groupId>org.apache.maven.plugins</groupId>
553 - 553 + <artifactId>maven-resources-plugin</artifactId>
554 - <plugin> 554 + <version>2.6</version>
555 - <groupId>org.apache.maven.plugins</groupId> 555 + </plugin>
556 - <artifactId>maven-resources-plugin</artifactId> 556 +
557 - <version>2.6</version> 557 + <plugin>
558 - </plugin> 558 + <groupId>org.apache.felix</groupId>
559 - 559 + <artifactId>maven-bundle-plugin</artifactId>
560 - <plugin> 560 + <version>2.5.3</version>
561 - <groupId>org.apache.felix</groupId> 561 + <extensions>true</extensions>
562 - <artifactId>maven-bundle-plugin</artifactId> 562 + <!--
563 - <version>2.5.3</version> 563 + Drop following dependency when the below bug fix is published
564 - <extensions>true</extensions> 564 + https://issues.apache.org/jira/browse/FELIX-4556
565 - <!-- 565 + -->
566 - Drop following dependency when the below bug fix is published 566 + <dependencies>
567 - https://issues.apache.org/jira/browse/FELIX-4556 567 + <dependency>
568 - --> 568 + <groupId>biz.aQute.bnd</groupId>
569 - <dependencies> 569 + <artifactId>bndlib</artifactId>
570 - <dependency> 570 + <version>2.4.0</version>
571 - <groupId>biz.aQute.bnd</groupId> 571 + </dependency>
572 - <artifactId>bndlib</artifactId> 572 + </dependencies>
573 - <version>2.4.0</version> 573 + </plugin>
574 - </dependency> 574 +
575 - </dependencies> 575 + <plugin>
576 - </plugin> 576 + <groupId>org.apache.maven.plugins</groupId>
577 - 577 + <artifactId>maven-shade-plugin</artifactId>
578 - <plugin> 578 + <version>2.3</version>
579 - <groupId>org.apache.maven.plugins</groupId> 579 + </plugin>
580 - <artifactId>maven-shade-plugin</artifactId> 580 +
581 - <version>2.3</version> 581 + <plugin>
582 - </plugin> 582 + <groupId>org.apache.felix</groupId>
583 - 583 + <artifactId>maven-scr-plugin</artifactId>
584 - <plugin> 584 + <version>1.20.0</version>
585 - <groupId>org.apache.felix</groupId> 585 + <executions>
586 - <artifactId>maven-scr-plugin</artifactId> 586 + <execution>
587 - <version>1.20.0</version> 587 + <id>generate-scr-srcdescriptor</id>
588 - <executions> 588 + <goals>
589 - <execution> 589 + <goal>scr</goal>
590 - <id>generate-scr-srcdescriptor</id> 590 + </goals>
591 - <goals> 591 + </execution>
592 - <goal>scr</goal> 592 + </executions>
593 - </goals> 593 + <configuration>
594 - </execution> 594 + <supportedProjectTypes>
595 - </executions> 595 + <supportedProjectType>bundle</supportedProjectType>
596 - <configuration> 596 + <supportedProjectType>war</supportedProjectType>
597 - <supportedProjectTypes> 597 + </supportedProjectTypes>
598 - <supportedProjectType>bundle</supportedProjectType> 598 + </configuration>
599 - <supportedProjectType>war</supportedProjectType> 599 + </plugin>
600 - </supportedProjectTypes> 600 + <plugin>
601 - </configuration> 601 + <groupId>org.codehaus.mojo</groupId>
602 - </plugin> 602 + <artifactId>findbugs-maven-plugin</artifactId>
603 - <plugin> 603 + <version>3.0.0</version>
604 - <groupId>org.codehaus.mojo</groupId> 604 + <dependencies>
605 - <artifactId>findbugs-maven-plugin</artifactId> 605 + <dependency>
606 - <version>3.0.0</version> 606 + <groupId>org.onosproject</groupId>
607 - <dependencies> 607 + <artifactId>onos-build-conf</artifactId>
608 - <dependency> 608 + <version>1.0</version>
609 - <groupId>org.onosproject</groupId> 609 + </dependency>
610 - <artifactId>onos-build-conf</artifactId> 610 + </dependencies>
611 - <version>1.0</version> 611 + <configuration>
612 - </dependency> 612 + <effort>Max</effort>
613 - </dependencies> 613 + <excludeFilterFile>onos/findbugs-suppressions.xml
614 - <configuration> 614 + </excludeFilterFile>
615 - <effort>Max</effort> 615 + </configuration>
616 - <excludeFilterFile>onos/findbugs-suppressions.xml 616 + </plugin>
617 - </excludeFilterFile> 617 +
618 - </configuration> 618 + <!-- This version needs to be updated manually when changes are made to onos-maven-plugin -->
619 - </plugin> 619 + <plugin>
620 - 620 + <groupId>org.onosproject</groupId>
621 - <!-- This version needs to be updated manually when changes are made to onos-maven-plugin --> 621 + <artifactId>onos-maven-plugin</artifactId>
622 - <plugin> 622 + <version>1.5</version>
623 - <groupId>org.onosproject</groupId> 623 + <executions>
624 - <artifactId>onos-maven-plugin</artifactId> 624 + <execution>
625 - <version>1.5-SNAPSHOT</version> 625 + <id>cfg</id>
626 - <executions> 626 + <phase>generate-resources</phase>
627 - <execution> 627 + <goals>
628 - <id>cfg</id> 628 + <goal>cfg</goal>
629 - <phase>generate-resources</phase> 629 + </goals>
630 - <goals> 630 + </execution>
631 - <goal>cfg</goal> 631 + <execution>
632 - </goals> 632 + <id>swagger</id>
633 - </execution> 633 + <phase>generate-sources</phase>
634 - <execution> 634 + <goals>
635 - <id>swagger</id> 635 + <goal>swagger</goal>
636 - <phase>generate-sources</phase> 636 + </goals>
637 - <goals> 637 + </execution>
638 - <goal>swagger</goal> 638 + <execution>
639 - </goals> 639 + <id>app</id>
640 - </execution> 640 + <phase>package</phase>
641 - <execution> 641 + <goals>
642 - <id>app</id> 642 + <goal>app</goal>
643 - <phase>package</phase> 643 + </goals>
644 - <goals> 644 + </execution>
645 - <goal>app</goal> 645 + </executions>
646 - </goals> 646 + </plugin>
647 - </execution> 647 + </plugins>
648 - </executions> 648 + </pluginManagement>
649 - </plugin> 649 +
650 - </plugins> 650 + <plugins>
651 - </pluginManagement> 651 + <plugin>
652 - 652 + <groupId>org.apache.maven.plugins</groupId>
653 - <plugins> 653 + <artifactId>maven-jar-plugin</artifactId>
654 - <plugin> 654 + </plugin>
655 - <groupId>org.apache.maven.plugins</groupId> 655 +
656 - <artifactId>maven-jar-plugin</artifactId> 656 + <plugin>
657 - </plugin> 657 + <groupId>org.apache.maven.plugins</groupId>
658 - 658 + <artifactId>maven-checkstyle-plugin</artifactId>
659 - <plugin> 659 + <version>2.13</version>
660 - <groupId>org.apache.maven.plugins</groupId> 660 + <dependencies>
661 - <artifactId>maven-checkstyle-plugin</artifactId> 661 + <dependency>
662 - <version>2.13</version> 662 + <groupId>org.onosproject</groupId>
663 - <dependencies> 663 + <artifactId>onos-build-conf</artifactId>
664 - <dependency> 664 + <version>1.0</version>
665 - <groupId>org.onosproject</groupId> 665 + </dependency>
666 - <artifactId>onos-build-conf</artifactId> 666 + <!-- For Java 8 lambda support-->
667 - <version>1.0</version> 667 + <dependency>
668 - </dependency> 668 + <groupId>com.puppycrawl.tools</groupId>
669 - <!-- For Java 8 lambda support--> 669 + <artifactId>checkstyle</artifactId>
670 - <dependency> 670 + <version>5.9</version>
671 - <groupId>com.puppycrawl.tools</groupId> 671 + </dependency>
672 - <artifactId>checkstyle</artifactId> 672 + </dependencies>
673 - <version>5.9</version> 673 + <configuration>
674 - </dependency> 674 + <!-- begin: workaround for unexpected NullPointerException on Eclipse -->
675 - </dependencies> 675 + <sourceDirectory>${project.build.sourceDirectory}
676 - <configuration> 676 + </sourceDirectory>
677 - <!-- begin: workaround for unexpected NullPointerException on Eclipse --> 677 + <testSourceDirectory>${project.build.testSourceDirectory}
678 - <sourceDirectory>${project.build.sourceDirectory} 678 + </testSourceDirectory>
679 - </sourceDirectory> 679 + <!-- end: workaround for unexpected NullPointerException on Eclipse -->
680 - <testSourceDirectory>${project.build.testSourceDirectory} 680 + <configLocation>onos/checkstyle.xml</configLocation>
681 - </testSourceDirectory> 681 + <suppressionsLocation>onos/suppressions.xml
682 - <!-- end: workaround for unexpected NullPointerException on Eclipse --> 682 + </suppressionsLocation>
683 - <configLocation>onos/checkstyle.xml</configLocation> 683 + <failsOnError>false</failsOnError>
684 - <suppressionsLocation>onos/suppressions.xml 684 + <logViolationsToConsole>true</logViolationsToConsole>
685 - </suppressionsLocation> 685 + <includeTestSourceDirectory>true
686 - <failsOnError>false</failsOnError> 686 + </includeTestSourceDirectory>
687 - <logViolationsToConsole>true</logViolationsToConsole> 687 + </configuration>
688 - <includeTestSourceDirectory>true 688 + <executions>
689 - </includeTestSourceDirectory> 689 + <execution>
690 - </configuration> 690 + <id>validate-checkstyle</id>
691 - <executions> 691 + <phase>verify</phase>
692 - <execution> 692 + <goals>
693 - <id>validate-checkstyle</id> 693 + <goal>check</goal>
694 - <phase>verify</phase> 694 + </goals>
695 - <goals> 695 + </execution>
696 - <goal>check</goal> 696 + </executions>
697 - </goals> 697 + </plugin>
698 - </execution> 698 +
699 - </executions> 699 + <plugin>
700 - </plugin> 700 + <groupId>org.apache.maven.plugins</groupId>
701 - 701 + <artifactId>maven-pmd-plugin</artifactId>
702 - <plugin> 702 + <version>3.2</version>
703 - <groupId>org.apache.maven.plugins</groupId> 703 + <configuration>
704 - <artifactId>maven-pmd-plugin</artifactId> 704 + <excludes>
705 - <version>3.2</version> 705 + </excludes>
706 - <configuration> 706 + <rulesets>
707 - <excludes> 707 + <ruleset>onos/pmd.xml</ruleset>
708 - </excludes> 708 + </rulesets>
709 - <rulesets> 709 + </configuration>
710 - <ruleset>onos/pmd.xml</ruleset> 710 + <executions>
711 - </rulesets> 711 + <execution>
712 - </configuration> 712 + <id>validate-pmd</id>
713 - <executions> 713 + <phase>verify</phase>
714 - <execution> 714 + <goals>
715 - <id>validate-pmd</id> 715 + <!-- Uncomment this goal to make the build fail on pmd errors -->
716 - <phase>verify</phase> 716 + <!--<goal>check</goal>-->
717 - <goals> 717 + </goals>
718 - <!-- Uncomment this goal to make the build fail on pmd errors --> 718 + </execution>
719 - <!--<goal>check</goal>--> 719 + </executions>
720 - </goals> 720 + </plugin>
721 - </execution> 721 +
722 - </executions> 722 + <plugin>
723 - </plugin> 723 + <groupId>org.jacoco</groupId>
724 - 724 + <artifactId>jacoco-maven-plugin</artifactId>
725 - <plugin> 725 + <version>0.7.2.201409121644</version>
726 - <groupId>org.jacoco</groupId> 726 + <executions>
727 - <artifactId>jacoco-maven-plugin</artifactId> 727 + <execution>
728 - <version>0.7.2.201409121644</version> 728 + <id>default-prepare-agent</id>
729 - <executions> 729 + <goals>
730 - <execution> 730 + <goal>prepare-agent</goal>
731 - <id>default-prepare-agent</id> 731 + </goals>
732 - <goals> 732 + </execution>
733 - <goal>prepare-agent</goal> 733 + <execution>
734 - </goals> 734 + <id>default-report</id>
735 - </execution> 735 + <phase>prepare-package</phase>
736 - <execution> 736 + <goals>
737 - <id>default-report</id> 737 + <goal>report</goal>
738 - <phase>prepare-package</phase> 738 + </goals>
739 - <goals> 739 + </execution>
740 - <goal>report</goal> 740 + </executions>
741 - </goals> 741 + </plugin>
742 - </execution> 742 + </plugins>
743 - </executions> 743 + </build>
744 - </plugin> 744 +
745 - </plugins> 745 + <reporting>
746 - </build> 746 + <plugins>
747 - 747 + <plugin>
748 - <reporting> 748 + <groupId>org.apache.maven.plugins</groupId>
749 - <plugins> 749 + <artifactId>maven-checkstyle-plugin</artifactId>
750 - <plugin> 750 + <version>2.12.1</version>
751 - <groupId>org.apache.maven.plugins</groupId> 751 + <configuration>
752 - <artifactId>maven-checkstyle-plugin</artifactId> 752 + <configLocation>onos/checkstyle.xml</configLocation>
753 - <version>2.12.1</version> 753 + </configuration>
754 - <configuration> 754 + </plugin>
755 - <configLocation>onos/checkstyle.xml</configLocation> 755 +
756 - </configuration> 756 + <plugin>
757 - </plugin> 757 + <groupId>org.apache.maven.plugins</groupId>
758 - 758 + <artifactId>maven-pmd-plugin</artifactId>
759 - <plugin> 759 + <version>3.2</version>
760 - <groupId>org.apache.maven.plugins</groupId> 760 + <configuration>
761 - <artifactId>maven-pmd-plugin</artifactId> 761 + <excludes>
762 - <version>3.2</version> 762 + </excludes>
763 - <configuration> 763 + <rulesets>
764 - <excludes> 764 + <ruleset>onos/pmd.xml</ruleset>
765 - </excludes> 765 + </rulesets>
766 - <rulesets> 766 + </configuration>
767 - <ruleset>onos/pmd.xml</ruleset> 767 + </plugin>
768 - </rulesets> 768 + </plugins>
769 - </configuration> 769 + </reporting>
770 - </plugin> 770 +</project>
771 - </plugins>
772 - </reporting>
773 -</project>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </parent> 24 </parent>
25 25
26 <artifactId>onos-maven-plugin</artifactId> 26 <artifactId>onos-maven-plugin</artifactId>
27 - <version>1.5-SNAPSHOT</version> 27 + <version>1.5</version>
28 <packaging>maven-plugin</packaging> 28 <packaging>maven-plugin</packaging>
29 29
30 <description>Maven plugin for packaging ONOS applications or generating 30 <description>Maven plugin for packaging ONOS applications or generating
......