Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE-2640: BP-43 Some clean up and making sure that all bookkeepr-se… #2692

Merged
merged 1 commit into from
Apr 20, 2021
Merged

ISSUE-2640: BP-43 Some clean up and making sure that all bookkeepr-se… #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions bookkeeper-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ dependencies {

compileOnly depLibs.lombok
compileOnly depLibs.spotbugsAnnotations
implementation depLibs.bcpkixJdk15on
implementation depLibs.bcproveExtJdk15on
implementation depLibs.bcFips
implementation depLibs.commonsCli
implementation depLibs.commonsCodec
Expand All @@ -52,8 +50,6 @@ dependencies {
implementation depLibs.nettyTransportNativeEpoll
implementation depLibs.protobuf
implementation depLibs.rocksDb
implementation depLibs.slf4j
implementation depLibs.slf4jLog4j
implementation depLibs.zookeeper

testImplementation project(':bookkeeper-stats-providers:prometheus-metrics-provider')
Expand All @@ -72,9 +68,9 @@ dependencies {
testImplementation depLibs.powermockMockito
testImplementation depLibs.snappy
testImplementation depLibs.zookeeperTest

annotationProcessor depLibs.lombok
testAnnotationProcessor depLibs.lombok
testImplementation depLibs.slf4jLog4j
}

test {
Expand All @@ -85,6 +81,6 @@ test {
test.doFirst {
def junitFoundation = configurations.testCompileClasspath.resolvedConfiguration
.resolvedArtifacts.find { it.name == 'junit-foundation' }
jvmArgs("-javaagent:${junitFoundation.file}", "-Djunit.timeout.test=600000", "-Djunit.max.retry=3",
jvmArgs("-Djunit.timeout.test=600000", "-Djunit.max.retry=3",
"-Djava.net.preferIPv4Stack=true", "-Dio.netty.leakDetection.level=paranoid")
}
12 changes: 2 additions & 10 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,8 @@ public void sleepCluster(final int time,
final TimeUnit timeUnit,
final CountDownLatch l)
throws InterruptedException, IOException {

// Gradle handles thread groups differently to surefire, so we must
// enumerate from the parent thread group to find the zookeeper sync
// thread to sleep
ThreadGroup tg = Thread.currentThread().getThreadGroup();
while (tg.getParent() != null) {
tg = tg.getParent();
}
Thread[] allthreads = new Thread[tg.activeCount()];
tg.enumerate(allthreads);
Thread[] allthreads = new Thread[Thread.activeCount()];
Thread.enumerate(allthreads);
for (final Thread t : allthreads) {
if (t.getName().contains("SyncThread:0")) {
Thread sleeper = new Thread() {
Expand Down
4 changes: 0 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ allprojects {
}
}
test {
testLogging {
events "skipped", "failed", "standardError"
}

String testGroup = System.properties['testGroup']
if (testGroup == 'client') {
include '**/client/*'
Expand Down
25 changes: 6 additions & 19 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ext {
depVersions = [
arquillianCubeDocker: "1.18.2",
arquillianJunit: "1.6.0.Final",
bcFips: "1.0.1",
bouncycastle: "1.60",
bcFips: "1.0.2",
bouncycastle: "1.56",
commonsCli: "1.4",
commonsCodec: "1.14",
commonsCollections4: "4.1",
Expand Down Expand Up @@ -63,7 +63,7 @@ depVersions = [
lz4: "1.3.0",
mockito: "3.0.0",
netty: "4.1.32.Final",
nettyTcnativeBoringSsl: "2.0.20.Final",
nettyTcnativeBoringSsl: "2.0.31.Final",
powermock: "2.0.2",
prometheus: "0.0.21",
protobuf: "3.14.0",
Expand Down Expand Up @@ -122,9 +122,7 @@ depLibs = [
jna: "net.java.dev.jna:jna:${depVersions.jna}",
jsr305: "com.google.code.findbugs:jsr305:${depVersions.jsr305}",
junit: "junit:junit:${depVersions.junit}",
junitFoundation: dependencies.create("com.nordstrom.tools:junit-foundation:${depVersions.junitFoundation}") {
exclude group: 'ch.qos.logback', module: 'logback-classic'
},
junitFoundation: "com.nordstrom.tools:junit-foundation:${depVersions.junitFoundation}",
kerbySimpleKdc: "org.apache.kerby:kerb-simplekdc:${depVersions.kerby}",
log4j: "log4j:log4j:${depVersions.log4j}",
lombok: "org.projectlombok:lombok:${depVersions.lombok}",
Expand Down Expand Up @@ -162,17 +160,6 @@ depLibs = [
vertxCore: "io.vertx:vertx-core:${depVersions.vertx}",
vertxWeb: "io.vertx:vertx-web:${depVersions.vertx}",
yahooDatasketches: "com.yahoo.datasketches:sketches-core:${depVersions.yahooDatasketches}",
zookeeper: dependencies.create("org.apache.zookeeper:zookeeper:${depVersions.zookeeper}"){
exclude group: "net.java.dev.javacc", module: "javacc"
exclude group: "org.slf4j", module: "slf4j-log4j12"
exclude group: "org.slf4j", module: "slf4j-api"
exclude group: "log4j", module: "log4j"
exclude group: "io.netty", module: "*"
},
zookeeperTest: dependencies.create("org.apache.zookeeper:zookeeper:${depVersions.zookeeper}:tests"){
exclude group: "org.slf4j", module: "slf4j-log4j12"
exclude group: "org.slf4j", module: "slf4j-api"
exclude group: "log4j", module: "log4j"
exclude group: "io.netty", module: "*"
}
zookeeper: "org.apache.zookeeper:zookeeper:${depVersions.zookeeper}",
zookeeperTest: "org.apache.zookeeper:zookeeper:${depVersions.zookeeper}:tests"
]