diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 000000000..3549dedc2 --- /dev/null +++ b/.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 }} diff --git a/NOTICE b/NOTICE index 22457ecf1..e3d6b3bb0 100644 --- a/NOTICE +++ b/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 diff --git a/README.md b/README.md index 49b9f5ccc..3814d7f7a 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r ## Contributing ## Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy) -and sign the [CLA](http://www.lightbend.com/contribute/cla/scala). +and sign the [CLA](http://contribute.akka.io/cla/scala). The branching structure mimics that of [scala/scala](https://github.com/scala/scala): -branches for 2.11.x, 2.12.x, etc. - +branches for 2.12.x and 2.13.x. diff --git a/project/ScalaDist.scala b/project/ScalaDist.scala index ad3ac237a..ce7a91cf9 100644 --- a/project/ScalaDist.scala +++ b/project/ScalaDist.scala @@ -52,7 +52,7 @@ object ScalaDist { useNativeZip ++ // use native zip to preserve +x permission on scripts Seq( name := "scala", - maintainer := "LAMP/EPFL and Lightbend, Inc. ", + 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, diff --git a/project/Unix.scala b/project/Unix.scala index 677c1a516..06c33565e 100644 --- a/project/Unix.scala +++ b/project/Unix.scala @@ -66,9 +66,9 @@ object Unix { // RPM Specific name in Rpm := "scala", - rpmVendor := "lightbend", - rpmUrl := Some("http://github.com/scala/scala"), - rpmLicense := Some("BSD"), + 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. diff --git a/src/linux/copyright b/src/linux/copyright index 22457ecf1..fcbc74a94 100644 --- a/src/linux/copyright +++ b/src/linux/copyright @@ -1,10 +1,10 @@ Scala Copyright (c) 2002-2024 EPFL -Copyright (c) 2011-2024 Lightbend, Inc. +Copyright (c) 2011-2024 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