commit 5fe1eae7906aba678fee1eadb2c1bc94b06f97fc
author Thomas Vachuska <tom@opennetworking.org> Sat Aug 05 07:40:24 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Sat Aug 05 07:40:24 2017 -0700
tree 848352de355501c02efc2fed0d4b98a81d00efbd
parent 196a541075fdeb4f448e6de116b2839d0b8ff42d

Fixing utils to ignore any wrapping bundle annotations from jar coordinates.

Change-Id: I90d1d7f2c0878d94f75fd5ac0be6cd4ed29da132

runtime/src/main/java/org/onosproject/yang/runtime/helperutils/YangApacheUtils.java

diff --git a/runtime/src/main/java/org/onosproject/yang/runtime/helperutils/YangApacheUtils.java b/runtime/src/main/java/org/onosproject/yang/runtime/helperutils/YangApacheUtils.java
index e097a74..edefc76 100644
--- a/runtime/src/main/java/org/onosproject/yang/runtime/helperutils/YangApacheUtils.java
+++ b/runtime/src/main/java/org/onosproject/yang/runtime/helperutils/YangApacheUtils.java
@@ -100,7 +100,9 @@
         builder.append(currentDirectory).append(SYSTEM);
         StringBuilder ver = new StringBuilder();
         if (mvnLocationPath.contains(MAVEN)) {
-            String[] strArray = mvnLocationPath.split(MAVEN);
+            String[] strArray = mvnLocationPath
+                    .replaceFirst("\\$Bundle-.*$", "")
+                    .split(MAVEN);
             if (strArray[1].contains(File.separator)) {
                 String[] split = strArray[1].split(File.separator);
                 if (split[0].contains(PERIOD)) {