summaryrefslogtreecommitdiffstats
path: root/scalalib
diff options
context:
space:
mode:
authorJon Bratseth <jonbratseth@yahoo.com>2017-06-14 17:57:50 +0200
committerGitHub <noreply@github.com>2017-06-14 17:57:50 +0200
commita84e7e88923c211d6bcdc56929ade99d86813bb6 (patch)
treec283d732c23349beff4671f2167b74d9813a533c /scalalib
parentd7b09dc811c113279eeda75a131092e9175a01e7 (diff)
Revert "Update copyright headers"
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/pom.xml2
-rw-r--r--scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala2
-rw-r--r--scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala2
-rw-r--r--scalalib/src/main/scala/com/yahoo/vespa/scalalib/osgi/maven/ProjectBundleClassPaths.scala2
4 files changed, 4 insertions, 4 deletions
diff --git a/scalalib/pom.xml b/scalalib/pom.xml
index 16a22db723c..a0292288e0d 100644
--- a/scalalib/pom.xml
+++ b/scalalib/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala
index bee1172a26f..41585b193cf 100644
--- a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala
+++ b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.scalalib.arm
import scala.language.reflectiveCalls
diff --git a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala
index b8cce3cf343..012f9b4bbe5 100644
--- a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala
+++ b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.scalalib.java.function
import java.util.function.Predicate
diff --git a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/osgi/maven/ProjectBundleClassPaths.scala b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/osgi/maven/ProjectBundleClassPaths.scala
index 08b8f05b96f..9bf35e06ce5 100644
--- a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/osgi/maven/ProjectBundleClassPaths.scala
+++ b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/osgi/maven/ProjectBundleClassPaths.scala
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.scalalib.osgi.maven
import java.nio.charset.StandardCharsets