Bumping up ONOS to 1.8.0
Also change parent pom to onos-dependencies and remove 3rd party dependencies
Change-Id: Ic47fd35947e5c889323acd3df166db9bd8563f51
diff --git a/api/pom.xml b/api/pom.xml
index 372694a..8b61970 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -34,13 +34,13 @@
<description>OLT application API</description>
<dependencies>
-
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
<version>${onos.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
diff --git a/app/pom.xml b/app/pom.xml
index 93d7557..1bbe918 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -54,45 +54,10 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
- <dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-rest</artifactId>
<version>${onos.version}</version>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index d2861e3..56860de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.7.1</version>
+ <artifactId>onos-dependencies</artifactId>
+ <version>1.8.0</version>
<relativePath></relativePath>
</parent>
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.7.1</onos.version>
+ <onos.version>1.8.0</onos.version>
<onos.app.name>org.opencord.olt</onos.app.name>
<onos.app.title>OLT Access Management</onos.app.title>
<onos.app.origin>OpenCord</onos.app.origin>
@@ -47,45 +47,74 @@
<module>app</module>
</modules>
-
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${onos.version}</version>
</dependency>
- <dependency>
- <groupId>org.opencord</groupId>
- <artifactId>cord-config</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-net</artifactId>
<version>${onos.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-common</artifactId>
<version>${onos.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.opencord</groupId>
+ <artifactId>cord-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
-
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>http://repo.maven.apache.org/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>