Bumps support branch to 1.13.10-rc2
Change-Id: Ie7d9ee5ae1fe79eaccdb3207e0cbd59705b73cc3
diff --git a/api/pom.xml b/api/pom.xml
index 3c014de..16bc4c9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,29 +30,12 @@
<description>DHCP L2 Relay application API</description>
- <properties>
- <sadis.api.version>3.1.1-SNAPSHOT</sadis.api.version>
- </properties>
-
<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>
<version>${onos.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.opencord</groupId>
- <artifactId>sadis-api</artifactId>
- <version>${sadis.api.version}</version>
- </dependency>
</dependencies>
<build>
@@ -64,4 +47,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/app/pom.xml b/app/pom.xml
index 2225b98..b803563 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -31,31 +31,15 @@
<properties>
<onos.app.name>org.opencord.dhcpl2relay</onos.app.name>
- <onos.version>1.13.9</onos.version>
+ <onos.version>1.13.10-rc2</onos.version>
<onos.app.title>DHCP Relay Agent App</onos.app.title>
<onos.app.category>default</onos.app.category>
<onos.app.url>http://opencord.org</onos.app.url>
<onos.app.readme>DHCP L2 Relay Agent Application.</onos.app.readme>
- <onos.app.requires>
- org.opencord.sadis
- </onos.app.requires>
- <sadis.api.version>3.1.1-SNAPSHOT</sadis.api.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.opencord</groupId>
- <artifactId>sadis-api</artifactId>
- <version>${sadis.api.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.opencord</groupId>
<artifactId>dhcpl2relay-api</artifactId>
<version>1.6.3-SNAPSHOT</version>
@@ -63,66 +47,6 @@
</dependency>
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-incubator-api</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- <version>${onos.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-cli</artifactId>
- <version>${onos.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
@@ -151,7 +75,6 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.11</version>
</plugin>
</plugins>
</build>
@@ -183,4 +106,4 @@
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index fde47c8..a0dd248 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.13.9</version>
+ <version>1.13.10-rc2</version>
<relativePath></relativePath>
</parent>
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.13.9</onos.version>
+ <onos.version>1.13.10-rc2</onos.version>
<onos.app.requires>
org.opencord.sadis
</onos.app.requires>
@@ -128,7 +128,14 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.11</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+ </configuration>
</plugin>
</plugins>
</build>