commit 5c8fa433a174faf1b463de9af8550e1ca714716c
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Jan 26 18:56:40 2018 -0800
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Wed Jan 31 18:24:57 2018 +0000
tree 175d429397225b7eea8514d56cdfac9d8e416bc1
parent 28788fed3db121a62cd8c49287158cbc446e5c9d

Reorganizing pom.xml

- consolidate versions
- enable error-prone
- fix issue detected by error-prone

Change-Id: Ie2f5d53b7357ec43dd00e56097f7163ca1a63094

compiler/base/datamodel/pom.xml

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>

compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java

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);
         }

compiler/base/pom.xml

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>

compiler/base/tool/pom.xml

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>