Merge "Add --exclude option to exclude libs when generating Eclipse project"
diff --git a/buckversion b/buckversion
index f5fe016..128a75f 100644
--- a/buckversion
+++ b/buckversion
@@ -1 +1 @@
-e64a2e2ada022f81e42be750b774024469551398
+6a19cf921c107ea0f1751e4f84c639e5050e2da7
diff --git a/gerrit_plugin.bucklet b/gerrit_plugin.bucklet
index 922bd77..c8be95d 100644
--- a/gerrit_plugin.bucklet
+++ b/gerrit_plugin.bucklet
@@ -138,7 +138,7 @@
':%s__gwt_application' % name +
';cd $TMP' +
';zip -qr $OUT .',
- out = '%s-static.zip' % name,
+ out = '%s-static.jar' % name,
)
gwt_binary(
name = name + '__gwt_application',
diff --git a/tools/buck_to_junit.py b/tools/buck_to_junit.py
index f40a4ff..026c015 100755
--- a/tools/buck_to_junit.py
+++ b/tools/buck_to_junit.py
@@ -28,13 +28,14 @@
try:
try:
check_call(
- ['curl', '--proxy-anyauth', '-sfo', path.join(temp_dir, 'saxon.jar'),
- 'http://central.maven.org/maven2/net/sf/saxon/Saxon-HE/9.6.0-6/Saxon-HE-9.6.0-6.jar'])
+ ['mvn', 'org.apache.maven.plugins:maven-dependency-plugin:copy',
+ '-Dmdep.stripVersion=true', '-Dartifact=net.sf.saxon:Saxon-HE:9.6.0-6',
+ '-DoutputDirectory=' + temp_dir])
except OSError as err:
- print('could not invoke curl: %s\nis curl installed?' % err)
+ print('could not invoke mvn: %s\nis mvn installed?' % err)
exit(1)
except CalledProcessError as err:
- print('error using curl: %s' % err)
+ print('error using mvn: %s' % err)
exit(1)
buck_report = abspath(args.t)
@@ -44,7 +45,7 @@
chdir(args.o)
try:
check_call(
- ['java', '-jar', path.join(temp_dir, 'saxon.jar'), '-s:' + buck_report,
+ ['java', '-jar', path.join(temp_dir, 'Saxon-HE.jar'), '-s:' + buck_report,
'-xsl:' + buck_to_junit_xsl])
except CalledProcessError as err:
print('error converting to junit: %s' % err)
