Skip to content

Commit

Permalink
Merge pull request #3184 from reubenmiller/chore-update-company-refer…
Browse files Browse the repository at this point in the history
…ences

chore: replace company references to Cumulocity GmbH
  • Loading branch information
reubenmiller authored Oct 11, 2024
2 parents c5dcb29 + 5187a0e commit 6f46036
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ have to read carefully, this page and the CONTRIBUTOR LICENSE AGREEMENT.

## Signing the CONTRIBUTOR LICENSE AGREEMENT

Each Contribution to Software AG's Open Source Projects must be accompanied by a
Each Contribution to Cumulocity GmbH's Open Source Projects must be accompanied by a
sign-off indicating acceptance of current version of the CONTRIBUTOR LICENSE
AGREEMENT, which is derived from the Apache Foundation's Individual Contributor
License Agreement, sign-off time stamp relates to corresponding version of the
Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTOR-LICENSE-AGREEMENT.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
THIS CONTRIBUTOR LICENSE AGREEMENT (this "Agreement"), is effective for each Contribution by signing-off the Submission by using the option "-s" in "git commit", which will generate a sign-off statement with your user name and email address as described in [**CONTRIBUTING.md**](https://github.com/thin-edge/thin-edge.io/blob/main/CONTRIBUTING.md).

This Agreement is for Your protection as a Contributor as well as the protection of **Software AG**.
This Agreement is for Your protection as a Contributor as well as the protection of **Cumulocity GmbH**.

Except for the license granted herein, You reserve all right, title, and interest in Your Contributions.

You accept and agree to the following terms and conditions for Your Contributions submitted to **Software AG**.
You accept and agree to the following terms and conditions for Your Contributions submitted to **Cumulocity GmbH**.

You read, understand and follow the guidelines for the various roles You represent in **Software AG**’s opensource communities, starting with the contributor guidelines [**CONTRIBUTING.md**](https://github.com/thin-edge/thin-edge.io/blob/main/CONTRIBUTING.md).
You read, understand and follow the guidelines for the various roles You represent in **Cumulocity GmbH**’s opensource communities, starting with the contributor guidelines [**CONTRIBUTING.md**](https://github.com/thin-edge/thin-edge.io/blob/main/CONTRIBUTING.md).

**"Contribution"** means any original work of authorship, including any modification of or addition to an existing work including any associated comments and documentation, that you submit to **Software AG** in any manner for inclusion in any Work.
**"Contribution"** means any original work of authorship, including any modification of or addition to an existing work including any associated comments and documentation, that you submit to **Cumulocity GmbH** in any manner for inclusion in any Work.

**"Submission"** means the act of submitting Your Contributions by You to the projects managed by **Software AG** in any form of electronic, verbal, or written communication, especially using the features of the respective source code versioning platforms.
**"Submission"** means the act of submitting Your Contributions by You to the projects managed by **Cumulocity GmbH** in any form of electronic, verbal, or written communication, especially using the features of the respective source code versioning platforms.

**"Work"** means any project, work or materials owned or managed by **Software AG**.
**"Work"** means any project, work or materials owned or managed by **Cumulocity GmbH**.

**"You"** and **"Your"** means you and any organization on whose behalf you are entering this agreement.

Expand All @@ -22,15 +22,15 @@ You represent that:

(b) Your Contributions are based upon previous work that, to the best of your knowledge, is covered under an appropriate open source license and You have the right under that license to submit that work with modifications, whether created in whole or in part by You, under the designated license and Your Submissions include complete details of any third-party license and copyright or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.

(c) If you act as an employee or contractor where your employer(s) or client has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make such Contributions and are legally entitled to grant the below licenses on behalf of that employer/client or that your employer/client has waived any such rights for your Contributions to **Software AG**.
(c) If you act as an employee or contractor where your employer(s) or client has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make such Contributions and are legally entitled to grant the below licenses on behalf of that employer/client or that your employer/client has waived any such rights for your Contributions to **Cumulocity GmbH**.

Subject to the terms and conditions of this Agreement, You hereby grant to **Software AG** a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
Subject to the terms and conditions of this Agreement, You hereby grant to **Cumulocity GmbH** a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

Subject to the terms and conditions of this Agreement, You hereby grant to **Software AG** and to recipients of software distributed by **Software AG** a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
Subject to the terms and conditions of this Agreement, You hereby grant to **Cumulocity GmbH** and to recipients of software distributed by **Cumulocity GmbH** a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

You agree to notify **Software AG** of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
You agree to notify **Cumulocity GmbH** of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

By signing-off on my Submissions, I agree to be bound by the terms of the then current CONTRIBUTOR LICENSE AGREEMENT located at https://github.com/thin-edge/thin-edge.io/blob/main/CONTRIBUTOR-LICENSE-AGREEMENT.md, which I have read and understood and I agree that this Submission constitutes a "Contribution" under this Agreement.

Expand Down
8 changes: 4 additions & 4 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ In the [vision.md](./vision.md) the goal of the project is encoded.
It specifies the different functional requirements and non-functional requirements of the project as a whole.
All the stakeholders must agree on the vision upon joining.

- The current stakeholders are: Software AG, and IFM
- The current stakeholders are: Cumulocity GmbH

Changes to the vision need to be done in a plenum of stakeholders, this makes sure that everyone is aware and agrees to the evolution of the project.

Expand Down Expand Up @@ -103,7 +103,7 @@ The project has a hierarchy to solve these two problems:


```
core contributors = [SAG, IFM]
core contributors = [Cumulocity GmbH]
-> Project leads, one each from [core contributors]
|
Expand Down Expand Up @@ -282,7 +282,7 @@ minor release workflow:

* The release maintainer submits a pull request to the release branch with the
following changes:
* `CHANEGLOG.md` entries for the patch level release
* `CHANGELOG.md` entries for the patch level release
* Updates of the version numbers for all crates in the "patch"-level position,
e.g. "0.42.0" becomes "0.42.1",
* Once the aforementioned pull request is merged, the release maintainer
Expand Down Expand Up @@ -311,7 +311,7 @@ branch.
Version number bumps happen right _after_ branchoff for a release. Doing the
version number bump before the release would mean that the release maintainers
would have to wait for the version-bump-pull-request, which is not acceptable
under the preassumption that every commit from `main` can potentially be
under the presumption that every commit from `main` can potentially be
released.
By bumping the numbers right _after_ the release, but for the next release, we
automatically get a peace-of-mind state for that next release, where the release
Expand Down
2 changes: 1 addition & 1 deletion docs/src/operate/security/device-certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The `tedge cert show` command can be used to look at the content of the certific
```text title="tedge cert show""
Device certificate: /etc/mosquitto/certs/demo-device-007.chain.pem
Subject: O=Thin-Edge, OU=t398942, CN=demo-device-007
Issuer: C=DE, O=Software AG, CN=QA Thin-Edge CA G1
Issuer: C=DE, O=Cumulocity GmbH, CN=QA Thin-Edge CA G1
Valid from: Tue, 09 Nov 2021 14:38:41 +0000
Valid up to: Sat, 09 Nov 2024 14:38:41 +0000
Thumbprint: 1E0F9A074E6FE67A43EE948335E42EB729CB3974
Expand Down
2 changes: 1 addition & 1 deletion docs/src/start/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The Raspberry PI is a relatively simple and cheap device but powerful. Therefore
## Prerequisite

To follow this guide, you only need the following:
- A [Cumulocity IoT](https://www.softwareag.cloud/site/product/cumulocity-iot.html) Trial tenant.
- A [Cumulocity IoT](https://cumulocity.com/pages/free-trial/) Trial tenant.

- A Raspberry Pi (any model is fine) with RaspberryPi OS installed, for other boards and OS'es have a look [here](../references/supported-platforms.md)
- Updated device
Expand Down

0 comments on commit 6f46036

Please sign in to comment.