Fixing build issues
- Excluding sdx-l3 from build, compilation error
- Bump version, except for CE app
- [CE App] Reference stable ONOS version
- Refer to stable ONOS version
- Refer to buck built artifact name
- Fix dependency to point to more appropriate artifact
- Cosmetic fixes
Change-Id: Ice43cfbb30edda60b71e64c34369ab3bc296e5dd
diff --git a/calendar/pom.xml b/calendar/pom.xml
index 720a1ef..941357d 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/database-perf/pom.xml b/database-perf/pom.xml
index 1d688b9..39a4dc9 100644
--- a/database-perf/pom.xml
+++ b/database-perf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/ecord/carrierethernet/pom.xml b/ecord/carrierethernet/pom.xml
index 69aa9fd..1054cd9 100644
--- a/ecord/carrierethernet/pom.xml
+++ b/ecord/carrierethernet/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.8.0-SNAPSHOT</onos.version>
+ <onos.version>1.8.0</onos.version>
<onos.app.name>org.onosproject.ecord.carrierethernet</onos.app.name>
<onos.app.origin>ON.Lab</onos.app.origin>
<onos.app.requires>org.onosproject.newoptical</onos.app.requires>
@@ -47,16 +47,19 @@
<artifactId>onos-cli</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-drivers</artifactId>
+ <artifactId>onos-protocols-openflow-api</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-newoptical</artifactId>
+ <artifactId>onos-apps-newoptical</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/ecord/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java b/ecord/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
index 59d6f91..d6d4f12 100644
--- a/ecord/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
+++ b/ecord/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
@@ -88,6 +88,7 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected FlowObjectiveService flowObjectiveService;
+ // FIXME App directly depending on SB details is probably not correct
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenFlowController controller;
@@ -101,7 +102,7 @@
// FIXME: Replace with Pair<DeviceId, MeterId>
private final Map<String, Set<DeviceMeterId>> deviceMeterIdMap = new HashMap<>();
- private final Map<String, LinkedList<Pair<DeviceId, Objective>>> flowObjectiveMap = new HashMap();
+ private final Map<String, LinkedList<Pair<DeviceId, Objective>>> flowObjectiveMap = new HashMap<>();
@Activate
protected void activate() {
diff --git a/ecord/co/pom.xml b/ecord/co/pom.xml
index 52bc7da..ca7d798 100644
--- a/ecord/co/pom.xml
+++ b/ecord/co/pom.xml
@@ -19,13 +19,13 @@
<parent>
<artifactId>onos-app-samples</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-ecord-co</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Enterprise CORD for Central Office</description>
diff --git a/flowtest/pom.xml b/flowtest/pom.xml
index a864d29..2053ac5 100644
--- a/flowtest/pom.xml
+++ b/flowtest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/icona/app/pom.xml b/icona/app/pom.xml
index 5d46658..a4d576c 100644
--- a/icona/app/pom.xml
+++ b/icona/app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-icona</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/icona/domainmgr/pom.xml b/icona/domainmgr/pom.xml
index 0a56c8d..68f98a5 100644
--- a/icona/domainmgr/pom.xml
+++ b/icona/domainmgr/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-icona</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/icona/domainprovider/pom.xml b/icona/domainprovider/pom.xml
index 821010a..e5e2ee2 100644
--- a/icona/domainprovider/pom.xml
+++ b/icona/domainprovider/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-icona</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/icona/pom.xml b/icona/pom.xml
index 8ba91cf..372fb75 100644
--- a/icona/pom.xml
+++ b/icona/pom.xml
@@ -22,12 +22,12 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-icona</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -35,4 +35,4 @@
<module>domainmgr</module>
<module>domainprovider</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/ifwd/pom.xml b/ifwd/pom.xml
index c0bac1b..e5e314a 100644
--- a/ifwd/pom.xml
+++ b/ifwd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/ipfix/pom.xml b/ipfix/pom.xml
index ab5e3be..4445ad6 100644
--- a/ipfix/pom.xml
+++ b/ipfix/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/oneping/pom.xml b/oneping/pom.xml
index 7c4bae8..0812569 100644
--- a/oneping/pom.xml
+++ b/oneping/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 58dbdf8..9973c4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS sample applications</description>
@@ -36,8 +36,10 @@
<module>ifwd</module>
<module>ipfix</module>
<module>oneping</module>
+<!-- exclude failing build
<module>sdx-l3</module>
- <module>sdx-l2</module>
+-->
+ <module>sdx-l2</module>
<module>tvue</module>
<module>uiref</module>
<module>ecord/co</module>
@@ -46,7 +48,7 @@
</modules>
<properties>
- <onos.version>1.8.0-SNAPSHOT</onos.version>
+ <onos.version>1.9.0-SNAPSHOT</onos.version>
</properties>
<!-- FIXME remove before release;
diff --git a/sdx-l2/pom.xml b/sdx-l2/pom.xml
index 27b1efc..5c37099 100644
--- a/sdx-l2/pom.xml
+++ b/sdx-l2/pom.xml
@@ -20,19 +20,19 @@
<parent>
<artifactId>onos-app-samples</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
</parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-sdx-l2</artifactId>
-<version>1.8.0-SNAPSHOT</version>
+<version>1.9.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>SDX-L2 application to create and manage Ethernet circuits</description>
<url>http://www.geant.org</url>
<properties>
- <onos.version>1.8.0-SNAPSHOT</onos.version>
+ <onos.version>1.9.0-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.sdx-l2</onos.app.name>
<onos.app.title>SDX-L2 App</onos.app.title>
<onos.app.category>Utility</onos.app.category>
@@ -173,4 +173,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/sdx-l3/pom.xml b/sdx-l3/pom.xml
index 081b13f..e077c99 100644
--- a/sdx-l3/pom.xml
+++ b/sdx-l3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tvue/pom.xml b/tvue/pom.xml
index 5a53ae2..9e38e67 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/uiref/pom.xml b/uiref/pom.xml
index 8351e5c..c43c2fe 100644
--- a/uiref/pom.xml
+++ b/uiref/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>