Bumping up ONOS to 1.8.0
Also change parent pom to onos-dependencies and remove 3rd party dependencies
Change-Id: I35fb939cfd6ea299e61996797ee75624ea3e4070
diff --git a/app.xml b/app.xml
deleted file mode 100644
index 022abd7..0000000
--- a/app.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright 2015-present Open Networking Laboratory
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<app name="org.opencord.aaa" origin="ATT" version="${project.version}"
- category="Security" url="http://opencord.org" title="Authentication App"
- featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
- features="${project.artifactId}">
- <description>${project.description}</description>
- <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-</app>
diff --git a/features.xml b/features.xml
deleted file mode 100644
index 6bb6cfa..0000000
--- a/features.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ~ Copyright 2015-present Open Networking Laboratory
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
- <feature name="${project.artifactId}" version="${project.version}"
- description="${project.description}">
- <feature>onos-api</feature>
- <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
- </feature>
-</features>
diff --git a/pom.xml b/pom.xml
index e8d7265..5e16418 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>
@@ -31,35 +31,19 @@
<version>1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <!--
- <repositories>
- <repository>
- <id>oss-staging</id>
- <name>OSS Staging</name>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </repository>
- </repositories>
--->
-
<description>ONOS authentication application</description>
<properties>
<onos.app.name>org.opencord.aaa</onos.app.name>
- <onos.version>1.7.1</onos.version>
+ <onos.version>1.8.0</onos.version>
<onos.app.title>AAA App</onos.app.title>
- <onos.app.category>Traffic Steering</onos.app.category>
+ <onos.app.category>Security</onos.app.category>
<onos.app.url>http://opencord.org</onos.app.url>
- <onos.app.readme>IGMP implementation.</onos.app.readme>
- <onos.app.requires>org.opencord.config</onos.app.requires>
+ <onos.app.readme>802.1x authentication service.</onos.app.readme>
</properties>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${onos.version}</version>
@@ -67,12 +51,6 @@
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${onos.version}</version>
<classifier>tests</classifier>
@@ -86,42 +64,6 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->
- <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.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
<version>${onos.version}</version>
@@ -129,7 +71,6 @@
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -141,6 +82,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>