AK to CCS 2.5 Merge

[Andrew Egelhofer (andrewegel)]

This was a merge from AK/2.5 -> CCS/2.5 - Merge was mostly clean except for Jenkinsfile (which I just discarded and took CCS's Jenkinsfile), and in build.gradle around some conditionals, which ammounts to this diff:

diff --cc build.gradle
index c504ddadf1,c7bb31795a..d6d0d37895
--- a/build.gradle
+++ b/build.gradle
@@@ -473,35 -450,29 +482,35 @@@ subprojects
        "-Xlint:poly-implicit-overload",
        "-Xlint:private-shadow",
        "-Xlint:stars-align",
 -      "-Xlint:type-parameter-shadow",
 -      "-Xlint:unused"
 +      "-Xlint:type-parameter-shadow"
      ]

 -    // Inline more aggressively when compiling the `core` jar since it's not meant to be used as a library.
 -    // More specifically, inline classes from the Scala library so that we can inline methods like `Option.exists`
 -    // and avoid lambda allocations. This is only safe if the Scala library version is the same at compile time
 -    // and runtime. We cannot guarantee this for libraries like kafka streams, so only inline classes from the
 -    // Kafka project in that case.
 -    List<String> inlineFrom
 -    if (project.name.equals('core'))
 -      inlineFrom = ["-opt-inline-from:scala.**", "-opt-inline-from:kafka.**", "-opt-inline-from:org.apache.kafka.**"]
 -    else
 -      inlineFrom = ["-opt-inline-from:org.apache.kafka.**"]
 -
 -    // Somewhat confusingly, `-opt:l:inline` enables all optimizations. `inlineFrom` configures what can be inlined.
 -    // See https://www.lightbend.com/blog/scala-inliner-optimizer for more information about the optimizer.
 -    scalaCompileOptions.additionalParameters += ["-opt:l:inline"]
 -    scalaCompileOptions.additionalParameters += inlineFrom
 +    if (versions.baseScala != '2.11') {
 +      scalaCompileOptions.additionalParameters += [
 +        "-Xlint:constant",
 +        "-Xlint:unused"
 +      ]

 +      // Inline more aggressively when compiling the `core` jar since it's not meant to be used as a library.
 +      // More specifically, inline classes from the Scala library so that we can inline methods like `Option.exists`
 +      // and avoid lambda allocations. This is only safe if the Scala library version is the same at compile time
 +      // and runtime. We cannot guarantee this for libraries like kafka streams, so only inline classes from the
 +      // Kafka project in that case.
 +      List<String> inlineFrom
 +      if (project.name.equals('core'))
 +        inlineFrom = ["-opt-inline-from:scala.**", "-opt-inline-from:kafka.**", "-opt-inline-from:org.apache.kafka.**"]
 +      else
 +        inlineFrom = ["-opt-inline-from:org.apache.kafka.**"]
 +
 +      // Somewhat confusingly, `-opt:l:inline` enables all optimizations. `inlineFrom` configures what can be inlined.
 +      // See https://www.lightbend.com/blog/scala-inliner-optimizer for more information about the optimizer.
 +      scalaCompileOptions.additionalParameters += ["-opt:l:inline"]
 +      scalaCompileOptions.additionalParameters += inlineFrom
 +    }
 +
-   // these options are valid for Scala versions < 2.13 only
-   // Scala 2.13 removes them, see https://github.com/scala/scala/pull/6502 and https://github.com/scala/scala/pull/5969
+     // these options are valid for Scala versions < 2.13 only
+     // Scala 2.13 removes them, see https://github.com/scala/scala/pull/6502 and https://github.com/scala/scala/pull/5969
 -    if (versions.baseScala == '2.12') {
 +    if (versions.baseScala in ['2.11','2.12']) {
        scalaCompileOptions.additionalParameters += [
          "-Xlint:by-name-right-associative",
          "-Xlint:unsound-match"

I additionally cherry-picked apache@63f3e1c test fix core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala into this PR as that fixes a test-in-scala-2.11. I'll leave it up to the @confluentinc/kafka-eng team to decide whether this should be put into AK, and then merge over from there, or make this a CCS-only fix.

Committer Checklist (excluded from commit message)

• Verify design and implementation
• Verify test coverage and CI build status
• Verify documentation (including upgrade notes)

[Manikumar Reddy (omkreddy)]

Andrew Egelhofer (@andrewegel) Thanks for the PR. LGTM.