diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:45:05 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:48:26 +1000 |
commit | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (patch) | |
tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /src/build/maven | |
parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
parent | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (diff) | |
download | scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.gz scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.bz2 scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.zip |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
Diffstat (limited to 'src/build/maven')
-rw-r--r-- | src/build/maven/scala-compiler-doc-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-compiler-interactive-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-compiler-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-dist-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-library-all-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-library-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-reflect-pom.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scalap-pom.xml | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/src/build/maven/scala-compiler-doc-pom.xml b/src/build/maven/scala-compiler-doc-pom.xml index 8572e55b42..0c33d23d61 100644 --- a/src/build/maven/scala-compiler-doc-pom.xml +++ b/src/build/maven/scala-compiler-doc-pom.xml @@ -51,8 +51,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-compiler-interactive-pom.xml b/src/build/maven/scala-compiler-interactive-pom.xml index ad8192b694..d3e5e0b834 100644 --- a/src/build/maven/scala-compiler-interactive-pom.xml +++ b/src/build/maven/scala-compiler-interactive-pom.xml @@ -41,8 +41,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml index 8ca18f6f14..15546109c8 100644 --- a/src/build/maven/scala-compiler-pom.xml +++ b/src/build/maven/scala-compiler-pom.xml @@ -63,8 +63,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml index 1f6b6710ac..ce511661b0 100644 --- a/src/build/maven/scala-dist-pom.xml +++ b/src/build/maven/scala-dist-pom.xml @@ -62,8 +62,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml index 074c067742..4620c620dc 100644 --- a/src/build/maven/scala-library-all-pom.xml +++ b/src/build/maven/scala-library-all-pom.xml @@ -61,8 +61,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml index 78fc05a7c3..e27f8fb12f 100644 --- a/src/build/maven/scala-library-pom.xml +++ b/src/build/maven/scala-library-pom.xml @@ -39,8 +39,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml index c21caefcf2..f7f3c8bc08 100644 --- a/src/build/maven/scala-reflect-pom.xml +++ b/src/build/maven/scala-reflect-pom.xml @@ -44,8 +44,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml index 236ac999fc..acdd44f19b 100644 --- a/src/build/maven/scalap-pom.xml +++ b/src/build/maven/scalap-pom.xml @@ -41,8 +41,8 @@ <name>EPFL LAMP</name> </developer> <developer> - <id>Typesafe</id> - <name>Typesafe, Inc.</name> + <id>Lightbend</id> + <name>Lightbend, Inc.</name> </developer> </developers> </project> |