Merge pull request #289 from mkurz/org.playframework

mkurz · web-flow · commit 88723e7f2d14 · 2023-10-05T23:22:51.000+02:00
Switch to `org.playframework`
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![OpenCollective](https://img.shields.io/opencollective/all/playframework?label=financial%20contributors&logo=open-collective)](https://opencollective.com/playframework)
 
 [![Build Status](https://github.com/playframework/cachecontrol/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/cachecontrol/actions/workflows/build-test.yml)
-[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/cachecontrol_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/cachecontrol_2.13)
+[![Maven](https://img.shields.io/maven-central/v/org.playframework/cachecontrol_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/org.playframework/cachecontrol_2.13)
 [![Repository size](https://img.shields.io/github/repo-size/playframework/cachecontrol.svg?logo=git)](https://github.com/playframework/cachecontrol)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/playframework/cachecontrol&style=flat)](https://mergify.com)
@@ -23,7 +23,9 @@ It does not implement caching itself, and there are some aspects of RFC 7234 whi
 To add this project to sbt, use:
 
 ```
-libraryDependencies += "com.typesafe.play" %% "cachecontrol" % -latest version-
+libraryDependencies += "org.playframework" %% "cachecontrol" % -latest version-
+// Versions older than 3.0.0:
+libraryDependencies += "com.typesafe.play" %% "cachecontrol" % "2.3.1"
 ```
 
 ## Releasing a new version
diff --git a/project/Common.scala b/project/Common.scala
@@ -34,7 +34,7 @@ object Common extends AutoPlugin {
 
   override def globalSettings =
     Seq(
-      organization         := "com.typesafe.play",
+      organization         := "org.playframework",
       organizationName     := "The Play Framework Project",
       organizationHomepage := Some(url("https://playframework.com/")),
       homepage             := Some(url(s"https://github.com/playframework/${repoName}")),
diff --git a/src/main/scala/org/playframework/cachecontrol/Cache.scala b/src/main/scala/org/playframework/cachecontrol/Cache.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import CacheDirectives.CacheDirectiveExtension
 
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheControl.scala b/src/main/scala/org/playframework/cachecontrol/CacheControl.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheControlException.scala b/src/main/scala/org/playframework/cachecontrol/CacheControlException.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 class CacheControlException(message: String, ex: Throwable) extends RuntimeException(message, ex) {
   def this(message: String) = this(message, null)
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala b/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 trait CacheDefaults extends Cache {
 
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.slf4j.LoggerFactory
 
@@ -37,7 +37,7 @@ object CacheDirectiveParser {
 
     import CacheDirectives._
 
-    private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.CacheControlParser")
+    private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.CacheControlParser")
 
     val separatorChars          = "()<>@,;:\\\"/[]?={} \t"
     val separatorBitSet: BitSet = BitSet(separatorChars.iterator.map(_.toInt).toSeq: _*)
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 object CacheDirectiveParserCompat {
   def toImmutableSeq[T](seq: Seq[T]): scala.collection.immutable.Seq[T] = {
diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectives.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 /**
  * A trait that marks the cache directives generated
diff --git a/src/main/scala/org/playframework/cachecontrol/CurrentAgeCalculator.scala b/src/main/scala/org/playframework/cachecontrol/CurrentAgeCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.ZonedDateTime
 
@@ -99,5 +99,5 @@ class CurrentAgeCalculator {
 }
 
 object CurrentAgeCalculator {
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.CurrentAgeCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.CurrentAgeCalculator")
 }
diff --git a/src/main/scala/org/playframework/cachecontrol/FreshnessCalculator.scala b/src/main/scala/org/playframework/cachecontrol/FreshnessCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import CacheDirectives.SMaxAge
 import org.slf4j.LoggerFactory
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory
 class FreshnessCalculator(cache: Cache) {
   import HeaderNames._
 
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.FreshnessCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.FreshnessCalculator")
 
   /**
    * Returns the freshness lifetime in seconds.
diff --git a/src/main/scala/org/playframework/cachecontrol/HttpDate.scala b/src/main/scala/org/playframework/cachecontrol/HttpDate.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatterBuilder
diff --git a/src/main/scala/org/playframework/cachecontrol/ResponseCachingCalculator.scala b/src/main/scala/org/playframework/cachecontrol/ResponseCachingCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.slf4j.LoggerFactory
 
@@ -257,5 +257,5 @@ class ResponseCachingCalculator(cache: Cache) {
 }
 
 object ResponseCachingCalculator {
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.ResponseCachingCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.ResponseCachingCalculator")
 }
diff --git a/src/main/scala/org/playframework/cachecontrol/ResponseSelectionCalculator.scala b/src/main/scala/org/playframework/cachecontrol/ResponseSelectionCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.ZonedDateTime
 
@@ -108,5 +108,5 @@ class ResponseSelectionCalculator(cache: Cache) {
 }
 
 object ResponseSelectionCalculator {
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.ResponseSelectionCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.ResponseSelectionCalculator")
 }
diff --git a/src/main/scala/org/playframework/cachecontrol/ResponseServingCalculator.scala b/src/main/scala/org/playframework/cachecontrol/ResponseServingCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import CacheDirectives._
 import org.slf4j.LoggerFactory
@@ -429,5 +429,5 @@ class ResponseServingCalculator(cache: Cache) {
 }
 
 object ResponseServingCalculator {
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.ResponseServingCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.ResponseServingCalculator")
 }
diff --git a/src/main/scala/org/playframework/cachecontrol/SecondaryKeyCalculator.scala b/src/main/scala/org/playframework/cachecontrol/SecondaryKeyCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.slf4j.LoggerFactory
 
@@ -79,5 +79,5 @@ class SecondaryKeyCalculator {
 }
 
 object SecondaryKeyCalculator {
-  private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.SecondaryKeyCalculator")
+  private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.SecondaryKeyCalculator")
 }
diff --git a/src/main/scala/org/playframework/cachecontrol/Seconds.scala b/src/main/scala/org/playframework/cachecontrol/Seconds.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.Duration
 import java.time.temporal.Temporal
diff --git a/src/main/scala/org/playframework/cachecontrol/StripHeaderCalculator.scala b/src/main/scala/org/playframework/cachecontrol/StripHeaderCalculator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 /**
  * Tells the cache what headers should be stripped before they are cached.
diff --git a/src/main/scala/org/playframework/cachecontrol/VaryParser.scala b/src/main/scala/org/playframework/cachecontrol/VaryParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 /**
  * Parses the Vary header in to a list of field names.
diff --git a/src/main/scala/org/playframework/cachecontrol/Warning.scala b/src/main/scala/org/playframework/cachecontrol/Warning.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.ZonedDateTime
 
diff --git a/src/main/scala/org/playframework/cachecontrol/WarningParser.scala b/src/main/scala/org/playframework/cachecontrol/WarningParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import scala.util.parsing.combinator.JavaTokenParsers
 import scala.util.parsing.input.CharSequenceReader
diff --git a/src/test/scala/org/playframework/cachecontrol/CacheDefaultsSpec.scala b/src/test/scala/org/playframework/cachecontrol/CacheDefaultsSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.scalatest.matchers.must.Matchers
 import org.scalatest.wordspec.AnyWordSpec
diff --git a/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala b/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.scalatest.matchers.should.Matchers._
 import org.scalatest.wordspec.AnyWordSpec
diff --git a/src/test/scala/org/playframework/cachecontrol/CurrentAgeCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/CurrentAgeCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/test/scala/org/playframework/cachecontrol/FreshnessCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/FreshnessCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/test/scala/org/playframework/cachecontrol/HttpDateSpec.scala b/src/test/scala/org/playframework/cachecontrol/HttpDateSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.format.DateTimeFormatter
 import java.time.ZoneOffset
diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 import java.time.Duration
diff --git a/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.time.Duration
 
diff --git a/src/test/scala/org/playframework/cachecontrol/StripHeaderCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/StripHeaderCalculatorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import java.net.URI
 
diff --git a/src/test/scala/org/playframework/cachecontrol/StubCache.scala b/src/test/scala/org/playframework/cachecontrol/StubCache.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 class StubCache(shared: Boolean) extends CacheDefaults {
   override def isShared: Boolean = shared
diff --git a/src/test/scala/org/playframework/cachecontrol/VaryParserSpec.scala b/src/test/scala/org/playframework/cachecontrol/VaryParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers._
diff --git a/src/test/scala/org/playframework/cachecontrol/WarningParserSpec.scala b/src/test/scala/org/playframework/cachecontrol/WarningParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.play.cachecontrol
+package org.playframework.cachecontrol
 
 import org.scalatest.Inside._
 import org.scalatest.wordspec.AnyWordSpec

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>`
`3`	`3`	`*/`
`4`	`4`
`5`		`-package com.typesafe.play.cachecontrol`
	`5`	`+package org.playframework.cachecontrol`
`6`	`6`
`7`	`7`	`import java.time.ZonedDateTime`
`8`	`8`
`@@ -99,5 +99,5 @@ class CurrentAgeCalculator {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`object CurrentAgeCalculator {`
`102`		`- private val logger = LoggerFactory.getLogger("com.typesafe.cachecontrol.CurrentAgeCalculator")`
	`102`	`+ private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.CurrentAgeCalculator")`
`103`	`103`	`}`