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

jarek/6938: spark dependency conflict #7076

Merged
merged 3 commits into from
Apr 10, 2018

Conversation

jaroslawmalekcodete
Copy link
Contributor

No description provided.

@scottdraves
Copy link
Contributor

scottdraves commented Mar 29, 2018

For the classes that are copied from guava, we have to maintain their copyright, and point out that we have modified them. So the banner should look like:


/*
 * Copyright (C) 2012 The Guava Authors
 * Modifications copyright (C) 2018 TWO SIGMA OPEN SOURCE, LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

and then in our README, add to the Attribution section:

[Guava](https://github.com/google/guava)  Copyright (C) 2012 The Guava Authors

# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/mimetype/MIMEContainer.java
@scottdraves scottdraves merged commit 439b408 into master Apr 10, 2018
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