Skip to content

Commit 3769d3e

Browse files
SethTisueSethTisue
authored
Merge pull request #487 from SethTisue/copyright-2021
copyright 2021
2 parents e1f3932 + 079426d commit 3769d3e

Some content is hidden

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

77 files changed

+833
-517
lines changed

‎NOTICE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
scala-xml
2-
Copyright (c) 2002-2020 EPFL
3-
Copyright (c) 2011-2020 Lightbend, Inc.
2+
Copyright (c) 2002-2021 EPFL
3+
Copyright (c) 2011-2021 Lightbend, Inc.
44

55
scala-xml includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and

‎build.sbt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
22

3+
ThisBuild / startYear := Some(2002)
4+
ThisBuild / licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")))
5+
36
lazy val configSettings: Seq[Setting[_]] = Seq(
47
unmanagedSourceDirectories ++= {
58
unmanagedSourceDirectories.value.flatMap { dir =>
@@ -43,6 +46,18 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
4346
// but we leave `publishArtifact` set to true, otherwise Sonatype won't let us publish
4447
Compile / doc / sources := (if (isDotty.value) Seq() else (Compile / doc/ sources).value),
4548

49+
headerLicense := Some(HeaderLicense.Custom(
50+
s"""|Scala (https://www.scala-lang.org)
51+
|
52+
|Copyright EPFL and Lightbend, Inc.
53+
|
54+
|Licensed under Apache License 2.0
55+
|(http://www.apache.org/licenses/LICENSE-2.0).
56+
|
57+
|See the NOTICE file distributed with this work for
58+
|additional information regarding copyright ownership.
59+
|""".stripMargin)),
60+
4661
scalaModuleMimaPreviousVersion := {
4762
if (isDotty.value) None // No such release yet
4863
else Some("1.3.0")

‎project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
1010
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1111
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
1212
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.2")
13+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")

‎shared/src/main/scala-2.13+/scala/xml/ScalaVersionSpecific.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.xml
214

315
import scala.collection.immutable.StrictOptimizedSeqOps

‎shared/src/main/scala/scala/xml/Atom.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Attribute.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Comment.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Document.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Elem.scala

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2002-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
** Copyright 2008 Google Inc. **
8-
** All Rights Reserved. **
9-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
1012

1113
package scala
1214
package xml

‎shared/src/main/scala/scala/xml/EntityRef.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Equality.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Group.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/MalformedAttributeException.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/MetaData.scala

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
** Copyright 2008 Google Inc. **
8-
** All Rights Reserved. **
9-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
1012

1113
package scala
1214
package xml

‎shared/src/main/scala/scala/xml/NamespaceBinding.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2002-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Node.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/NodeBuffer.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/NodeSeq.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

‎shared/src/main/scala/scala/xml/Null.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2020, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | (c) 2011-2020, Lightbend, Inc. **
5-
** /____/\___/_/ |_/____/_/ | | http://scala-lang.org/ **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package xml

0 commit comments

Comments
 (0)