Update archetype-resources
- Update dependency and plugin version to sync with ONOS-3703 changes
- Add rest uitab uitopo to onos-archetypes-test script
Confirmed followign passed
mvn -amd -pl :onos-archetypes clean install && onos-archetypes-test
- Specify UTF-8 to eliminate build time warning
- Add onos-maven-plugin to plugin dependency to generate swagger.json
Change-Id: I1fdc893a42eea3e464941f1d840ad03bccea0668
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index e272b56..7c2ca8e 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014-2015 Open Networking Laboratory
+ ~ Copyright 2014-2016 Open Networking Laboratory
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
<url>http://onosproject.org</url>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.5.0-SNAPSHOT</onos.version>
<web.context>/onos/${artifactId}</web.context>
@@ -53,7 +54,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
@@ -101,13 +102,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.2</version>
+ <version>2.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.4.2</version>
+ <version>2.6.4</version>
<scope>provided</scope>
</dependency>
@@ -120,7 +121,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.8</version>
+ <version>1.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -136,7 +137,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -185,7 +186,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0</version>
<executions>
<execution>
<id>generate-scr-srcdescriptor</id>
@@ -201,6 +202,34 @@
</supportedProjectTypes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>cfg</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>cfg</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>swagger</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>swagger</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>app</id>
+ <phase>package</phase>
+ <goals>
+ <goal>app</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>