Packaging: Remove classpath ordering hack #23596
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After the removal of the joda time hack we used to have, we can cleanup the codebase handling in security, jarhell and plugins to be more picky about uniqueness. This was originally in elastic#18959 which was never merged. closes elastic#18959
rjernst
added
:Delivery/Packaging
jasontedor
approved these changes
Mar 21, 2017
| @@ -114,7 +112,7 @@ public void testDirAndJar() throws Exception { | |||
| public void testWithinSingleJar() throws Exception { | |||
| // the java api for zip file does not allow creating duplicate entries (good!) so | |||
| // this bogus jar had to be constructed with ant | |||
There was a problem hiding this comment.
This comment is out of date; we produce these with https://github.com/jasontedor/duplicate-classes/ now (the previous mechanism for building the bogus jars produced invalid jars which blew up animal-sniffer).
| @@ -198,7 +203,7 @@ public static void checkJarHell(URL urls[]) throws URISyntaxException, IOExcepti | |||
| public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { | |||
| String entry = root.relativize(file).toString(); | |||
| if (entry.endsWith(".class")) { | |||
| // normalize with the os separator | |||
| // normalize with the os separator, remove '.class' | |||
| entry = entry.replace(sep, ".").substring(0, entry.length() - 6); | |||
There was a problem hiding this comment.
I wonder if replacing entry.length() - 6 with entry.length() - ".class".length() would be clearer?
|
@jasontedor I addressed your comments before merging. Thanks for the review. |
rjernst
added a commit
that referenced
this pull request
Mar 21, 2017
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Mar 22, 2017
* master: [API] change wait_for_completion defaults according to docs (elastic#23672) Share XContent rendering code in terms aggs (elastic#23680) Update ingest-node.asciidoc [DOCS] Update the docs about the fact that global ordinals for _parent field are loaded eagerly instead of lazily by default. Build: remove progress logger hack for gradle 2.13 (elastic#23679) Test: Add dump of integ test cluster logs on failure (elastic#23688) Plugins: Add plugin cli specific exit codes (elastic#23599) Plugins: Output better error message when existing plugin is incompatible (elastic#23562) Reindex: wait for cleanup before responding (elastic#23677) Packaging: Remove classpath ordering hack (elastic#23596) Docs: Add note about updating plugins requiring removal and reinstallation (elastic#23597) Build: Make plugin list for smoke tester dynamic (elastic#23601) [TEST] Propertly cleans up failing restore test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After the removal of the joda time hack we used to have, we can cleanup
the codebase handling in security, jarhell and plugins to be more picky
about uniqueness. This was originally in #18959 which was never merged.
closes #18959