[SEBA-870] Bump ONOS to 2.2.1 and build with Java 11
Change-Id: Iefb2cb709734c8802207769d842ca4e4542766e1
diff --git a/pom.xml b/pom.xml
index 9fb771b..523fd0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,26 +22,24 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.13.9-rc4</version>
- <relativePath></relativePath>
+ <version>2.2.1-b2</version>
</parent>
<groupId>org.opencord</groupId>
<artifactId>mcast</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>CORD Multicast application</description>
<properties>
<onos.app.name>org.opencord.mcast</onos.app.name>
- <onos.version>1.13.9-rc4</onos.version>
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.title>CORD Multicast App</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
<onos.app.requires>org.opencord.config</onos.app.requires>
- <cord.config.version>1.4.0</cord.config.version>
- <olt.api.version>1.4.0</olt.api.version>
+ <cord.config.version>2.0.0-SNAPSHOT</cord.config.version>
+ <olt.api.version>4.0.0-SNAPSHOT</olt.api.version>
</properties>
<dependencies>
@@ -49,68 +47,39 @@
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<version>${onos.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${onos.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-core-serializers</artifactId>
+ <version>${onos.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opencord</groupId>
<artifactId>cord-config</artifactId>
<version>${cord.config.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-mcast-api</artifactId>
<version>${onos.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>4.1.0</version>
- <extensions>true</extensions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <release>11</release>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.11</version>
- <executions>
- <execution>
- <id>cfg</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>cfg</goal>
- </goals>
- </execution>
- <execution>
- <id>swagger</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>swagger</goal>
- </goals>
- </execution>
- <execution>
- <id>app</id>
- <phase>package</phase>
- <goals>
- <goal>app</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -130,7 +99,6 @@
<checksumPolicy>fail</checksumPolicy>
</releases>
</repository>
-
<repository>
<id>snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>