Rebuild all cord-tester and cord-apps version with latest onos updated with guava 22.0.
cord-tester needs to be changed to use these apps.
Change-Id: I90a943c62874aa9f8df74d270789509c326f706a
diff --git a/src/test/apps/aaa-2.0-SNAPSHOT.oar b/src/test/apps/aaa-2.0-SNAPSHOT.oar
new file mode 100644
index 0000000..20e88ca
--- /dev/null
+++ b/src/test/apps/aaa-2.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/ciena-cordigmp-3.0-SNAPSHOT.oar b/src/test/apps/ciena-cordigmp-3.0-SNAPSHOT.oar
new file mode 100644
index 0000000..462df58
--- /dev/null
+++ b/src/test/apps/ciena-cordigmp-3.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/ciena-cordigmp-multitable-3.0-SNAPSHOT.oar b/src/test/apps/ciena-cordigmp-multitable-3.0-SNAPSHOT.oar
new file mode 100644
index 0000000..e344d26
--- /dev/null
+++ b/src/test/apps/ciena-cordigmp-multitable-3.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/ciena-cordigmp.multi-table/pom.xml b/src/test/apps/ciena-cordigmp.multi-table/pom.xml
index a9f8c85..16a5e0d 100644
--- a/src/test/apps/ciena-cordigmp.multi-table/pom.xml
+++ b/src/test/apps/ciena-cordigmp.multi-table/pom.xml
@@ -19,14 +19,14 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.6.0-rc2</version>
+ <artifactId>onos-dependencies</artifactId>
+ <version>1.10.0-rc4</version>
<relativePath></relativePath>
</parent>
<groupId>org.ciena.cordigmp</groupId>
<artifactId>ciena-cordigmp</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<repositories>
@@ -42,7 +42,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.6.0-rc2</onos.version>
+ <onos.version>1.10.0-rc4</onos.version>
<onos.app.name>org.ciena.cordigmp</onos.app.name>
<onos.app.title>Ciena IGMP for OVS</onos.app.title>
<onos.app.origin>Ciena Inc.</onos.app.origin>
@@ -95,11 +95,6 @@
<artifactId>org.osgi.compendium</artifactId>
<version>5.0.0</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
- </dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/src/test/apps/ciena-cordigmp/pom.xml b/src/test/apps/ciena-cordigmp/pom.xml
index 45b710a..2414295 100644
--- a/src/test/apps/ciena-cordigmp/pom.xml
+++ b/src/test/apps/ciena-cordigmp/pom.xml
@@ -17,16 +17,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.6.0-rc2</version>
+ <artifactId>onos-dependencies</artifactId>
+ <version>1.10.0-rc4</version>
<relativePath></relativePath>
</parent>
<groupId>org.ciena.cordigmp</groupId>
<artifactId>ciena-cordigmp</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<repositories>
@@ -42,7 +42,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.6.0-rc2</onos.version>
+ <onos.version>1.10.0-rc4</onos.version>
<onos.app.name>org.ciena.cordigmp</onos.app.name>
<onos.app.title>Ciena IGMP for OVS</onos.app.title>
<onos.app.origin>Ciena Inc.</onos.app.origin>
diff --git a/src/test/apps/cord-config-2.0-SNAPSHOT.oar b/src/test/apps/cord-config-2.0-SNAPSHOT.oar
new file mode 100644
index 0000000..76b5235
--- /dev/null
+++ b/src/test/apps/cord-config-2.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/igmp-2.0-SNAPSHOT.oar b/src/test/apps/igmp-2.0-SNAPSHOT.oar
new file mode 100644
index 0000000..9db0750
--- /dev/null
+++ b/src/test/apps/igmp-2.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/olt-app-2.0-SNAPSHOT.oar b/src/test/apps/olt-app-2.0-SNAPSHOT.oar
new file mode 100644
index 0000000..8237f08
--- /dev/null
+++ b/src/test/apps/olt-app-2.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/xconnect-2.0-SNAPSHOT.oar b/src/test/apps/xconnect-2.0-SNAPSHOT.oar
new file mode 100644
index 0000000..74794c5
--- /dev/null
+++ b/src/test/apps/xconnect-2.0-SNAPSHOT.oar
Binary files differ
diff --git a/src/test/apps/xconnect/pom.xml b/src/test/apps/xconnect/pom.xml
index ed8c345..7eed9ea 100644
--- a/src/test/apps/xconnect/pom.xml
+++ b/src/test/apps/xconnect/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.ciena.xconnect</groupId>
<artifactId>xconnect</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>ONOS OSGi bundle archetype</description>
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.8.0</onos.version>
+ <onos.version>1.10.0-rc4</onos.version>
<onos.app.name>org.ciena.xconnect</onos.app.name>
<onos.app.title>ciena xconnect</onos.app.title>