Skip to content

Commit

Permalink
jmh normalizes jar timestamps (#396)
Browse files Browse the repository at this point in the history
* jmh normalizes jar timestamps
build_is_identical e2e test spits out differences in md5

* change jar creator to default to normalizing timestamps
  • Loading branch information
ittaiz authored Jan 18, 2018
1 parent 0b41f54 commit 375b34a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/java/io/bazel/rulesscala/jar/JarCreator.java
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ public static void buildJar(String[] args) throws IOException {
}
}
createJar.setCompression(true);
createJar.setNormalize(true);
createJar.execute();
}

Expand Down
2 changes: 1 addition & 1 deletion src/java/io/bazel/rulesscala/jar/JarHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class JarHelper {
protected final String jarFile;

// The properties to describe how to create the Jar
protected boolean normalize;
protected boolean normalize = true;
protected int storageMethod = JarEntry.DEFLATED;
protected boolean verbose = false;

Expand Down
2 changes: 1 addition & 1 deletion test_rules_scala.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ echo "$_md5_util"
}

non_deploy_jar_md5_sum() {
find bazel-bin/test -name "*.jar" ! -name "*_deploy.jar" | $(md5_util)
find bazel-bin/test -name "*.jar" ! -name "*_deploy.jar" | xargs -n 1 -P 5 $(md5_util) | sort
}

test_build_is_identical() {
Expand Down

0 comments on commit 375b34a

Please sign in to comment.