Skip to content

Commit 3765b29

Browse files
authored
Merge pull request #577 from Philippus/update-headers-and-notice
Update headers and NOTICE for lightbend name change
2 parents 1bb9e79 + 5e83526 commit 3765b29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+54
-54
lines changed

NOTICE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Scala parser combinators
22
Copyright (c) 2002-2024 EPFL
3-
Copyright (c) 2011-2024 Lightbend, Inc.
3+
Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
44

55
Scala includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and
7-
Lightbend, Inc. (https://www.lightbend.com/).
7+
Akka (https://akka.io/).
88

99
Licensed under the Apache License, Version 2.0 (the "License").
1010
Unless required by applicable law or agreed to in writing, software

js/src/main/scala/scala/util/parsing/input/PositionCache.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

jvm/src/main/scala/scala/util/parsing/input/PositionCache.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

native/src/main/scala/scala/util/parsing/input/PositionCache.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala-2.13+/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala-2.13-/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/ImplicitConversions.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/SubSequence.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/lexical/Lexical.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/lexical/Scanners.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/syntactical/TokenParsers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/combinator/token/Tokens.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/CharSequenceReader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/NoPosition.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/Position.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/Positional.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/Reader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/main/scala/scala/util/parsing/input/StreamReader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/gh242.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/gh29.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/gh45.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/gh56.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/gh72.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/t0700.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/t1100.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/t1229.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/t3212.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

shared/src/test/scala/scala/util/parsing/combinator/t4138.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

0 commit comments

Comments
 (0)