Skip to content

Comments

Integrate spock module with mono-repo#592

Merged
kiview merged 3 commits intomasterfrom
spock
Feb 27, 2018
Merged

Integrate spock module with mono-repo#592
kiview merged 3 commits intomasterfrom
spock

Conversation

@kiview
Copy link
Member

@kiview kiview commented Feb 25, 2018

I've moved the whole repo with minmal modifcations (changed the package name, which is of course a breaking change now).

I wonder what to do with the license, since the old repo was licensed under Apache 2.0. Really not sure if I could simply omit it here, we have to re-license or dual license with MIT. So for now I just left the old Apache 2.0 license.

Also I've kept the README file and will change general docs in another change.

@kiview kiview requested review from bsideup and rnorth February 25, 2018 15:12
@@ -0,0 +1,17 @@
plugins {
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the new plugins DSL, we can of course use also the old one to keep styles more in sync?

Copy link
Member

Choose a reason for hiding this comment

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

we use the new style as much as possible, I would keep it :)

@rnorth
Copy link
Member

rnorth commented Feb 25, 2018

This looks fine to me overall 😄

Regarding the licence, I'm not sure what the best thing to do is. It seems that Apache 2.0 is less permissive than MIT. 'Including' the Apache 2.0 testcontainers-spock inside an MIT-licenced project might be a bit messy (but IANAL)...

It might be easier if you could perhaps relicence it as MIT. Relicencing the testcontainers-java project overall to Apache might be a thing we should think about in the long term, but it would be a lot of work as there are a lot more contributors to get approval from 😢 .

@kiview
Copy link
Member Author

kiview commented Feb 25, 2018

@rnorth I have really no problem with relicensing it, but how does it work with an Apache licensed project? Can I simply remove the Apache license and then it's implicitly under the MIT license from TC?

@kiview
Copy link
Member Author

kiview commented Feb 25, 2018

I'm still poking around in the Travis config (see Slack).

@kiview
Copy link
Member Author

kiview commented Feb 26, 2018

@bsideup Builds are working now after cleaning the Travis cache manually. Do you think we should keep the changes to the travis config? It's now the configuration that's recommended on the Travis website.

@kiview kiview merged commit b3d290a into master Feb 27, 2018
@kiview kiview deleted the spock branch February 27, 2018 16:54
@bsideup bsideup added this to the next milestone Apr 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants