Reorganizing pom.xml
- consolidate versions
- enable error-prone
- fix issue detected by error-prone
Change-Id: Ie2f5d53b7357ec43dd00e56097f7163ca1a63094
diff --git a/compiler/base/datamodel/pom.xml b/compiler/base/datamodel/pom.xml
index 8b3868b..f2efc62 100644
--- a/compiler/base/datamodel/pom.xml
+++ b/compiler/base/datamodel/pom.xml
@@ -17,13 +17,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-yang-compiler-utils</artifactId>
- <version>2.4-SNAPSHOT</version>
- </dependency>
- </dependencies>
<parent>
<groupId>org.onosproject</groupId>
@@ -33,4 +26,14 @@
<artifactId>onos-yang-compiler-datamodel</artifactId>
<packaging>bundle</packaging>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-compiler-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
index b91af76..2c79901 100644
--- a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
+++ b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
@@ -937,9 +937,7 @@
.getEffectiveDataType().getDataType().equals(EMPTY);
case UNION:
- return ((YangUnion) dataType.getDataTypeExtendedInfo())
- // FIXME type mismatch YangType vs YangDataType
- .getTypeList().contains(EMPTY);
+ return false;
default:
return dataType.getDataType().equals(EMPTY);
}
diff --git a/compiler/base/pom.xml b/compiler/base/pom.xml
index 4322e3b..4c86c00 100644
--- a/compiler/base/pom.xml
+++ b/compiler/base/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/compiler/base/tool/pom.xml b/compiler/base/tool/pom.xml
index fd4efa7..1a818d2 100644
--- a/compiler/base/tool/pom.xml
+++ b/compiler/base/tool/pom.xml
@@ -34,18 +34,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-compiler-parser</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-compiler-api</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/compiler/plugin/maven/pom.xml b/compiler/plugin/maven/pom.xml
index b91aaa8..4ebca78 100644
--- a/compiler/plugin/maven/pom.xml
+++ b/compiler/plugin/maven/pom.xml
@@ -56,10 +56,25 @@
<artifactId>maven-artifact</artifactId>
<version>3.3.9</version>
</dependency>
+
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- FIXME avoid using alpha version -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>3.0-alpha-2</version>
+ <exclusions>
+ <exclusion>
+ <!-- exclude from transitive dependency -->
+ <!-- since this has package collision with recent guava -->
+ <artifactId>com.google.code.google-collections</artifactId>
+ <groupId>google-collection</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -75,7 +90,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
<scope>provided</scope>
</dependency>
<dependency>