Cleaning pom.xml files. Please everyone, watch the sloppiness for Pete's sake!
Change-Id: I31bd8d589d306f50b2724223c5dabd066f0961da
diff --git a/apps/actn-mdsc/tetunnel-pce/pom.xml b/apps/actn-mdsc/tetunnel-pce/pom.xml
index c45062b..728ee52 100644
--- a/apps/actn-mdsc/tetunnel-pce/pom.xml
+++ b/apps/actn-mdsc/tetunnel-pce/pom.xml
@@ -33,12 +33,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-tetunnel-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-app-tetunnel-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index e303dba..04d1185 100644
--- a/apps/learning-switch/pom.xml
+++ b/apps/learning-switch/pom.xml
@@ -44,13 +44,11 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index afbe2ea..d9ab54e 100644
--- a/apps/openstacknetworking/pom.xml
+++ b/apps/openstacknetworking/pom.xml
@@ -51,7 +51,6 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -84,17 +83,14 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -147,10 +143,6 @@
<version>2.25</version>
</dependency>
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
<groupId>org.pacesys</groupId>
<artifactId>openstack4j-core</artifactId>
<version>2.11</version>
diff --git a/apps/pom.xml b/apps/pom.xml
index ac7b150..ebd1d28 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -109,16 +109,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-app-config</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
diff --git a/apps/roadm/pom.xml b/apps/roadm/pom.xml
index e189994e..dacba4b 100644
--- a/apps/roadm/pom.xml
+++ b/apps/roadm/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
</dependency>
<dependency>
@@ -76,7 +75,6 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index c9ba034..ebf53d3 100644
--- a/apps/scalablegateway/pom.xml
+++ b/apps/scalablegateway/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index dada0f9..ec17150 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-dist</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index 542a89a..fb840f1 100644
--- a/apps/tetunnel/app/pom.xml
+++ b/apps/tetunnel/app/pom.xml
@@ -32,12 +32,12 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-tetunnel-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/core/net/pom.xml b/core/net/pom.xml
index cd79c02..6b39567 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -125,13 +125,6 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-net</artifactId>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index 6b05041..b136ea9 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/protocols/snmp/ctl/pom.xml b/protocols/snmp/ctl/pom.xml
index 5446906..b920468 100644
--- a/protocols/snmp/ctl/pom.xml
+++ b/protocols/snmp/ctl/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-snmp-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/providers/ietfte/pom.xml b/providers/ietfte/pom.xml
index 786bdfb..9a4bf81 100644
--- a/providers/ietfte/pom.xml
+++ b/providers/ietfte/pom.xml
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-yms-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-restconf-server-utils</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index dbaca7d..286dc5b 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-lldp-provider-common</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/providers/netcfglinks/pom.xml b/providers/netcfglinks/pom.xml
index a696f1b..939de04 100644
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-lldp-provider-common</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/providers/pcep/cli/pom.xml b/providers/pcep/cli/pom.xml
index 896687e..826a999 100644
--- a/providers/pcep/cli/pom.xml
+++ b/providers/pcep/cli/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-pcep-controller-impl</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index da10531..267ad03 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-snmp-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-snmp-ctl</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>