diff --git a/moo-core/pom.xml b/moo-core/pom.xml
index 5b9be5a..46006b2 100644
--- a/moo-core/pom.xml
+++ b/moo-core/pom.xml
@@ -186,7 +186,8 @@
 		<url>http://github.com/geoffreywiseman/Moo</url>
 		<connection>scm:git:git@github.com:geoffreywiseman/Moo.git</connection>
 		<developerConnection>scm:git:git@github.com:geoffreywiseman/Moo.git</developerConnection>
-	</scm>
+	  <tag>v2.1</tag>
+  </scm>
 
 	<licenses>
 		<license>
@@ -233,7 +234,7 @@
 	<parent>
 		<groupId>com.codiform</groupId>
 		<artifactId>moo-parent</artifactId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.1.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/moo-core/src/main/java/com/codiform/moo/property/source/SourcePropertyFactory.java b/moo-core/src/main/java/com/codiform/moo/property/source/SourcePropertyFactory.java
index a1f58a3..e44ca09 100644
--- a/moo-core/src/main/java/com/codiform/moo/property/source/SourcePropertyFactory.java
+++ b/moo-core/src/main/java/com/codiform/moo/property/source/SourcePropertyFactory.java
@@ -18,7 +18,7 @@ public interface SourcePropertyFactory {
 
 	/**
 	 * Gets the source property corresponding to a prefixed expression, along the lines of
-	 * "<prefix>:<expression>"
+	 * "&lt;prefix&gt;:&lt;expression&gt;"
 	 * 
 	 * @param expressionPrefix
 	 *            the prefix of the expression
diff --git a/moo-core/src/main/java/com/codiform/moo/session/TranslationSource.java b/moo-core/src/main/java/com/codiform/moo/session/TranslationSource.java
index bede891..b0482e4 100644
--- a/moo-core/src/main/java/com/codiform/moo/session/TranslationSource.java
+++ b/moo-core/src/main/java/com/codiform/moo/session/TranslationSource.java
@@ -96,7 +96,7 @@ public interface TranslationSource {
 	 * Gets the translation target factory for a the specified factory type. This allows the translation
 	 * source to act as a cache for these factory classes.
 	 * 
-	 * @param factoryType
+	 * @param factoryType the type that implements TranslationTargetFactory to be used
 	 * @return the {@link TranslationTargetFactory} for the factory type
 	 */
 	TranslationTargetFactory getTranslationTargetFactory( Class<? extends TranslationTargetFactory> factoryType );
diff --git a/moo-core/src/test/java/com/codiform/moo/MooTest.java b/moo-core/src/test/java/com/codiform/moo/MooTest.java
index 3152e32..acca8f1 100644
--- a/moo-core/src/test/java/com/codiform/moo/MooTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/MooTest.java
@@ -11,7 +11,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.codiform.moo.configuration.Configuration;
 import com.codiform.moo.session.TranslationSession;
diff --git a/moo-core/src/test/java/com/codiform/moo/TranslationTargetFactoryTest.java b/moo-core/src/test/java/com/codiform/moo/TranslationTargetFactoryTest.java
index 531702a..1d3e273 100644
--- a/moo-core/src/test/java/com/codiform/moo/TranslationTargetFactoryTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/TranslationTargetFactoryTest.java
@@ -9,11 +9,11 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 
 /**
  * This isn't a test of the TranslationTargetFactory, which is an interface, but rather of the
diff --git a/moo-core/src/test/java/com/codiform/moo/session/TranslationSessionTest.java b/moo-core/src/test/java/com/codiform/moo/session/TranslationSessionTest.java
index 5e6ecf0..aaf59ff 100644
--- a/moo-core/src/test/java/com/codiform/moo/session/TranslationSessionTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/session/TranslationSessionTest.java
@@ -1,7 +1,7 @@
 package com.codiform.moo.session;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -9,7 +9,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.codiform.moo.domain.OrdinalDto;
 import com.codiform.moo.domain.TestFactory;
diff --git a/moo-core/src/test/java/com/codiform/moo/translator/ArrayTranslatorTest.java b/moo-core/src/test/java/com/codiform/moo/translator/ArrayTranslatorTest.java
index cdac46e..b379931 100644
--- a/moo-core/src/test/java/com/codiform/moo/translator/ArrayTranslatorTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/translator/ArrayTranslatorTest.java
@@ -8,7 +8,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.codiform.moo.configuration.Configuration;
 import com.codiform.moo.session.TranslationSource;
diff --git a/moo-core/src/test/java/com/codiform/moo/translator/CollectionTranslatorTest.java b/moo-core/src/test/java/com/codiform/moo/translator/CollectionTranslatorTest.java
index 316cc11..8bb880c 100644
--- a/moo-core/src/test/java/com/codiform/moo/translator/CollectionTranslatorTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/translator/CollectionTranslatorTest.java
@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.codiform.moo.configuration.Configuration;
 import com.codiform.moo.property.CollectionProperty;
diff --git a/moo-core/src/test/java/com/codiform/moo/translator/TranslatorTest.java b/moo-core/src/test/java/com/codiform/moo/translator/TranslatorTest.java
index c31248b..762b295 100644
--- a/moo-core/src/test/java/com/codiform/moo/translator/TranslatorTest.java
+++ b/moo-core/src/test/java/com/codiform/moo/translator/TranslatorTest.java
@@ -8,7 +8,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.codiform.moo.annotation.AccessMode;
 import com.codiform.moo.configuration.Configuration;
diff --git a/moo-mvel/pom.xml b/moo-mvel/pom.xml
index 016cd02..c64f60a 100644
--- a/moo-mvel/pom.xml
+++ b/moo-mvel/pom.xml
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>com.codiform</groupId>
 			<artifactId>moo-core</artifactId>
-			<version>2.1-SNAPSHOT</version>
+			<version>2.1.0</version>
 		</dependency>
 	</dependencies>
 
@@ -198,7 +198,8 @@
 		<url>http://github.com/geoffreywiseman/Moo</url>
 		<connection>scm:git:git@github.com:geoffreywiseman/Moo.git</connection>
 		<developerConnection>scm:git:git@github.com:geoffreywiseman/Moo.git</developerConnection>
-	</scm>
+	  <tag>v2.1</tag>
+  </scm>
 
 	<licenses>
 		<license>
@@ -245,7 +246,7 @@
 	<parent>
 		<groupId>com.codiform</groupId>
 		<artifactId>moo-parent</artifactId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.1.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/moo-mvel/src/test/java/com/codiform/moo/MissingSourcePropertyTest.java b/moo-mvel/src/test/java/com/codiform/moo/MissingSourcePropertyTest.java
index be8da73..4232d11 100644
--- a/moo-mvel/src/test/java/com/codiform/moo/MissingSourcePropertyTest.java
+++ b/moo-mvel/src/test/java/com/codiform/moo/MissingSourcePropertyTest.java
@@ -24,7 +24,7 @@
  * 
  * There are tests in here to deal with source field required/optional in Moo
  * configuration, but the impact of the {@link Ignore} annotation can be seen in
- * {@link IgnoreAnnotationTest}
+ * IgnoreAnnotationTest.
  */
 public class MissingSourcePropertyTest {
 
diff --git a/pom.xml b/pom.xml
index bd040ba..46788b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>com.codiform</groupId>
 	<artifactId>moo-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>2.1-SNAPSHOT</version>
+	<version>2.1.0</version>
 	<name>Moo Parent</name>
 	<description>Mapping Objects to Objects</description>
 	<url>http://geoffreywiseman.github.com/Moo</url>
@@ -38,6 +38,17 @@
 		</pluginManagement>
 	</build>
 
+	<distributionManagement>
+		<snapshotRepository>
+			<id>sonatype-ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>sonatype-ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+
 	<developers>
 		<developer>
 			<name>Geoffrey Wiseman</name>
@@ -60,6 +71,7 @@
 		<url>http://github.com/geoffreywiseman/Moo</url>
 		<connection>scm:git:git@github.com:geoffreywiseman/Moo.git</connection>
 		<developerConnection>scm:git:git@github.com:geoffreywiseman/Moo.git</developerConnection>
+		<tag>v2.1</tag>
 	</scm>
 
 	<licenses>
@@ -74,36 +86,6 @@
 		</license>
 	</licenses>
 
-	<profiles>
-		<profile>
-			<id>release-sign-artifacts</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -134,9 +116,66 @@
 		</dependencies>
 	</dependencyManagement>
 
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-	</parent>
+	<profiles>
+		<profile>
+			<id>release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.8</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>sonatype-ossrh</serverId>
+							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+
 </project>