more version fixes
Change-Id: If0150bc44b67bc2f3729c794aab8cf6f72075179
diff --git a/apps/packet-stats/app/pom.xml b/apps/packet-stats/app/pom.xml
index 3e94ab6..b1e89df 100644
--- a/apps/packet-stats/app/pom.xml
+++ b/apps/packet-stats/app/pom.xml
@@ -33,7 +33,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.12.2-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.packetstats</onos.app.name>
<onos.app.title>onos-apps-packet-stats-app</onos.app.title>
<onos.app.origin>Raleigh, NC Comcast</onos.app.origin>
@@ -51,7 +50,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -62,18 +61,18 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-route-service-app</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apps/packet-stats/pom.xml b/apps/packet-stats/pom.xml
index 43d69a0..126faca 100644
--- a/apps/packet-stats/pom.xml
+++ b/apps/packet-stats/pom.xml
@@ -19,7 +19,6 @@
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
<version>1.12.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.onosproject</groupId>
diff --git a/apps/packet-throttle/app/pom.xml b/apps/packet-throttle/app/pom.xml
index ede0daa..11569bd 100644
--- a/apps/packet-throttle/app/pom.xml
+++ b/apps/packet-throttle/app/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>${onos.version}</onos.version>
+ <onos.version>${project.version}</onos.version>
</properties>
<dependencies>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
- <version>${onos.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/apps/packet-throttle/pom.xml b/apps/packet-throttle/pom.xml
index 4c8d20e..4d69d3e 100644
--- a/apps/packet-throttle/pom.xml
+++ b/apps/packet-throttle/pom.xml
@@ -27,22 +27,10 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-packet-throttle</artifactId>
<version>1.12.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <packaging>pom</packaging>
<description>Packet throttle application to make ONOS drop packets crossing threshold.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.12.2-SNAPSHOT</onos.version>
- <onos.app.name>org.onosproject.packetthrottle</onos.app.name>
- <onos.app.title>onos-apps-packet-throttle</onos.app.title>
- <onos.app.origin>Infosys, Inc.</onos.app.origin>
- <onos.app.category>Traffic Steering</onos.app.category>
- <onos.app.url>http://onosproject.org</onos.app.url>
- <onos.app.readme>Packet throttle application to make ONOS drop non-important packets.</onos.app.readme>
- </properties>
-
<modules>
<module>app</module>
</modules>
diff --git a/apps/pom.xml b/apps/pom.xml
index 8d8c665..04f0281 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -35,6 +35,7 @@
<module>faultmanagement</module>
<module>fwd</module>
<module>packet-stats</module>
+ <module>packet-throttle</module>
<module>mobility</module>
<module>proxyarp</module>
<module>sdnip</module>