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.

Sign up for GitHub

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

Jump to bottom

CHEF-2627 Clarify License Description on Rubygems #6630

Merged
merged 9 commits into from
Oct 11, 2023
Merged

CHEF-2627 Clarify License Description on Rubygems #6630

merged 9 commits into from
Oct 11, 2023

Conversation

clintoncwolfe
Copy link
Contributor

Description

Modifies the gemspecs that comprise InSpec to:

  • alter the name of the license displayed on rubygems.org to be Chef-EULA
  • Append clarifying legal text to the description of the gem on rubygems.org
  • Update the README clarifying the relationship between the Chef EULA and the Apache-2.0 License

Related Issue

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New content (non-breaking change)
  • Breaking change (a content change which would break existing functionality or processes)

Checklist:

  • I have read the CONTRIBUTING document.

@clintoncwolfe clintoncwolfe requested review from a team as code owners August 30, 2023 19:10
@netlify
Copy link

netlify bot commented Aug 30, 2023 •
edited

✅ Deploy Preview for chef-inspec canceled.

Name Link
🔨 Latest commit 78245ce
🔍 Latest deploy log https://app.netlify.com/sites/chef-inspec/deploys/64ffb1175cfc1b00071a1c13

@clintoncwolfe
Add a pair of files describing the relationship between the Chef EULA…
b582b4f 
… and the Apache 2.0 license, intended to be referenced from rubygems.org

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Add message to rubygems.org description of all 4 gems describing rela…
5793a84 
…tionship between the two licenses

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Insert the full text of the Apache 2.0 license into the gem descripti…
4d02573 
…on on the advice of Legal

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Update README with message clarifying relationship between the two li…
5c6c377 
…censes

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Removes the full text of the Apache 2 license, which after clarificat…
c36a088 
…ion is not

in fact required to be in the rubygems description.

This reverts commit 4d02573.
@clintoncwolfe
LINTING - adjust text markers
56fb02b 
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
LINTING - training whitespace
ff9f132 
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Remove the word 'below' when refering to the inclusion of the Apache …
7353436 
…2.0 license

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
@clintoncwolfe
Add Chef-EULA to list of included files to inspec-core
78245ce 
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
GeorgeWestwater
GeorgeWestwater approved these changes Sep 18, 2023
View reviewed changes
Copy link

@GeorgeWestwater GeorgeWestwater left a comment

Choose a reason for hiding this comment

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

Changes look good

@clintoncwolfe clintoncwolfe merged commit 968f3b2 into main Oct 11, 2023
5 of 7 checks passed
@clintoncwolfe clintoncwolfe deleted the cw/clarify-license-on-rubygems branch October 11, 2023 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GeorgeWestwater GeorgeWestwater GeorgeWestwater approved these changes

@sathish-progress sathish-progress Awaiting requested review from sathish-progress sathish-progress is a code owner automatically assigned from inspec/inspec-core-team

@ahasunos ahasunos Awaiting requested review from ahasunos ahasunos is a code owner automatically assigned from inspec/inspec-core-team

Assignees

@clintoncwolfe clintoncwolfe

Labels
inspec-6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@clintoncwolfe @GeorgeWestwater @ahasunos