Add util headers

None of the util files had headers.
2019-12-07 17:14:42 -08:00 · 2019-12-07 17:14:42 -08:00 · ad59e71b1a
parent 45a2cd5985
commit ad59e71b1a
72 changed files with 472 additions and 74 deletions
--- a/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import java.io.IOException
--- a/internal/util-control/src/main/scala/sbt/internal/util/ExitHook.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/ExitHook.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009, 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 /** Defines a function to call as sbt exits.*/
--- a/internal/util-control/src/main/scala/sbt/internal/util/MessageOnlyException.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/MessageOnlyException.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2011 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 final class MessageOnlyException(override val toString: String) extends RuntimeException(toString)
--- a/internal/util-interface/src/main/java/xsbti/Logger.java
+++ b/internal/util-interface/src/main/java/xsbti/Logger.java
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package xsbti;

 import java.util.function.Supplier;
--- a/internal/util-interface/src/main/java/xsbti/Position.java
+++ b/internal/util-interface/src/main/java/xsbti/Position.java
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package xsbti;

 import java.io.File;
--- a/internal/util-interface/src/main/java/xsbti/Problem.java
+++ b/internal/util-interface/src/main/java/xsbti/Problem.java
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package xsbti;

 import java.util.Optional;
--- a/internal/util-interface/src/main/java/xsbti/Severity.java
+++ b/internal/util-interface/src/main/java/xsbti/Severity.java
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package xsbti;

 public enum Severity
--- a/internal/util-interface/src/main/java/xsbti/T2.java
+++ b/internal/util-interface/src/main/java/xsbti/T2.java
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package xsbti;

 /** Used to pass a pair of values. */
--- a/internal/util-logging/src/main/scala/com/github/ghik/silencer/silent.scala
+++ b/internal/util-logging/src/main/scala/com/github/ghik/silencer/silent.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package com.github.ghik.silencer

 import scala.annotation.Annotation
