Merge branch 'master' of https://github.intel.com/abrown/jndn-mock
Conflicts:
pom.xml
diff --git a/pom.xml b/pom.xml
index 7bc4463..1ac549e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,13 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>ubit-artifactory-or.intel.com</id>
+ <name>IT Artifactory (libs)</name>
+ <url>https://ubit-artifactory-or.intel.com/artifactory/libs-release-local</url>
+ </repository>
+ </repositories>
<distributionManagement>
<repository>
<id>ubit-artifactory-or.intel.com</id>