Skip to content

Commit

Permalink
Update copyrights and links to the new company name #19851
Browse files Browse the repository at this point in the history
  • Loading branch information
johanandren committed Feb 23, 2016
1 parent b14013c commit 62e30b3
Show file tree
Hide file tree
Showing 2,020 changed files with 2,139 additions and 2,103 deletions.
30 changes: 15 additions & 15 deletions CONTRIBUTING.md
Expand Up @@ -4,15 +4,15 @@ In case of questions about the contribution process or for discussion of specifi

## Infrastructure

* [Akka Contributor License Agreement](http://www.typesafe.com/contribute/cla)
* [Akka Contributor License Agreement](http://www.lightbend.com/contribute/cla)
* [Akka Issue Tracker](http://doc.akka.io/docs/akka/current/project/issue-tracking.html)
* [Scalariform](https://github.com/daniel-trinh/scalariform)

# Typesafe Project & Developer Guidelines
# Lightbend Project & Developer Guidelines

These guidelines are meant to be a living document that should be changed and adapted as needed. We encourage changes that make it easier to achieve our goals in an efficient way.

These guidelines mainly apply to Typesafe’s “mature” projects - not necessarily to projects of the type ‘collection of scripts’ etc.
These guidelines mainly apply to Lightbend’s “mature” projects - not necessarily to projects of the type ‘collection of scripts’ etc.

## Branches summary

Expand All @@ -26,7 +26,7 @@ Depending on which version (or sometimes module) you want to work on, you should

This is the process for committing code into master. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc.

1. Make sure you have signed the Typesafe CLA, if not, [sign it online](http://www.typesafe.com/contribute/cla).
1. Make sure you have signed the Lightbend CLA, if not, [sign it online](http://www.lightbend.com/contribute/cla).
2. Before starting to work on a feature or a fix, make sure that:
1. There is a ticket for your work in the project's issue tracker. If not, create it first.
2. The ticket has been scheduled for the current milestone.
Expand All @@ -37,7 +37,7 @@ This is the process for committing code into master. There are of course excepti
Akka prefers the committer name as part of the branch name, the ticket number is optional.

4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Typesafe. Outside contributors (for example from EPFL or independent committers) are encouraged to participate in the review process, it is not a closed process.
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Lightbend. Outside contributors (for example from EPFL or independent committers) are encouraged to participate in the review process, it is not a closed process.
6. After the review you should fix the issues as needed (pushing a new commit for new review etc.), iterating until the reviewers give their thumbs up.

When the branch conflicts with its merge target (either by way of git merge conflict or failing CI tests), do **not** merge the target branch into your feature branch. Instead rebase your branch onto the target branch. Merges complicate the git history, especially for the squashing which is necessary later (see below).
Expand Down Expand Up @@ -85,18 +85,18 @@ For a Pull Request to be considered at all it has to meet these requirements:
- Not violate [DRY](http://programmer.97things.oreilly.com/wiki/index.php/Don%27t_Repeat_Yourself).
- [Boy Scout Rule](http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule) needs to have been applied.
2. Regardless if the code introduces new features or fixes bugs or regressions, it must have comprehensive tests.
3. The code must be well documented in the Typesafe's standard documentation format (see the ‘Documentation’ section below).
3. The code must be well documented in the Lightbend's standard documentation format (see the ‘Documentation’ section below).
4. The commit messages must properly describe the changes, see further below.
5. All Typesafe projects must include Typesafe copyright notices. Each project can choose between one of two approaches:
5. All Lightbend projects must include Lightbend copyright notices. Each project can choose between one of two approaches:

1. All source files in the project must have a Typesafe copyright notice in the file header.
2. The Notices file for the project includes the Typesafe copyright notice and no other files contain copyright notices. See http://www.apache.org/legal/src-headers.html for instructions for managing this approach for copyrights.
1. All source files in the project must have a Lightbend copyright notice in the file header.
2. The Notices file for the project includes the Lightbend copyright notice and no other files contain copyright notices. See http://www.apache.org/legal/src-headers.html for instructions for managing this approach for copyrights.

Akka uses the first choice, having copyright notices in every file header.

Other guidelines to follow for copyright notices:

- Use a form of ``Copyright (C) 2011-2016 Typesafe Inc. <http://www.typesafe.com>``, where the start year is when the project or file was first created and the end year is the last time the project or file was modified.
- Use a form of ``Copyright (C) 2011-2016 Lightbend Inc. <http://www.lightbend.com>``, where the start year is when the project or file was first created and the end year is the last time the project or file was modified.
- Never delete or change existing copyright notices, just add additional info.
- Do not use ``@author`` tags since it does not encourage [Collective Code Ownership](http://www.extremeprogramming.org/rules/collective.html). However, each project should make sure that the contributors gets the credit they deserve—in a text file or page on the project website and in the release notes etc.

Expand All @@ -106,22 +106,22 @@ Whether or not a pull request (or parts of it) shall be back- or forward-ported

## Continuous Integration

Each project should be configured to use a continuous integration (CI) tool (i.e. a build server à la Jenkins). Typesafe has a [Jenkins server farm](https://jenkins.akka.io/) that can be used. The CI tool should, on each push to master, build the **full** distribution and run **all** tests, and if something fails it should email out a notification with the failure report to the committer and the core team. The CI tool should also be used in conjunction with a Pull Request validator (discussed below).
Each project should be configured to use a continuous integration (CI) tool (i.e. a build server à la Jenkins). Lightbend has a [Jenkins server farm](https://jenkins.akka.io/) that can be used. The CI tool should, on each push to master, build the **full** distribution and run **all** tests, and if something fails it should email out a notification with the failure report to the committer and the core team. The CI tool should also be used in conjunction with a Pull Request validator (discussed below).

## Documentation

All documentation should be generated using the sbt-site-plugin, *or* publish artifacts to a repository that can be consumed by the Typesafe stack.
All documentation should be generated using the sbt-site-plugin, *or* publish artifacts to a repository that can be consumed by the Lightbend stack.

All documentation must abide by the following maxims:

- Example code should be run as part of an automated test suite.
- Version should be **programmatically** specifiable to the build.
- Generation should be **completely automated** and available for scripting.
- Artifacts that must be included in the Typesafe stack should be published to a maven “documentation” repository as documentation artifacts.
- Artifacts that must be included in the Lightbend stack should be published to a maven “documentation” repository as documentation artifacts.

All documentation is preferred to be in Typesafe's standard documentation format [reStructuredText](http://doc.akka.io/docs/akka/snapshot/dev/documentation.html) compiled using Typesafe's customized [Sphinx](http://sphinx.pocoo.org/) based documentation generation system, which among other things allows all code in the documentation to be externalized into compiled files and imported into the documentation.
All documentation is preferred to be in Lightbend's standard documentation format [reStructuredText](http://doc.akka.io/docs/akka/snapshot/dev/documentation.html) compiled using Lightbend's customized [Sphinx](http://sphinx.pocoo.org/) based documentation generation system, which among other things allows all code in the documentation to be externalized into compiled files and imported into the documentation.

For more info, or for a starting point for new projects, look at the [Typesafe Documentation Template project](https://github.com/typesafehub/doc-template).
For more info, or for a starting point for new projects, look at the [Lightbend Documentation Template project](https://github.com/lightbendhub/doc-template).

For larger projects that have invested a lot of time and resources into their current documentation and samples scheme (like for example Play), it is understandable that it will take some time to migrate to this new model. In these cases someone from the project needs to take the responsibility of manual QA and verifier for the documentation and samples.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
This software is licensed under the Apache 2 license, quoted below.

Copyright 2009-2016 Typesafe Inc. [http://www.typesafe.com]
Copyright 2009-2016 Lightbend Inc. [http://www.lightbend.com]

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
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor;
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor;
Expand Down
2 changes: 1 addition & 1 deletion akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor;
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor;

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor;
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.japi;
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.japi.pf;
Expand Down
Expand Up @@ -15,7 +15,7 @@
import static org.junit.Assert.assertEquals;

/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
public class PatternsTest {

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.util;

Expand Down
2 changes: 1 addition & 1 deletion akka-actor-tests/src/test/java/akka/util/JavaDuration.java
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.util;

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2014-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2014-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.util;

Expand Down
2 changes: 1 addition & 1 deletion akka-actor-tests/src/test/scala/akka/Messages.scala
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2014-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2014-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2014-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2014-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.actor

Expand Down
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
*/

package akka.actor
Expand Down

0 comments on commit 62e30b3

Please sign in to comment.