Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy dependencies required for painless before resource processing #399

Merged
merged 1 commit into from
Apr 10, 2019

Conversation

simonpoole
Copy link
Contributor

This removes the jar files required for the painless plugin from the
repo and copies them before resources are processed.

This doesn't fix the ugliness in Server.java when coping the jars,
to make that at least a bit better and nearly only dependent on
configuration we strip the version when copying.

Further it converts indenting in pom.xml to spaces just as the rest of
the code.

@simonpoole simonpoole changed the title Copy dependencies required for painless at package time Copy dependencies required for painless before resource processing Apr 7, 2019
This removes the jar files required for the painless plugin from the
repo and copies them before resources are processed.

This doesn't fix the ugliness in Server.java when coping the jars,
to make that at least a bit better and nearly only dependent on
configuration we strip the version when copying.

Further it converts indenting in pom.xml to spaces just as the rest of
the code.
<resources>
<resource>
<directory>${project.build.directory}/es/</directory>
</resource>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those three lines were added and look unrelated. Or rather, if anything, they look like they should be replacing the three lines below

Copy link
Contributor Author

@simonpoole simonpoole Apr 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No that's correct, that is the temp directory the jars are copied in to (see line 229 for example) which then in turn is used by the resources plugin as the source for creating the jars and classes directories.

@lonvia
Copy link
Collaborator

lonvia commented Apr 8, 2019

Looks in general sensible to me but my knowledge of Java dependency management is limited. @karussell do you know of any reason why we should keep those three packages around as jars in the git repo?

@simonpoole
Copy link
Contributor Author

simonpoole commented Apr 8, 2019

@lonvia maybe I should have pointed this out: the jar files in question are a runtime dependency and are used for an ES plugin that provides some scripting support. maven (even though I hate it) handles compile time dependencies just fine, but this was a tiny bit tricky. So it isn't -really- java related at all, they are simply files that are copied out of the jar in to the ES directory.

Copy link
Collaborator

@lonvia lonvia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanations, makes all sense and works fine for me.

@lonvia lonvia merged commit 971adf1 into komoot:master Apr 10, 2019
@lonvia lonvia mentioned this pull request Jul 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants