Skip to content

Conversation

@skliper
Copy link
Contributor

@skliper skliper commented Dec 18, 2019

Describe the contribution
Fix #433

  • Updated README
  • removed custom license document
  • added standard Apache 2.0
  • Updated copyright release version cFE 6.6 -> 6.7

Testing performed

  1. Standard build, unit test and execute

Expected behavior changes

  • No impact to behavior

System(s) tested on:

  • Hardware: cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: cFE 6.7.0 related versions and OSAL 5.0.0

Contributor Info
Jacob Hageman - NASA/GSFC

@skliper skliper added this to the 6.7.0 milestone Dec 18, 2019
@skliper skliper requested a review from jphickey December 18, 2019 21:27
@skliper skliper changed the title Rc 6.7.0 Fix #12, Release Prep Dec 18, 2019
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

Confirmed successful build, unit test of CFE. Approved pending the one comment about the license file.

same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be filled in?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, I just used GitHub's default hoping it would get recognized and labeled appropriately. I'll test and fill in (trying out in app repos first).

Copy link
Contributor

Choose a reason for hiding this comment

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

Upon second look at that license that whole lower part is just informational instructions on what to put into source files. Perhaps that whole "appendix" part needs to be removed if GSFC requires something more specific in the source files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Another good point. Given that I'd like to leave the LICENSE file as is (any changes can raise concern that it's a modified version of the license). I do get specific text that I need to put in the source files, which I think meets the intent of the LICENSE.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK - I concur on leaving LICENSE file exactly as-is.

But then - concern is whether having a different boilerplate comment atop each of the source files is still compliant with the LICENSE - that is, whether the standard apache 2.0 license actually requires to put that exact boilerplate on every source file or if it is just a recommendation. The wording sounded very specific to me, but it is in an informational appendix not part of the license itself. And I am not a lawyer...

@skliper skliper changed the title Fix #12, Release Prep Fix #433, Release Prep Dec 19, 2019
@skliper skliper merged commit 7982de0 into master Dec 19, 2019
skliper pushed a commit that referenced this pull request Dec 19, 2019
Fix #433, Release Prep
Document and copyright header changes only
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.

Release Prep

3 participants