commit ea7657dabcd90eae59af6eb53c4ab7c7c991f009
author Ray Milkey <ray@opennetworking.org> Thu Apr 04 17:02:38 2019 -0700
committer Ray Milkey <ray@opennetworking.org> Fri Apr 05 09:36:50 2019 -0700
tree ee381849d7078b1ecd55983bdcd938ccf1c73cd1
parent 14c6d620e80ff77663e60810e1174ffea24721f1

Fix maven build problems in apps

Change-Id: Ia9d17553d14f5966b548d9b24d73aeada349895a

apps/dhcprelay/pom.xml

diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 1f83b22..cd8cf68 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -28,16 +28,6 @@
 
     <description>DHCP Relay Agent</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.app.name>org.onosproject.dhcprelay</onos.app.name>
-        <onos.app.title>DHCP Relay Agent App</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>DHCP Relay Agent Application.</onos.app.readme>
-    </properties>
-
     <modules>
         <module>web</module>
         <module>app</module>

apps/dhcprelay/web/pom.xml

diff --git a/apps/dhcprelay/web/pom.xml b/apps/dhcprelay/web/pom.xml
index a574e5a..6ce5f5b 100644
--- a/apps/dhcprelay/web/pom.xml
+++ b/apps/dhcprelay/web/pom.xml
@@ -26,16 +26,6 @@
     <artifactId>onos-apps-dhcprelay-web</artifactId>
     <packaging>bundle</packaging>
 
-    <properties>
-        <web.context>/onos/v1/dhcprelay</web.context>
-        <api.version>1.0.0</api.version>
-        <api.title>ONOS DHCP Relay Agent Application REST API</api.title>
-        <api.description>
-            APIs for interacting with the DHCP Relay Agent application.
-        </api.description>
-        <api.package>org.onosproject.dhcprelay.web</api.package>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -92,6 +82,12 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-dhcprelay-app</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-apps-route-service-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

apps/packet-stats/pom.xml

diff --git a/apps/packet-stats/pom.xml b/apps/packet-stats/pom.xml
index 4f02e49..43d69a0 100644
--- a/apps/packet-stats/pom.xml
+++ b/apps/packet-stats/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>onos-apps-packet-stats</artifactId>
     <version>1.12.2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>pom</packaging>
 
     <description>ONOS OSGi bundle archetype</description>
     <url>http://onosproject.org</url>