diff --git a/.gitignore b/.gitignore
index e88c60894..d37f397b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ autogenerated/
 **/*.iml
 nomulus.ipr
 nomulus.iws
+**/classpath.index
 
 # Auto-generated java classes by Intellij
 */src/main/generated/
diff --git a/java_common.gradle b/java_common.gradle
index 3dfbbcb4a..70c77559c 100644
--- a/java_common.gradle
+++ b/java_common.gradle
@@ -193,3 +193,10 @@ jacocoTestCoverageVerification {
     }
   }
 }
+
+project.tasks.withType(Copy) {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+project.tasks.withType(Jar) {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}