Skip to content

Commit

Permalink
Merge pull request #299 from renatocaval/remove-copyright-year-1.5.x
Browse files Browse the repository at this point in the history
Remove copyright year (1.5.x)
  • Loading branch information
mergify[bot] authored Jan 3, 2020
2 parents 86c92a4 + 75b29a7 commit ccff798
Show file tree
Hide file tree
Showing 46 changed files with 46 additions and 48 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ All Typesafe projects must include Typesafe copyright notices. Each project can
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.

Other guidelines to follow for copyright notices:
- Use a form of ``Copyright (C) 2011-2014 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) 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.
- 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 Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/Content.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/Format.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/Formats.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/Template.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api

Expand Down
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/package.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api.utils

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api.test

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api
package test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.api
package test
Expand Down
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ def scalacCompilerSettings(scalaVer: String) =

val headerSettings = Seq(
headerLicense := {
val currentYear = java.time.Year.now(java.time.Clock.systemUTC).getValue
Some(
HeaderLicense.Custom(
s"Copyright (C) 2009-$currentYear Lightbend Inc. <https://www.lightbend.com>"
s"Copyright (C) Lightbend Inc. <https://www.lightbend.com>"
)
)
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.japi.twirl.compiler;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.japi.twirl.compiler;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler.test

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler
package test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler
package test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler.test.imports.bar

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.compiler.test.imports.foo

Expand Down
3 changes: 1 addition & 2 deletions docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ lazy val docs = project
PlayDocsKeys.javaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "javaGuide" ** "code").get,
PlayDocsKeys.scalaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "scalaGuide" ** "code").get,
headerLicense := {
val currentYear = java.time.Year.now(java.time.Clock.systemUTC).getValue
Some(
HeaderLicense.Custom(
s"Copyright (C) 2009-$currentYear Lightbend Inc. <https://www.lightbend.com>"
s"Copyright (C) Lightbend Inc. <https://www.lightbend.com>"
)
)
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# Adding support for a custom format to the template engine

The built-in template engine supports common template formats (HTML, XML, etc.) but you can easily add support for your own formats, if needed. This page summarizes the steps to follow to support a custom format.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# Common template use cases

Templates, being simple functions, can be composed in any way you want. Below are a few examples of some common scenarios.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# The template engine

## A type safe template engine based on Scala
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# Adding support for a custom format to the template engine

The built-in template engine supports common template formats (HTML, XML, etc.) but you can easily add support for your own formats, if needed. This page summarizes the steps to follow to support a custom format.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# Scala templates common use cases

Templates, being simple functions, can be composed in any way you want. Below are examples of some common scenarios.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com> -->
<!--- Copyright (C) Lightbend Inc. <http://www.typesafe.com> -->
# The template engine

## A type safe template engine based on Scala
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package company.product.core

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package scalaguide.templates

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/scala/play/twirl/parser/TreeNodes.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.parser

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/scala/play/twirl/parser/TwirlIO.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.parser

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/scala/play/twirl/parser/TwirlParser.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.parser

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.parser
package test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
2 changes: 1 addition & 1 deletion sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt
package test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
*/
package play.twirl.sbt.test

Expand Down

0 comments on commit ccff798

Please sign in to comment.