8000 bump copyright year to 2019 by SethTisue · Pull Request #7679 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

bump copyright year to 2019 #7679

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

Merged
merged 1 commit into from
Jan 25, 2019
Merged

bump copyright year to 2019 #7679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
bump copyright year to 2019
  • Loading branch information
@SethTisue
SethTisue committed Jan 24, 2019
commit 60cf518caaaf5950e02f71d1e2d5b25e15083386
4 changes: 2 additions & 2 deletions LICENSE
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (c) 2002-2018 EPFL
Copyright (c) 2011-2018 Lightbend, Inc.
Copyright (c) 2002-2019 EPFL
Copyright (c) 2011-2019 Lightbend, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Scala
Copyright (c) 2002-2018 EPFL
Copyright (c) 2011-2018 Lightbend, Inc.
Copyright (c) 2002-2019 EPFL
Copyright (c) 2011-2019 Lightbend, Inc.

Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and
Expand Down
4 changes: 2 additions & 2 deletions doc/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/

## Scala License

Copyright (c) 2002-2018 EPFL
Copyright (c) 2002-2019 EPFL

Copyright (c) 2011-2018 Lightbend, Inc.
Copyright (c) 2011-2019 Lightbend, Inc.

All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions doc/License.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Scala is licensed under the\'a0{\field{\*\fldinst{HYPERLINK "https://www.apache.
\fs48 \cf2 Scala License\
\pard\pardeftab720\sl360\sa320\partightenfactor0

\f0\b0\fs28 \cf2 Copyright (c) 2002-2018 EPFL\
Copyright (c) 2011-2018 Lightbend, Inc.\
\f0\b0\fs28 \cf2 Copyright (c) 2002-2019 EPFL\
Copyright (c) 2011-2019 Lightbend, Inc.\
All rights reserved.\
\pard\pardeftab720\sl360\sa320\partightenfactor0
\cf2 \cb4 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 the License at {\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt http://www.apache.org/licenses/LICENSE-2.0}}.\
Expand Down
2 changes: 1 addition & 1 deletion project/VersionUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object VersionUtil {
)

lazy val generatePropertiesFileSettings = Seq[Setting[_]](
copyrightString := "Copyright 2002-2018, LAMP/EPFL and Lightbend, Inc.",
copyrightString := "Copyright 2002-2019, LAMP/EPFL and Lightbend, Inc.",
shellWelcomeString := """
| ________ ___ / / ___
| / __/ __// _ | / / / _ |
Expand Down
2 changes: 1 addition & 1 deletion src/library/scala/util/Properties.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private[scala] trait PropertiesTrait {
* or "version (unknown)" if it cannot be determined.
*/
val versionString = "version " + scalaPropOrElse("version.number", "(unknown)")
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2018, LAMP/EPFL and Lightbend, Inc.")
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2019, LAMP/EPFL and Lightbend, Inc.")

/** This is the encoding to use reading in source files, overridden with -encoding.
* Note that it uses "prop" i.e. looks in the scala jar, not the system properties.
Expand Down
2 changes: 1 addition & 1 deletion src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ trait EntityPage extends HtmlPage {

{
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value))
<div id="footer">Scala programming documentation. Copyright (c) 2003-2018 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
<div id="footer">Scala programming documentation. Copyright (c) 2002-2019 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
else
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
}
Expand Down
2 changes: 1 addition & 1 deletion src/scalap/decoder.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version.number=2.0.1
copyright.string=(c) 2002-2018 LAMP/EPFL
copyright.string=(c) 2002-2019 LAMP/EPFL
0