--- a/internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import sbt.util._
@ -508,9 +515,12 @@ class ConsoleAppender private[ConsoleAppender] (
      message: String
  ): Unit =
    out.lockObject.synchronized {
-      val builder: StringBuilder = new StringBuilder(labelColor.length + label.length + messageColor.length + reset.length * 3)
+      val builder: StringBuilder =
+        new StringBuilder(labelColor.length + label.length + messageColor.length + reset.length * 3)
      message.linesIterator.foreach { line =>
-        builder.ensureCapacity(labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3)
+        builder.ensureCapacity(
+          labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3
+        )
        builder.setLength(0)
        def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset)
        builder.append(reset).append('[')
--- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
--- a/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 object EscHelpers {
--- a/internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt
 package internal
 package util
--- a/internal/util-logging/src/main/scala/sbt/internal/util/StackTrace.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/StackTrace.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010 Tony Sloane
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import sbt.io.IO
--- a/internal/util-logging/src/main/scala/sbt/internal/util/StringTypeTag.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/StringTypeTag.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import scala.reflect.runtime.universe._
--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala
@ -1,5 +1,8 @@
 /*
- * Copyright (C) 2017 Lightbend Inc. <http://www.lightbend.com>
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */

 package sbt
--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/PositionFormats.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/PositionFormats.scala
@ -1,6 +1,10 @@
-/**
- * This code is generated using [[http://www.scala-sbt.org/contraband/ sbt-contraband]].
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util.codec
 import _root_.sjsonnew.{ deserializationError, Builder, JsonFormat, Unbuilder }
 import xsbti.Position
--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/ProblemFormats.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/ProblemFormats.scala
@ -1,6 +1,10 @@
-/**
- * This code is generated using [[http://www.scala-sbt.org/contraband/ sbt-contraband]].
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util.codec

 import xsbti.{ Problem, Severity, Position }
--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/SeverityFormats.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/SeverityFormats.scala
@ -1,6 +1,10 @@
-/**
- * This code is generated using [[http://www.scala-sbt.org/contraband/ sbt-contraband]].
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util.codec

 import _root_.sjsonnew.{ deserializationError, Builder, JsonFormat, Unbuilder }
--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/SuccessEventShowLines.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/SuccessEventShowLines.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt
 package internal.util.codec

--- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/ThrowableShowLines.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/ThrowableShowLines.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt
 package internal.util.codec

--- a/internal/util-logging/src/main/scala/sbt/util/AbstractLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/AbstractLogger.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 abstract class AbstractLogger extends Logger {
--- a/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import xsbti.{ Position, Problem, Severity, T2 }
--- a/internal/util-logging/src/main/scala/sbt/util/Level.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/Level.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 /**
--- a/internal/util-logging/src/main/scala/sbt/util/LogEvent.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/LogEvent.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 sealed trait LogEvent
--- a/internal/util-logging/src/main/scala/sbt/util/LogExchange.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/LogExchange.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sbt.internal.util._
--- a/internal/util-logging/src/main/scala/sbt/util/Logger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/Logger.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009, 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 import xsbti.{ Logger => xLogger }
--- a/internal/util-logging/src/main/scala/sbt/util/ShowLines.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/ShowLines.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 trait ShowLines[A] {
--- a/internal/util-logging/src/test/scala/Escapes.scala
+++ b/internal/util-logging/src/test/scala/Escapes.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import org.scalacheck._
--- a/internal/util-logging/src/test/scala/LogExchangeSpec.scala
+++ b/internal/util-logging/src/test/scala/LogExchangeSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sbt.internal.util._
--- a/internal/util-logging/src/test/scala/LogWriterTest.scala
+++ b/internal/util-logging/src/test/scala/LogWriterTest.scala
@ -1,5 +1,9 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010 Mark Harrah */
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */

 package sbt.internal.util

--- a/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala
+++ b/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import org.scalatest._
--- a/internal/util-logging/src/test/scala/TestLogger.scala
+++ b/internal/util-logging/src/test/scala/TestLogger.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import sbt.util._
--- a/internal/util-position/src/main/scala/sbt/internal/util/Positions.scala
+++ b/internal/util-position/src/main/scala/sbt/internal/util/Positions.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import scala.language.experimental.macros
--- a/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala
+++ b/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.util

 import org.scalatest._
@ -5,7 +12,7 @@ import org.scalatest._
 class SourcePositionSpec extends FlatSpec {
  "SourcePosition()" should "return a sane SourcePosition" in {
    val filename = "SourcePositionSpec.scala"
-    val lineNumber = 9
+    val lineNumber = 16
    SourcePosition.fromEnclosing() match {
      case LinePosition(path, startLine) => assert(path === filename && startLine === lineNumber)
      case RangePosition(path, range)    => assert(path === filename && inRange(range, lineNumber))
--- a/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
+++ b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import Relation._
--- a/internal/util-relation/src/test/scala/RelationTest.scala
+++ b/internal/util-relation/src/test/scala/RelationTest.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2010  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.internal.util

 import org.scalacheck._
--- a/internal/util-scripted/src/main/java/sbt/internal/scripted/ScriptConfig.java
+++ b/internal/util-scripted/src/main/java/sbt/internal/scripted/ScriptConfig.java
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.scripted;

 import java.io.File;
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/CommentHandler.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/CommentHandler.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/HandlersProvider.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/HandlersProvider.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.internal.scripted

 trait HandlersProvider {
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt
 package internal
 package scripted
--- a/util-cache/src/main/scala/sbt/internal/util/EmptyCacheError.scala
+++ b/util-cache/src/main/scala/sbt/internal/util/EmptyCacheError.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt
 package internal
 package util
--- a/util-cache/src/main/scala/sbt/util/BasicCacheImplicits.scala
+++ b/util-cache/src/main/scala/sbt/util/BasicCacheImplicits.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sjsonnew.{ BasicJsonProtocol, JsonFormat }
--- a/util-cache/src/main/scala/sbt/util/Cache.scala
+++ b/util-cache/src/main/scala/sbt/util/Cache.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 import java.io.File
--- a/util-cache/src/main/scala/sbt/util/CacheImplicits.scala
+++ b/util-cache/src/main/scala/sbt/util/CacheImplicits.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sjsonnew.BasicJsonProtocol
--- a/util-cache/src/main/scala/sbt/util/CacheStore.scala
+++ b/util-cache/src/main/scala/sbt/util/CacheStore.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import java.io.{ File, InputStream, OutputStream }
--- a/util-cache/src/main/scala/sbt/util/FileInfo.scala
+++ b/util-cache/src/main/scala/sbt/util/FileInfo.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 import java.io.File
--- a/util-cache/src/main/scala/sbt/util/Input.scala
+++ b/util-cache/src/main/scala/sbt/util/Input.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import java.io.{ Closeable, InputStream }
--- a/util-cache/src/main/scala/sbt/util/Output.scala
+++ b/util-cache/src/main/scala/sbt/util/Output.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import java.io.{ Closeable, OutputStream }
--- a/util-cache/src/main/scala/sbt/util/SeparatedCache.scala
+++ b/util-cache/src/main/scala/sbt/util/SeparatedCache.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 import scala.util.Try
--- a/util-cache/src/main/scala/sbt/util/StampedFormat.scala
+++ b/util-cache/src/main/scala/sbt/util/StampedFormat.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import scala.reflect.Manifest
--- a/util-cache/src/test/scala/CacheSpec.scala
+++ b/util-cache/src/test/scala/CacheSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sbt.io.IO
--- a/util-cache/src/test/scala/FileInfoSpec.scala
+++ b/util-cache/src/test/scala/FileInfoSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sjsonnew.shaded.scalajson.ast.unsafe._
--- a/util-cache/src/test/scala/SingletonCacheSpec.scala
+++ b/util-cache/src/test/scala/SingletonCacheSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import sbt.io.IO
--- a/util-tracking/src/main/scala/sbt/util/ChangeReport.scala
+++ b/util-tracking/src/main/scala/sbt/util/ChangeReport.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 object ChangeReport {
--- a/util-tracking/src/main/scala/sbt/util/FileFunction.scala
+++ b/util-tracking/src/main/scala/sbt/util/FileFunction.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import java.io.File
--- a/util-tracking/src/main/scala/sbt/util/Tracked.scala
+++ b/util-tracking/src/main/scala/sbt/util/Tracked.scala
@ -1,6 +1,10 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009, 2010 Mark Harrah
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
 */
+
 package sbt.util

 import scala.util.{ Failure, Try, Success }
--- a/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala
+++ b/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala
@ -1,3 +1,10 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
 package sbt.util

 import org.scalatest.FlatSpec