Merge remote-tracking branch 'upstream/2.12.x' into 2.13.x

Author: SethTisue

.github/workflows/cla.yml

@@ -0,0 +1,11 @@
+name: "Check Scala CLA"
+on:
+  pull_request:
+jobs:
+  cla-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Verify CLA
+        uses: scala/cla-checker@v1
+        with:
+          author: ${{ github.event.pull_request.user.login }}

NOTICE

@@ -1,10 +1,10 @@
 Scala
-Copyright (c) 2002-2024 EPFL
-Copyright (c) 2011-2024 Lightbend, Inc.
+Copyright (c) 2002-2025 EPFL
+Copyright (c) 2011-2025 Lightbend, Inc. dba Akka
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
+Akka (https://akka.io/).
 
 Licensed under the Apache License, Version 2.0 (the "License").
 Unless required by applicable law or agreed to in writing, software

project/ScalaDist.scala

@@ -54,7 +54,7 @@ object ScalaDist {
     useNativeZip ++ // use native zip to preserve +x permission on scripts
     Seq(
       name                := "scala",
-      maintainer          := "LAMP/EPFL and Lightbend, Inc. <[email protected]>",
+      maintainer          := "LAMP/EPFL and Akka",
       packageSummary      := "Scala Programming Language Distribution", // this will be spliced into the middle of a sentence --> no period (it also determines sort order, so, no "The" in front)
       packageDescription  := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.",
       crossPaths          := false,

project/Unix.scala

@@ -65,10 +65,10 @@ object Unix {
     },
 
     // RPM Specific
-    Rpm / name    := "scala",
-    rpmVendor      := "lightbend",
-    rpmUrl         := Some("http://github.com/scala/scala"),
-    rpmLicense     := Some("BSD"),
+    Rpm / name     := "scala",
+    rpmVendor      := "akka",
+    rpmUrl         := Some("https://github.com/scala/scala"),
+    rpmLicense     := Some("Apache 2"),
     rpmGroup       := Some("Development/Languages"),
 
     // This hack lets us ignore the RPM specific versioning junks.

src/linux/copyright

@@ -1,10 +1,10 @@
 Scala
-Copyright (c) 2002-2024 EPFL
-Copyright (c) 2011-2024 Lightbend, Inc.
+Copyright (c) 2002-2025 EPFL
+Copyright (c) 2011-2025 Lightbend, Inc. dba Akka
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
+Akka. (https://akka.io/).
 
 Licensed under the Apache License, Version 2.0 (the "License").
 Unless required by applicable law or agreed to in writing, software