suppress some cves and fix javadoc build when using java 17 (#14241)

This commit is contained in:
Clint Wylie 2023-05-10 15:47:10 -07:00 committed by GitHub
parent 625c4745b1
commit 6db11bfc60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 9 deletions

View File

@ -55,7 +55,7 @@ public class BucketingAccumulator extends YieldingAccumulator<RowBucket, Row>
rows.add(in);
RowBucket nextBucket = new RowBucket(in.getTimestamp(), rows);
accumulated.setNextBucket(nextBucket);
yield();
this.yield();
} else {
// still on the same day
rows = accumulated.getRows();

View File

@ -247,6 +247,7 @@
<cve>CVE-2022-40150</cve>
<cve>CVE-2022-45685</cve>
<cve>CVE-2022-45693</cve>
<cve>CVE-2023-1436</cve>
</suppress>
<suppress>
<!-- TODO: Fix by using com.datastax.oss:java-driver-core instead of com.netflix.astyanax:astyanax in extensions-contrib/cassandra-storage -->
@ -256,6 +257,8 @@
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@1.6$</packageUrl>
<cve>CVE-2017-18640</cve>
<cve>CVE-2022-25857</cve>
<cve>CVE-2023-2251</cve>
<cve>CVE-2022-3064</cve>
</suppress>
<suppress>
<!-- We need to wait for 17.0.0 of https://github.com/kubernetes-client/java/releases -->
@ -264,6 +267,9 @@
]]></notes>
<cve>CVE-2022-25857</cve>
<cve>CVE-2022-1471</cve>
<!-- false positive -->
<cve>CVE-2023-2251</cve>
<cve>CVE-2022-3064</cve>
</suppress>
<suppress>
<notes><![CDATA[
@ -343,6 +349,7 @@
<packageUrl regex="true">^pkg:maven/org\.apache\.kafka/kafka-clients@2.0.0$</packageUrl>
<cve>CVE-2019-12399</cve>
<cve>CVE-2018-17196</cve>
<cve>CVE-2023-25194</cve>
</suppress>
<suppress>
<notes><![CDATA[
@ -353,7 +360,7 @@
</suppress>
<suppress>
<!--
~ TODO: Fix when Apache Ranger is released with updated log4j
~ ambari-metrics-emitter, druid-ranger-security
-->
<notes><![CDATA[
file name: log4j-1.2.17.jar
@ -365,6 +372,7 @@
<cve>CVE-2022-23307</cve>
<cve>CVE-2022-23305</cve>
<cve>CVE-2022-23302</cve>
<cve>CVE-2023-26464</cve>
</suppress>
<suppress>
<notes><![CDATA[
@ -392,6 +400,7 @@
<cve>CVE-2022-23305</cve>
<cve>CVE-2022-23302</cve>
<cve>CVE-2022-41881</cve>
<cve>CVE-2020-11612</cve>
</suppress>
<suppress>
<!--
@ -789,4 +798,12 @@
<vulnerabilityName>1070209</vulnerabilityName>
<cve>CVE-2020-7774</cve>
</suppress>
<suppress>
<!-- druid-ranger-security -->
<notes><![CDATA[
file name: ranger-plugins-common-2.0.0.jar
]]></notes>
<!-- seems not applicable to plugin -->
<cve>CVE-2022-45048</cve>
</suppress>
</suppressions>

View File

@ -55,7 +55,7 @@ public class ConcatSequence<T> implements Sequence<T>
@Override
public Sequence<T> accumulate(Sequence<T> accumulated, Sequence<T> in)
{
yield();
this.yield();
return in;
}
}

View File

@ -132,7 +132,7 @@ final class LimitedSequence<T> extends YieldingSequenceBase<T>
interruptYield = false;
}
if (interruptYield) {
yield();
this.yield();
}
return retVal;

View File

@ -55,7 +55,7 @@ public class MergeSequence<T> extends YieldingSequenceBase<T>
PriorityQueue<Yielder<T>> pQueue = new PriorityQueue<>(
32,
ordering.onResultOf(
(Function<Yielder<T>, T>) input -> input.get()
(Function<Yielder<T>, T>) Yielder::get
)
);
@ -70,7 +70,7 @@ public class MergeSequence<T> extends YieldingSequenceBase<T>
@Override
public T accumulate(T accumulated, T in)
{
yield();
this.yield();
return in;
}
}

View File

@ -895,7 +895,7 @@ public class ParallelMergeCombiningSequence<T> extends YieldingSequenceBase<T>
accumulated.add(in);
count++;
if (count % batchSize == 0) {
yield();
this.yield();
}
return accumulated;
}

View File

@ -36,7 +36,7 @@ public class Yielders
@Override
public T accumulate(T accumulated, T in)
{
yield();
this.yield();
return in;
}
}

View File

@ -76,7 +76,7 @@ public class ScanQueryLimitRowIterator implements CloseableIterator<ScanResultVa
@Override
public ScanResultValue accumulate(ScanResultValue accumulated, ScanResultValue in)
{
yield();
this.yield();
return in;
}
}