GitHub user mmiklavc opened a pull request:
https://github.com/apache/metron/pull/1230
METRON-1812: Fix dependencies_with_url.csv
## Contributor Comments
The war of https://issues.apache.org/jira/browse/METRON-1812
The dependencies_with_url.csv is used for our license check. There's not
really any formal validation check on the file itself as it's just a csv that
gets turned into a Set for purpose of crosschecking our project licenses. This
PR simply removes some bad merge conflict lines and fixes some formatting. This
change is validated by Travis passing, thus proving no regression has been
added in by my changes.
## Pull Request Checklist
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? If not one needs to
be created at [Metron
Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
- [x] Does your PR title start with METRON-XXXX where XXXX is the JIRA
number you are trying to resolve? Pay particular attention to the hyphen "-"
character.
- [x] Has your PR been rebased against the latest commit within the target
branch (typically master)?
### For code changes:
- [x] Have you included steps to reproduce the behavior or problem that is
being changed or addressed?
- [x] Have you included steps or a guide to how the change may be verified
and tested manually?
- [x] Have you ensured that the full suite of tests and checks have been
executed in the root metron folder via:
```
mvn -q clean integration-test install &&
dev-utilities/build-utils/verify_licenses.sh
```
- N/A Have you written or updated unit tests and or integration tests to
verify your changes?
- N/A If adding new dependencies to the code, are these dependencies
licensed in a way that is compatible for inclusion under [ASF
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- N/A Have you verified the basic functionality of the build by building
and running locally with Vagrant full-dev environment or the equivalent?
### For documentation related changes:
- N/A Have you ensured that format looks appropriate for the output in
which it is rendered by building and verifying the site-book? If not then run
the following commands and the verify changes via
`site-book/target/site/index.html`:
```
cd site-book
mvn site
```
#### Note:
Please ensure that once the PR is submitted, you check travis-ci for build
issues and submit an update to your PR as soon as possible.
It is also recommended that [travis-ci](https://travis-ci.org) is set up
for your personal repository such that your branches are built there before
submitting a pull request.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/mmiklavc/metron fix-dependencies-with-url
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1230.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1230
----
commit 4d7629ec25e5a15d50a9d8bf974f8c29d206b533
Author: Michael Miklavcic <michael.miklavcic@...>
Date: 2018-10-08T18:42:54Z
Fix deps with url file - merge conflict snuck into the file
----
---
