Merge branch 'master' of https://github.intel.com/abrown/jndn-mock
Conflicts:
pom.xml
diff --git a/pom.xml b/pom.xml
index aa153fc..1ac549e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,11 @@
<version>0.9.1</version>
<packaging>jar</packaging>
<description>Tools for testing NDN Java code without using network IO</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
<dependencies>
<dependency>
<groupId>net.named_data.jndn</groupId>
@@ -30,11 +35,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
<repositories>
<repository>
<id>ubit-artifactory-or.intel.com</id>