Merge branch 'master' into develop

pom.xml

@@ -136,6 +136,13 @@
 
     <build>
         <plugins>
+          <!-- Workaround for AMPS-1112 -->
+          <plugin>
+            <groupId>com.atlassian.maven.plugins</groupId>
+            <artifactId>maven-amps-plugin</artifactId>
+            <version>${amps.version}</version>
+            <extensions>true</extensions>
+          </plugin>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
                 <artifactId>maven-stash-plugin</artifactId>

src/main/java/com/englishtown/stash/hook/MirrorRepositoryHook.java

@@ -128,6 +128,7 @@ public class MirrorRepositoryHook implements AsyncPostReceiveRepositoryHook, Rep
                                 .command("push")
                                 .argument("--prune") // this deletes locally deleted branches
                                 .argument(authenticatedUrl)
+                                .argument("--force") // Canonical repository should always take precedence over mirror
                                 .argument("+refs/heads/*:refs/heads/*") // Only mirror heads
                                 .argument("+refs/tags/*:refs/tags/*") // and tags
                                 .errorHandler(passwordHandler)