Startign 5.0.1-SNAPSHOT and Moving listener removal to app deactivation
Change-Id: I3a33c95a6e541cfa685c82e5f33b2fb70b193d68
diff --git a/.gitreview b/.gitreview
index 981cc4c..97c3c46 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
port=29418
project=olt.git
defaultremote=origin
+defaultbranch=olt-5.0
diff --git a/app/app.xml b/app/app.xml
index 914f727..b34983d 100644
--- a/app/app.xml
+++ b/app/app.xml
@@ -23,6 +23,6 @@
<description>${project.description}</description>
<artifact>mvn:${project.groupId}/olt-impl/${project.version}</artifact>
<artifact>mvn:${project.groupId}/olt-web/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/olt-api/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/olt-api/${olt.api.version}</artifact>
<artifact>mvn:${project.groupId}/sadis-api/${sadis.api.version}</artifact>
</app>
diff --git a/app/features.xml b/app/features.xml
index fffac01..7f3f988 100644
--- a/app/features.xml
+++ b/app/features.xml
@@ -20,7 +20,7 @@
<feature>onos-api</feature>
<bundle>mvn:${project.groupId}/olt-impl/${project.version}</bundle>
<bundle>mvn:${project.groupId}/olt-web/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/olt-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/olt-api/${olt.api.version}</bundle>
<bundle>mvn:${project.groupId}/sadis-api/${sadis.api.version}</bundle>
</feature>
</features>
diff --git a/app/pom.xml b/app/pom.xml
index ce0d7a5..4bcbebe 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -20,13 +20,13 @@
<parent>
<artifactId>olt</artifactId>
<groupId>org.opencord</groupId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opencord</groupId>
<artifactId>olt-app</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>OLT application for CORD</description>
<properties>
diff --git a/impl/pom.xml b/impl/pom.xml
index 038540e..8c53dd0 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,12 +20,12 @@
<parent>
<artifactId>olt</artifactId>
<groupId>org.opencord</groupId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>olt-impl</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/impl/src/main/java/org/opencord/olt/impl/Olt.java b/impl/src/main/java/org/opencord/olt/impl/Olt.java
index c5f7806..79d30c6 100644
--- a/impl/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/impl/src/main/java/org/opencord/olt/impl/Olt.java
@@ -230,6 +230,7 @@
protected void deactivate(ComponentContext context) {
cfgService.unregisterProperties(getClass(), false);
discoveredSubscriberExecutor.shutdown();
+ deviceService.removeListener(deviceListener);
flowsExecutor.shutdown();
subscriberExecutor.shutdown();
deviceListener.deactivate();
@@ -633,7 +634,6 @@
}
protected void unbindSadisService(SadisService service) {
- deviceService.removeListener(deviceListener);
deviceListener = null;
sadisService = null;
subsService = null;
diff --git a/pom.xml b/pom.xml
index 96310b0..d7fc37a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.opencord</groupId>
<artifactId>olt</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>OLT Application</description>
<url>http://onosproject.org</url>
diff --git a/web/pom.xml b/web/pom.xml
index 8a46f82..bdf0c96 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>olt</artifactId>
<groupId>org.opencord</groupId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>olt-web</artifactId>