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

POM dependency cleanup #338

Merged
merged 12 commits into from
Jul 11, 2017
Merged

Conversation

mpaluchowski
Copy link
Contributor

Following up on a similar pull request cfparser/cfparser#78.

Cleaning the POM of obsolete statements, correcting scopes, moving some versions to <properties> to make it easier to keep those in line.

Importantly aligning a number of dependencies with the versions used by cfparser/cfparser:

  • org.antlr:antlr4 replaced with 4.7 and removed explicit stringtemplate and antlr4-runtime dependencies, since these come with the first package
  • updated commons-logging to 1.2 and javolution to 5.5.1, which is what cfparser/cfparser is using, thus removing ugly maven-shade-plugin warnings (and hopefully the potential of bugs due to dependency mismatch)

This must be merged after cfparser/cfparser#78 and with a new version of cfparser/cfparser included. Otherwise the antlr4 changes will be breaking.

Michal Paluchowski added 11 commits July 4, 2017 08:18

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
JAR is the default type of dependency, so doesn't need to be specified
explicitly.
jUnit is (normally) only used in test phase. Keeping it in the (default)
scope of 'compile' will add the dependency to the final package, which
is unnecessary.
This is the usual case, where 'test' dependencies are placed at the end
of the <dependencies> section.
Ant moved to a different groupId. Updating accordingly.
If we're only invoking maven-compile-plugin to set the target Java
version, we might as well do that with the shorter <properties> section.
Since we have a number of dependnencies referencing the same version,
it'll be easier to keep them in sync if they're defined in one place.
Since that's the default scope we don't need to specify it explicitly.
- Removing antlr4-runtime and stringtemplate because they're both included
in the antlr4 dependencies.
- Bumping antlr4 version to 4.7 to match what the cfparser currently
uses.
Setting the same version of javolution as the one coming with cfparser.
Removes the build warnings from the maven-shade-plugin and ensures the
code is running with the same dependency it was compiled.
Bump the version to 1.2, which is what cfparser is using, and replace
with the `commons-logging`, without the `-api` suffix, which seems to
have been dropped some 10 years ago.

This gets rid of the last warnings from maven-shade-plugin.
@TheRealAgentK
Copy link
Collaborator

Thx @mpaluchowski - looks good to me from glancing over it. As soon as @ryaneberly has merged cfparser/cfparser#78 I'll be happy to merge this into dev.

Aligns versions of some dependencies, most notably ANTLR.
@mpaluchowski
Copy link
Contributor Author

@TheRealAgentK I just updated the cfparser to 2.4.8, so this pull request can be merged now.

@TheRealAgentK TheRealAgentK merged commit ff98c9e into cflint:dev Jul 11, 2017
@mpaluchowski mpaluchowski deleted the pom-dependency-cleanup branch July 11, 2017 10:46
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.

None yet

2 participants