Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Acknowledge Apereo Welcoming Policy. #649

Merged
merged 6 commits into from
Jun 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

In short:

+ Be kind
+ All Contributors must appear in the public [Apereo CLA roster][].
+ Use [Google code style][].

## Code of conduct

The [Apereo Welcoming Policy][] [applies][code of conduct].

## Contributor License Agreements

As an [incubating, aspiring Apereo product][AngularJS-portal website on incubating], `AngularjS-portal` requires contributors and contributions to comply with [Apereo inbound intellectual property licensing practices][].
Expand Down Expand Up @@ -48,3 +53,5 @@ npm run lint-less
[Apereo CLA roster]: http://licensing.apereo.org/completed-clas

[Google code style]: https://google.github.io/styleguide/
[Apereo Welcoming Policy]: https://www.apereo.org/content/apereo-welcoming-policy
[code of conduct]: ../CODE_OF_CONDUCT.md
10 changes: 10 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Code of conduct

This is an Apereo uPortal ecosystem project.

It inherits the [Code of Conduct considerations of the uPortal project][uPortal Code of Conduct], which in turn participates in the [Apereo Welcoming Policy][].

Be kind. Also be brave. But if you cannot be brave, at least be kind.
Copy link
Contributor

Choose a reason for hiding this comment

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

❤️


[uPortal Code of Conduct]: https://github.com/Jasig/uPortal/blob/master/CODE_OF_CONDUCT.md
[Apereo Welcoming Policy]: https://www.apereo.org/content/apereo-welcoming-policy
26 changes: 11 additions & 15 deletions docs/apereo-incubation.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,23 @@ Next actions:

> What activities/events/artifacts are created/managed by the project to foster participation and development? How are decisions made?

Next actions:

+ Formalize recognition of committership
+ Pre-conference seminar and presentations at Open Apereo 2017.
+ [Committers][] are documented, with Apache-style governance by the Committers, process for adding Committers, and governance fail-safes.
+ [Contributors][] are gratefully acknowledged.
+ Pre-conference seminar and presentations about this project delivered at Open Apereo 2015, 2016, and 2017.
+ Incubation status calls are held as open conference calls.

### 4.3 Governance

No formal governance is documented.

Next actions:

+ Formalize recognition of committership
+ Formalize relationship of committership with uPortal-steering
+ [Committers][] are documented, with Apache-style governance by the Committers, process for adding Committers, and governance fail-safe falling back on uPortal steering.

### 4.4 Voting practices

No formal voting practices are documented.

Next actions:

+ Formalize adoption of Apache rules
+ [Adopted Apache-style rules][Committers]

### 4.5 Conflict resolution policy

+ Inherits code of conduct considerations from uPortal which participates in the [Apereo Welcoming Policy][].

No formal conflict resolution policy is in place.

Next actions:
Expand Down Expand Up @@ -205,3 +198,6 @@ Next actions:
[2017-07-12 incubation status call]: https://docs.google.com/document/d/1LGBcsL-hg6a6kWktE4HgThjpF7idc_AwFcV4op6NLy8/edit?usp=sharing
[exit criteria]: https://www.apereo.org/content/apereo-incubation-process#S4
[Open Apereo 2017 seminar slides re incubation]: https://docs.google.com/a/wisc.edu/presentation/d/1C-xRJoXWJKObfhmGV-7KYoZmiT5EyKHcQ36JVF6sGxk/edit?usp=sharing.
[Committers]: https://github.com/UW-Madison-DoIT/angularjs-portal/blob/master/committers.md
[Contributors]: contributors.md
[Apereo Welcoming Policy]: https://www.apereo.org/content/apereo-welcoming-policy