Skip to content

Commit

Permalink
Bump cucumber version to get jar with correct unicode encoding (pants…
Browse files Browse the repository at this point in the history
…build#7134)

### Problem
Cucumber jar was not properly setting its encoding as utf-8 encoding, which caused `./pants3 classmap testprojects/src/java/org/pantsbuild/testproject/unicode/cucumber | grep 'cucumber.api.java.zh_cn'` to not properly render unicode filenames.

See pantsbuild#7123.

### Solution
Bump cucumber version. Newest jar is correct.
  • Loading branch information
OniOni authored and Eric-Arellano committed Jan 23, 2019
1 parent 5773ec0 commit c620d51
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jar_library(name='commons-lang',

jar_library(name='cucumber-java',
jars=[
jar(org='info.cukes', name='cucumber-java', rev='1.1.7'),
jar(org='info.cukes', name='cucumber-java', rev='1.2.5'),
])

jar_library(name='ivy',
Expand Down
1 change: 0 additions & 1 deletion build-support/known_py3_pex_failures.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
tests/python/pants_test/backend/jvm/tasks:classmap_integration
tests/python/pants_test/backend/jvm/tasks:jvm_platform_analysis_integration
tests/python/pants_test/backend/jvm/tasks:scala_repl_integration
tests/python/pants_test/backend/project_info/tasks:idea_plugin_integration
Expand Down
8 changes: 4 additions & 4 deletions testprojects/3rdparty/cucumber/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

jar_library(name='cuke-core',
jars=[
jar(org='info.cukes', name='cucumber-core', rev='1.2.4')
jar(org='info.cukes', name='cucumber-core', rev='1.2.5')
],
)

jar_library(name='cuke-guice',
jars=[
jar(org='info.cukes', name='cucumber-guice', rev='1.2.4'),
jar(org='info.cukes', name='cucumber-guice', rev='1.2.5'),
],
dependencies=[
# The cucumber-guice jar has a 'provided' scope dep on guice itself so we're forced to adjoin
Expand All @@ -20,13 +20,13 @@ jar_library(name='cuke-guice',

jar_library(name='cuke-java',
jars=[
jar(org='info.cukes', name='cucumber-java', rev='1.2.4')
jar(org='info.cukes', name='cucumber-java', rev='1.2.5')
],
)

jar_library(name='cuke-junit',
jars=[
jar(org='info.cukes', name='cucumber-junit', rev='1.2.4')
jar(org='info.cukes', name='cucumber-junit', rev='1.2.5')
],
)

Expand Down
2 changes: 1 addition & 1 deletion testprojects/3rdparty/managed/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

managed_jar_libraries(
artifacts=[
jar('info.cukes', 'cucumber-core', '1.2.4'),
jar('info.cukes', 'cucumber-core', '1.2.5'),
jar('org.eclipse.jetty', 'jetty-jsp', '9.2.9.v20150224'),
jar('jersey', 'jersey', '0.7-ea', classifier='sources'),
':args4j.args4j',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,8 @@ def test_classmap_intransitive(self):
self.assertNotIn(self.EXTERNAL_MAPPING, pants_run.stdout_data)

def test_classmap_unicode(self):
# N.B. Our classmap goal assumes that the JAR/Zip file has correctly marked itself as utf-8
# in order for us to properly render unicode, due to how Python 3's Zipfile decodes filenames.
# See https://github.com/pantsbuild/pants/issues/7123 for further information
pants_run = self.do_command('classmap', self.UNICODE_TEST_TARGET, success=True)
self.assertIn(self.UNICODE_MAPPING, pants_run.stdout_data)

0 comments on commit c620d51

Please sign in to comment.