Fix maven build problems with restconf protocol
Change-Id: If0a9234283041cb6ce0fe48ba6a4674989bfd0be
diff --git a/apps/pom.xml b/apps/pom.xml
index a036380..f237983 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -82,13 +82,13 @@
<module>tetunnel</module>
<module>actn-mdsc</module>
<module>config</module>
- <module>restconf</module>
<module>ofagent</module>
<module>intentsync</module>
<module>mappingmanagement</module>
<module>yang</module>
<module>network-troubleshoot</module>
<module>l3vpn</module>
+ <module>restconf</module>
</modules>
<properties>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 152a0aa..537d3d9 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -42,7 +42,9 @@
<module>snmp</module>
<module>bmv2</module>
<module>lisp</module>
+ <!-- This currently does not work
<module>restconf</module>
+ -->
<module>tl1</module>
</modules>
diff --git a/protocols/restconf/server/app/pom.xml b/protocols/restconf/server/app/pom.xml
index daac5be..8065731 100644
--- a/protocols/restconf/server/app/pom.xml
+++ b/protocols/restconf/server/app/pom.xml
@@ -36,25 +36,11 @@
<description>RESTCONF Service Module main Application</description>
<dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-restconf-server-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-restconf-server-restconfmanager</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-restconf-server-rpp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-restconf-server-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/providers/pom.xml b/providers/pom.xml
index 1f08838..d88e611 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -50,7 +50,9 @@
<module>lisp</module>
<module>ospf</module>
<module>link</module>
+ <!-- Currently does not build
<module>ietfte</module>
+ -->
<module>tl1</module>
</modules>
diff --git a/tools/build/onos-validate-change-version.excludes b/tools/build/onos-validate-change-version.excludes
index 3d4579a..d185a9a 100755
--- a/tools/build/onos-validate-change-version.excludes
+++ b/tools/build/onos-validate-change-version.excludes
@@ -29,8 +29,10 @@
\./apps/vrouter/pom.xml
\./protocols/ospf/
\./protocols/snmp/
+\./protocols/restconf
\./providers/snmp/
\./providers/bmv2/
+\./providers/ietfte/
\./drivers/bmv2/
\./apps/kafka-integration/
\./pom.xml.versionsBackup