MINOR: Update Scala to 2.13.3 #8931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Two jobs passed, one failed with a seemingly unrelated issue. |
|
retest this please |
ijuma
commented
Jun 26, 2020
| @@ -548,9 +550,9 @@ class AclAuthorizer extends Authorizer with Logging { | |||
|
|
|||
| private def updateCache(resource: ResourcePattern, versionedAcls: VersionedAcls): Unit = { | |||
| if (versionedAcls.acls.nonEmpty) { | |||
| aclCache = aclCache + (resource -> versionedAcls) | |||
| aclCache = aclCache.updated(resource, versionedAcls) | |||
There was a problem hiding this comment.
This avoids the tuple creation.
ijuma
commented
Jun 26, 2020
| @@ -367,7 +367,8 @@ class AclAuthorizer extends Authorizer with Logging { | |||
| } else false | |||
| } | |||
|
|
|||
| @nowarn("cat=deprecation&cat=optimizer") | |||
| @nowarn("cat=deprecation") | |||
| @nowarn("cat=optimizer") | |||
There was a problem hiding this comment.
The behavior of & was changed so that both conditions have to evaluate to true for a warning to match the exclusion.
ijuma
commented
Jun 26, 2020
| @@ -538,6 +539,7 @@ class AclAuthorizer extends Authorizer with Logging { | |||
| } | |||
| } | |||
|
|
|||
| @nowarn("cat=optimizer") | |||
There was a problem hiding this comment.
New warning flagged by the compiler.
ijuma
commented
Jun 26, 2020
| @@ -566,6 +568,7 @@ object ConsumerGroupCommand extends Logging { | |||
| /** | |||
| * Returns the state of the specified consumer group and partition assignment states | |||
| */ | |||
| @nowarn("cat=optimizer") | |||
There was a problem hiding this comment.
New warning flagged by the compiler.
ijuma
commented
Jun 26, 2020
| @@ -1210,7 +1210,7 @@ object KafkaConfig { | |||
| .define(PasswordEncoderIterationsProp, INT, Defaults.PasswordEncoderIterations, atLeast(1024), LOW, PasswordEncoderIterationsDoc) | |||
| } | |||
|
|
|||
| def configNames() = configDef.names().asScala.toList.sorted | |||
| def configNames: Seq[String] = configDef.names.asScala.toBuffer.sorted | |||
There was a problem hiding this comment.
toBuffer is more efficient than toList and sorted returns a copy anyway.
ijuma
commented
Jun 26, 2020
| */ | ||
| @Deprecated |
There was a problem hiding this comment.
It doesn't make sense to deprecate a method in an internal class that is still needed by our code. Removed the deprecation of various KafkaZkClient classes. cc @stanislavkozlovski
|
One job passed, two had a single unrelated test failure. |
Kvicii
pushed a commit
to Kvicii/kafka
that referenced
this pull request
Jun 27, 2020
* 'trunk' of github.com:apache/kafka: KAFKA-10180: Fix security_config caching in system tests (apache#8917) KAFKA-10173: Fix suppress changelog binary schema compatibility (apache#8905) KAFKA-10166: always write checkpoint before closing an (initialized) task (apache#8926) MINOR: Rename SslTransportLayer.State."NOT_INITALIZED" enum value to "NOT_INITIALIZED" MINOR: Update Scala to 2.13.3 (apache#8931) KAFKA-9076: support consumer sync across clusters in MM 2.0 (apache#7577) MINOR: Remove Diamond and code code Alignment (apache#8107) KAFKA-10198: guard against recycling dirty state (apache#8924)
udaynpusa
pushed a commit
to mapr/kafka
that referenced
this pull request
Apr 25, 2024
This change bumps scala version to 2.13.12 and cherry-picks squashed combination of the following commits (only scala-related changes): dfaae31 MINOR: Upgrade Scala for Java 20/21 support (apache#13840) 6ae08c4 KAFKA-14256: Upgrade from Scala 2.13.8 to 2.13.10 (apache#12675) 7c2d672 MINOR: Update library dependencies (Q1 2022) (apache#11306) a8bd649 MINOR: Update Scala to 2.13.6 (apache#10711) dd34e40 MINOR: Update Scala to 2.13.5 (apache#10169) cbf8ad2 MINOR: Upgrade to Scala 2.13.4 (apache#9643) 7f90a58 MINOR: Update Scala to 2.13.3 (apache#8931)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I had to fix several compiler errors due to deprecation of auto application of
(). A relatedXlint config (
-Xlint:nullary-override) is no longer valid in 2.13, so we now only enable itfor 2.12. The compiler flagged two new inliner warnings that required suppression and
the semantics of
&in@nowarnannotations changed, requiring a small change inone of the warning suppressions.
I also removed the deprecation of a number of methods in
KafkaZkClientasthey should not have been deprecated in the first place since
KafkaZkClientis aninternal class and we still use these methods in the Controller and so on. This
became visible because the Scala compiler now respects Java's
@Deprecatedannotation.
Finally, I included a few minor clean-ups (eg using
toBufferinsteadtoList) when fixingthe compilation warnings.
Noteworthy bug fixes in Scala 2.13.3:
Full release notes:
https://github.com/scala/scala/releases/tag/v2.13.3
Committer Checklist (excluded from commit message)