|
|
|
|
/*
|
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
|
|
|
* or more contributor license agreements. See the NOTICE file
|
|
|
|
|
* distributed with this work for additional information
|
|
|
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
|
|
|
* to you under the Apache License, Version 2.0 (the
|
|
|
|
|
* "License"); you may not use this file except in compliance
|
|
|
|
|
* with the License. You may obtain a copy of the License at
|
|
|
|
|
*
|
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing,
|
|
|
|
|
* software distributed under the License is distributed on an
|
|
|
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
|
|
|
* KIND, either express or implied. See the License for the
|
|
|
|
|
* specific language governing permissions and limitations
|
|
|
|
|
* under the License.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
ext {
|
|
|
|
|
versions = [:]
|
|
|
|
|
libs = [:]
|
|
|
|
|
|
|
|
|
|
// Enabled by default when commands like `testAll` are invoked
|
|
|
|
|
defaultScalaVersions = [ '2.12', '2.13' ]
|
|
|
|
|
// Available if -PscalaVersion is used. This is useful when we want to support a Scala version that has
|
|
|
|
|
// a higher minimum Java requirement than Kafka. This was previously the case for Scala 2.12 and Java 7.
|
|
|
|
|
availableScalaVersions = [ '2.12', '2.13' ]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Add Scala version
|
|
|
|
|
def defaultScala212Version = '2.12.10'
|
|
|
|
|
def defaultScala213Version = '2.13.1'
|
|
|
|
|
if (hasProperty('scalaVersion')) {
|
|
|
|
|
if (scalaVersion == '2.12') {
|
|
|
|
|
versions["scala"] = defaultScala212Version
|
|
|
|
|
} else if (scalaVersion == '2.13') {
|
|
|
|
|
versions["scala"] = defaultScala213Version
|
|
|
|
|
} else {
|
|
|
|
|
versions["scala"] = scalaVersion
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
versions["scala"] = defaultScala212Version
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Resolve base Scala version according to these patterns:
|
|
|
|
|
1. generally available Scala versions (such as: 2.12.y and 2.13.z) corresponding base versions will be: 2.12 and 2.13 (respectively)
|
|
|
|
|
2. pre-release Scala versions (i.e. milestone/rc, such as: 2.13.0-M5, 2.13.0-RC1, 2.14.0-M1, etc.) will have identical base versions;
|
|
|
|
|
rationale: pre-release Scala versions are not binary compatible with each other and that's the reason why libraries include the full
|
|
|
|
|
Scala release string in their name for pre-releases (see dependencies below with an artifact name suffix '_$versions.baseScala')
|
|
|
|
|
*/
|
|
|
|
|
if ( !versions.scala.contains('-') ) {
|
|
|
|
|
versions["baseScala"] = versions.scala.substring(0, versions.scala.lastIndexOf("."))
|
|
|
|
|
} else {
|
|
|
|
|
versions["baseScala"] = versions.scala
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
versions += [
|
|
|
|
|
activation: "1.1.1",
|
|
|
|
|
apacheda: "1.0.2",
|
|
|
|
|
apacheds: "2.0.0-M24",
|
|
|
|
|
argparse4j: "0.7.0",
|
|
|
|
|
bcpkix: "1.64",
|
|
|
|
|
checkstyle: "8.20",
|
|
|
|
|
commonsCli: "1.4",
|
|
|
|
|
gradle: "5.6.2",
|
|
|
|
|
gradleVersionsPlugin: "0.27.0",
|
|
|
|
|
grgit: "4.0.1",
|
|
|
|
|
httpclient: "4.5.11",
|
|
|
|
|
easymock: "4.1",
|
|
|
|
|
jackson: "2.10.2",
|
|
|
|
|
jacoco: "0.8.3",
|
|
|
|
|
jetty: "9.4.26.v20200117",
|
|
|
|
|
jersey: "2.28",
|
|
|
|
|
jmh: "1.23",
|
|
|
|
|
hamcrest: "2.2",
|
|
|
|
|
log4j: "1.2.17",
|
|
|
|
|
scalaLogging: "3.9.2",
|
|
|
|
|
jaxb: "2.3.0",
|
|
|
|
|
jaxrs: "2.1.1",
|
|
|
|
|
jfreechart: "1.0.0",
|
|
|
|
|
jopt: "5.0.4",
|
|
|
|
|
junit: "4.13",
|
|
|
|
|
kafka_0100: "0.10.0.1",
|
|
|
|
|
kafka_0101: "0.10.1.1",
|
MINOR: Enable ignored upgrade system tests - trunk (#5605)
Removed ignore annotations from the upgrade tests. This PR includes the following changes for updating the upgrade tests:
* Uploaded new versions 0.10.2.2, 0.11.0.3, 1.0.2, 1.1.1, and 2.0.0 (in the associated scala versions) to kafka-packages
* Update versions in version.py, Dockerfile, base.sh
* Added new versions to StreamsUpgradeTest.test_upgrade_downgrade_brokers including version 2.0.0
* Added new versions StreamsUpgradeTest.test_simple_upgrade_downgrade test excluding version 2.0.0
* Version 2.0.0 is excluded from the streams upgrade/downgrade test as StreamsConfig needs an update for the new version, requiring a KIP. Once the community votes the KIP in, a minor follow-up PR can be pushed to add the 2.0.0 version to the upgrade test.
* Fixed minor bug in kafka-run-class.sh for classpath in upgrade/downgrade tests across versions.
* Follow on PRs for 0.10.2x, 0.11.0x, 1.0.x, 1.1.x, and 2.0.x will be pushed soon with the same updates required for the specific version.
Reviewers: Eno Thereska <eno.thereska@gmail.com>, John Roesler <vvcephei@users.noreply.github.com>, Guozhang Wang <wangguoz@gmail.com>, Matthias J. Sax <matthias@confluent.io>
6 years ago
|
|
|
kafka_0102: "0.10.2.2",
|
|
|
|
|
kafka_0110: "0.11.0.3",
|
|
|
|
|
kafka_10: "1.0.2",
|
|
|
|
|
kafka_11: "1.1.1",
|
|
|
|
|
kafka_20: "2.0.1",
|
|
|
|
|
kafka_21: "2.1.1",
|
|
|
|
|
kafka_22: "2.2.2",
|
|
|
|
|
kafka_23: "2.3.1",
|
|
|
|
|
kafka_24: "2.4.0",
|
|
|
|
|
lz4: "1.7.1",
|
|
|
|
|
mavenArtifact: "3.6.3",
|
|
|
|
|
metrics: "2.2.0",
|
|
|
|
|
mockito: "3.2.4",
|
|
|
|
|
owaspDepCheckPlugin: "5.2.4",
|
|
|
|
|
powermock: "2.0.5",
|
|
|
|
|
reflections: "0.9.12",
|
|
|
|
|
rocksDB: "5.18.3",
|
|
|
|
|
scalaCollectionCompat: "2.1.3",
|
|
|
|
|
scalafmt: "1.5.1",
|
|
|
|
|
scalaJava8Compat : "0.9.0",
|
MINOR: Make the build compile with Scala 2.13 (#6989)
Scala 2.13 support was added to build via #5454. This PR adjusts the code so that
it compiles with 2.11, 2.12 and 2.13.
Changes:
* Add `scala-collection-compat` dependency.
* Import `scala.collection.Seq` in a number of places for consistent behavior between
Scala 2.11, 2.12 and 2.13.
* Remove wildcard imports that were causing the Java classes to have priority over the
Scala ones, related Scala issue: https://github.com/scala/scala/pull/6589.
* Replace parallel collection usage with `Future`. The former is no longer included by
default in the standard library.
* Replace val _: Unit workaround with one that is more concise and works with Scala 2.13
* Replace `filterKeys` with `filter` when we expect a `Map`. `filterKeys` returns a view
that doesn't implement the `Map` trait in Scala 2.13.
* Replace `mapValues` with `map` or add a `toMap` as an additional transformation
when we expect a `Map`. `mapValues` returns a view that doesn't implement the
`Map` trait in Scala 2.13.
* Replace `breakOut` with `iterator` and `to`, `breakOut` was removed in Scala
2.13.
* Replace to() with toMap, toIndexedSeq and toSet
* Replace `mutable.Buffer.--` with `filterNot`.
* ControlException is an abstract class in Scala 2.13.
* Variable arguments can only receive arrays or immutable.Seq in Scala 2.13.
* Use `Factory` instead of `CanBuildFrom` in DecodeJson. `CanBuildFrom` behaves
a bit differently in Scala 2.13 and it's been deprecated. `Factory` has the behavior
we need and it's available via the compat library.
* Fix failing tests due to behavior change in Scala 2.13,
"Map.values.map is not strict in Scala 2.13" (https://github.com/scala/bug/issues/11589).
* Use Java collections instead of Scala ones in StreamResetter (a Java class).
* Adjust CheckpointFile.write to take an `Iterable` instead of `Seq` to avoid
unnecessary collection copies.
* Fix DelayedElectLeader to use a Map instead of Set and avoid `to` call that
doesn't work in Scala 2.13.
* Use unordered map for mapping in SimpleAclAuthorizer, mapping of ordered
maps require an `Ordering` in Scala 2.13 for safety reasons.
* Adapt `ConsumerGroupCommand` to compile with Scala 2.13.
* CoreUtils.min takes an `Iterable` instead of `TraversableOnce`, the latter does
not exist in Scala 2.13.
* Replace `Unit` with `()` in a couple places. Scala 2.13 is stricter when it expects
a value instead of a type.
* Fix bug in CustomQuotaCallbackTest where we did not necessarily set `partitionRatio`
correctly, `forall` can terminate early.
* Add a couple of spotbugs exclusions that are needed by code generated by Scala 2.13
* Remove unused variables, simplify some code and remove procedure syntax in a few
places.
* Remove unused `CoreUtils.JSONEscapeString`.
Reviewers: Manikumar Reddy <manikumar.reddy@gmail.com>, José Armando García Sancio <jsancio@users.noreply.github.com>
5 years ago
|
|
|
scalatest: "3.0.8",
|
|
|
|
|
scoverage: "1.4.1",
|
|
|
|
|
scoveragePlugin: "4.0.1",
|
|
|
|
|
shadowPlugin: "5.2.0",
|
|
|
|
|
slf4j: "1.7.30",
|
|
|
|
|
snappy: "1.1.7.3",
|
|
|
|
|
spotbugs: "3.1.12",
|
|
|
|
|
spotbugsPlugin: "3.0.0",
|
|
|
|
|
spotlessPlugin: "3.27.1",
|
|
|
|
|
testRetryPlugin: "1.1.0",
|
|
|
|
|
zookeeper: "3.5.7",
|
|
|
|
|
zstd: "1.4.4-7"
|
|
|
|
|
]
|
|
|
|
|
libs += [
|
|
|
|
|
activation: "javax.activation:activation:$versions.activation",
|
|
|
|
|
apacheda: "org.apache.directory.api:api-all:$versions.apacheda",
|
|
|
|
|
apachedsCoreApi: "org.apache.directory.server:apacheds-core-api:$versions.apacheds",
|
|
|
|
|
apachedsInterceptorKerberos: "org.apache.directory.server:apacheds-interceptor-kerberos:$versions.apacheds",
|
|
|
|
|
apachedsProtocolShared: "org.apache.directory.server:apacheds-protocol-shared:$versions.apacheds",
|
|
|
|
|
apachedsProtocolKerberos: "org.apache.directory.server:apacheds-protocol-kerberos:$versions.apacheds",
|
|
|
|
|
apachedsProtocolLdap: "org.apache.directory.server:apacheds-protocol-ldap:$versions.apacheds",
|
|
|
|
|
apachedsLdifPartition: "org.apache.directory.server:apacheds-ldif-partition:$versions.apacheds",
|
|
|
|
|
apachedsMavibotPartition: "org.apache.directory.server:apacheds-mavibot-partition:$versions.apacheds",
|
|
|
|
|
apachedsJdbmPartition: "org.apache.directory.server:apacheds-jdbm-partition:$versions.apacheds",
|
|
|
|
|
argparse4j: "net.sourceforge.argparse4j:argparse4j:$versions.argparse4j",
|
|
|
|
|
bcpkix: "org.bouncycastle:bcpkix-jdk15on:$versions.bcpkix",
|
|
|
|
|
commonsCli: "commons-cli:commons-cli:$versions.commonsCli",
|
|
|
|
|
easymock: "org.easymock:easymock:$versions.easymock",
|
|
|
|
|
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
|
|
|
|
|
jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson",
|
|
|
|
|
jacksonModuleScala: "com.fasterxml.jackson.module:jackson-module-scala_$versions.baseScala:$versions.jackson",
|
|
|
|
|
jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson",
|
|
|
|
|
jacksonJaxrsJsonProvider: "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$versions.jackson",
|
|
|
|
|
jaxbApi: "javax.xml.bind:jaxb-api:$versions.jaxb",
|
|
|
|
|
jaxrsApi: "javax.ws.rs:javax.ws.rs-api:$versions.jaxrs",
|
|
|
|
|
jettyServer: "org.eclipse.jetty:jetty-server:$versions.jetty",
|
|
|
|
|
jettyClient: "org.eclipse.jetty:jetty-client:$versions.jetty",
|
|
|
|
|
jettyServlet: "org.eclipse.jetty:jetty-servlet:$versions.jetty",
|
|
|
|
|
jettyServlets: "org.eclipse.jetty:jetty-servlets:$versions.jetty",
|
|
|
|
|
jerseyContainerServlet: "org.glassfish.jersey.containers:jersey-container-servlet:$versions.jersey",
|
|
|
|
|
jerseyHk2: "org.glassfish.jersey.inject:jersey-hk2:$versions.jersey",
|
|
|
|
|
jmhCore: "org.openjdk.jmh:jmh-core:$versions.jmh",
|
|
|
|
|
jmhCoreBenchmarks: "org.openjdk.jmh:jmh-core-benchmarks:$versions.jmh",
|
|
|
|
|
jmhGeneratorAnnProcess: "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh",
|
|
|
|
|
joptSimple: "net.sf.jopt-simple:jopt-simple:$versions.jopt",
|
|
|
|
|
junit: "junit:junit:$versions.junit",
|
|
|
|
|
hamcrest: "org.hamcrest:hamcrest:$versions.hamcrest",
|
|
|
|
|
kafkaStreams_0100: "org.apache.kafka:kafka-streams:$versions.kafka_0100",
|
|
|
|
|
kafkaStreams_0101: "org.apache.kafka:kafka-streams:$versions.kafka_0101",
|
|
|
|
|
kafkaStreams_0102: "org.apache.kafka:kafka-streams:$versions.kafka_0102",
|
|
|
|
|
kafkaStreams_0110: "org.apache.kafka:kafka-streams:$versions.kafka_0110",
|
|
|
|
|
kafkaStreams_10: "org.apache.kafka:kafka-streams:$versions.kafka_10",
|
|
|
|
|
kafkaStreams_11: "org.apache.kafka:kafka-streams:$versions.kafka_11",
|
MINOR: Enable ignored upgrade system tests - trunk (#5605)
Removed ignore annotations from the upgrade tests. This PR includes the following changes for updating the upgrade tests:
* Uploaded new versions 0.10.2.2, 0.11.0.3, 1.0.2, 1.1.1, and 2.0.0 (in the associated scala versions) to kafka-packages
* Update versions in version.py, Dockerfile, base.sh
* Added new versions to StreamsUpgradeTest.test_upgrade_downgrade_brokers including version 2.0.0
* Added new versions StreamsUpgradeTest.test_simple_upgrade_downgrade test excluding version 2.0.0
* Version 2.0.0 is excluded from the streams upgrade/downgrade test as StreamsConfig needs an update for the new version, requiring a KIP. Once the community votes the KIP in, a minor follow-up PR can be pushed to add the 2.0.0 version to the upgrade test.
* Fixed minor bug in kafka-run-class.sh for classpath in upgrade/downgrade tests across versions.
* Follow on PRs for 0.10.2x, 0.11.0x, 1.0.x, 1.1.x, and 2.0.x will be pushed soon with the same updates required for the specific version.
Reviewers: Eno Thereska <eno.thereska@gmail.com>, John Roesler <vvcephei@users.noreply.github.com>, Guozhang Wang <wangguoz@gmail.com>, Matthias J. Sax <matthias@confluent.io>
6 years ago
|
|
|
kafkaStreams_20: "org.apache.kafka:kafka-streams:$versions.kafka_20",
|
|
|
|
|
kafkaStreams_21: "org.apache.kafka:kafka-streams:$versions.kafka_21",
|
|
|
|
|
kafkaStreams_22: "org.apache.kafka:kafka-streams:$versions.kafka_22",
|
|
|
|
|
kafkaStreams_23: "org.apache.kafka:kafka-streams:$versions.kafka_23",
|
|
|
|
|
kafkaStreams_24: "org.apache.kafka:kafka-streams:$versions.kafka_24",
|
|
|
|
|
log4j: "log4j:log4j:$versions.log4j",
|
|
|
|
|
lz4: "org.lz4:lz4-java:$versions.lz4",
|
|
|
|
|
metrics: "com.yammer.metrics:metrics-core:$versions.metrics",
|
|
|
|
|
mockitoCore: "org.mockito:mockito-core:$versions.mockito",
|
|
|
|
|
powermockJunit4: "org.powermock:powermock-module-junit4:$versions.powermock",
|
|
|
|
|
powermockEasymock: "org.powermock:powermock-api-easymock:$versions.powermock",
|
|
|
|
|
reflections: "org.reflections:reflections:$versions.reflections",
|
|
|
|
|
rocksDBJni: "org.rocksdb:rocksdbjni:$versions.rocksDB",
|
MINOR: Make the build compile with Scala 2.13 (#6989)
Scala 2.13 support was added to build via #5454. This PR adjusts the code so that
it compiles with 2.11, 2.12 and 2.13.
Changes:
* Add `scala-collection-compat` dependency.
* Import `scala.collection.Seq` in a number of places for consistent behavior between
Scala 2.11, 2.12 and 2.13.
* Remove wildcard imports that were causing the Java classes to have priority over the
Scala ones, related Scala issue: https://github.com/scala/scala/pull/6589.
* Replace parallel collection usage with `Future`. The former is no longer included by
default in the standard library.
* Replace val _: Unit workaround with one that is more concise and works with Scala 2.13
* Replace `filterKeys` with `filter` when we expect a `Map`. `filterKeys` returns a view
that doesn't implement the `Map` trait in Scala 2.13.
* Replace `mapValues` with `map` or add a `toMap` as an additional transformation
when we expect a `Map`. `mapValues` returns a view that doesn't implement the
`Map` trait in Scala 2.13.
* Replace `breakOut` with `iterator` and `to`, `breakOut` was removed in Scala
2.13.
* Replace to() with toMap, toIndexedSeq and toSet
* Replace `mutable.Buffer.--` with `filterNot`.
* ControlException is an abstract class in Scala 2.13.
* Variable arguments can only receive arrays or immutable.Seq in Scala 2.13.
* Use `Factory` instead of `CanBuildFrom` in DecodeJson. `CanBuildFrom` behaves
a bit differently in Scala 2.13 and it's been deprecated. `Factory` has the behavior
we need and it's available via the compat library.
* Fix failing tests due to behavior change in Scala 2.13,
"Map.values.map is not strict in Scala 2.13" (https://github.com/scala/bug/issues/11589).
* Use Java collections instead of Scala ones in StreamResetter (a Java class).
* Adjust CheckpointFile.write to take an `Iterable` instead of `Seq` to avoid
unnecessary collection copies.
* Fix DelayedElectLeader to use a Map instead of Set and avoid `to` call that
doesn't work in Scala 2.13.
* Use unordered map for mapping in SimpleAclAuthorizer, mapping of ordered
maps require an `Ordering` in Scala 2.13 for safety reasons.
* Adapt `ConsumerGroupCommand` to compile with Scala 2.13.
* CoreUtils.min takes an `Iterable` instead of `TraversableOnce`, the latter does
not exist in Scala 2.13.
* Replace `Unit` with `()` in a couple places. Scala 2.13 is stricter when it expects
a value instead of a type.
* Fix bug in CustomQuotaCallbackTest where we did not necessarily set `partitionRatio`
correctly, `forall` can terminate early.
* Add a couple of spotbugs exclusions that are needed by code generated by Scala 2.13
* Remove unused variables, simplify some code and remove procedure syntax in a few
places.
* Remove unused `CoreUtils.JSONEscapeString`.
Reviewers: Manikumar Reddy <manikumar.reddy@gmail.com>, José Armando García Sancio <jsancio@users.noreply.github.com>
5 years ago
|
|
|
scalaCollectionCompat: "org.scala-lang.modules:scala-collection-compat_$versions.baseScala:$versions.scalaCollectionCompat",
|
|
|
|
|
scalaJava8Compat: "org.scala-lang.modules:scala-java8-compat_$versions.baseScala:$versions.scalaJava8Compat",
|
|
|
|
|
scalaLibrary: "org.scala-lang:scala-library:$versions.scala",
|
|
|
|
|
scalaLogging: "com.typesafe.scala-logging:scala-logging_$versions.baseScala:$versions.scalaLogging",
|
|
|
|
|
scalaReflect: "org.scala-lang:scala-reflect:$versions.scala",
|
|
|
|
|
scalatest: "org.scalatest:scalatest_$versions.baseScala:$versions.scalatest",
|
|
|
|
|
slf4jApi: "org.slf4j:slf4j-api:$versions.slf4j",
|
|
|
|
|
slf4jlog4j: "org.slf4j:slf4j-log4j12:$versions.slf4j",
|
|
|
|
|
snappy: "org.xerial.snappy:snappy-java:$versions.snappy",
|
|
|
|
|
zookeeper: "org.apache.zookeeper:zookeeper:$versions.zookeeper",
|
|
|
|
|
jfreechart: "jfreechart:jfreechart:$versions.jfreechart",
|
|
|
|
|
mavenArtifact: "org.apache.maven:maven-artifact:$versions.mavenArtifact",
|
|
|
|
|
zstd: "com.github.luben:zstd-jni:$versions.zstd",
|
|
|
|
|
httpclient: "org.apache.httpcomponents:httpclient:$versions.httpclient"
|
|
|
|
|
]
|
