Skip to content

IVY-1526 Use parent pom's license (if any) if the child pom doesn't e…#14

Merged
eed3si9n merged 2 commits into2.3.x-sbtfrom
wip/2.3-license-backport
Jul 27, 2015
Merged

IVY-1526 Use parent pom's license (if any) if the child pom doesn't e…#14
eed3si9n merged 2 commits into2.3.x-sbtfrom
wip/2.3-license-backport

Conversation

@jsuereth
Copy link
Member

…xplicitly have licenses of its own

A backport of license fixes for sbt's Ivy 2.3.

Notes:

  • This fix will apply to newly resolved pom.xml files in Ivy. It will allow the parent pom license to fill in the artifact's license if the artifact does not specify one.
  • This fix will NOT fix existing cached module descriptors. You will need to clean ~/.ivy2/cache of all "bad" descriptors for this fix to apply.

Related to sbt/sbt#2118

Review by @eed3si9n cc @benmccann

…xplicitly have licenses of its own

Conflicts:
	test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@lightbend-cla-validator

Hi @jaikiran,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Typesafe Contributors License Agreement:

http://www.typesafe.com/contribute/cla

@jsuereth
Copy link
Member Author

@jaikiran Ignore the typesafehub validator. Thanks for the fix to apache Ivy, we may be pulling that in ourselves quickly. See my notes for some caveats to the fix, and thanks for the hard work!

@jsuereth jsuereth added the bug label Jul 27, 2015
@eed3si9n
Copy link
Member

LGTM

@eed3si9n
Copy link
Member

The build history on Travis looks pretty bloody - https://travis-ci.org/sbt/ivy/builds
Maybe we should remove some of the flaky tests?

@jsuereth
Copy link
Member Author

@eed3si9n If you let me know which one is flaky, sure. I know locally, the tests try to hit a domain that doesn't exist and my ISP is providing its own 404 pages with advertisements, whereas the test expects an actually 404. Perhaps this is one you should run locally too to verify my work.

@benmccann
Copy link

I wasn't sure if we wanted to wait for the upstream fix (apache/ant-ivy#7) to be merged, but otherwise looks good

@jsuereth
Copy link
Member Author

@eed3si9n I disabled the flaky test suites. Not sure in junit how to disable just the flaky test without removing it completely. Not sure we really want to disable Ibiblio tests generally, just teh one that tries to hit an invalid URL/domain name.

@jsuereth
Copy link
Member Author

@benmccann we're already running with patches above/beyond that in mainstream, so I'm ok merging this as is. I did a review of the code and it looks fine.

@eed3si9n
Copy link
Member

Any tests that have failed or errored frequently are candidates for disabling, so we can actually catch regressions.

https://travis-ci.org/sbt/ivy/builds/35535652:

    [junit] Running org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest
    [junit] Tests run: 3, Failures: 0, Errors: 1, Time elapsed: 15,923 sec
    [junit] Test org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest FAILED

@jsuereth
Copy link
Member Author

Ok, build is now working.

eed3si9n added a commit that referenced this pull request Jul 27, 2015
IVY-1526 Use parent pom's license (if any) if the child pom doesn't e…
@eed3si9n eed3si9n merged commit c525921 into 2.3.x-sbt Jul 27, 2015
@eed3si9n eed3si9n deleted the wip/2.3-license-backport branch July 27, 2015 19:57
@eed3si9n
Copy link
Member

Merged!

@benmccann
Copy link

awesome. thanks guys!

@jaikiran
Copy link

Thank you very much @jsuereth, for merging this.

I'll wait on the ivy dev team to merge it to ivy upstream too.

@benmccann
Copy link

Is this change in sbt 0.13.9? I just tried it and it doesn't seem like it's working yet

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants