diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-05-22 10:48:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 10:48:42 +0200 |
| commit | c7a07adf43c13165e49e2aa2ef509ecb2526a48c (patch) | |
| tree | c8b00be7fad845462c7dc0c3db07f7942bcb8ad5 | |
| parent | 64e7dbfd3be5bea33646f4a1bf1e39175f0bdc51 (diff) | |
| parent | fd70d5a72f60541eb6d30f2221b4e7a82718a047 (diff) | |
Merge pull request #27149 from vespa-engine/balder/commons-compress-1.23
commons-compress 1.22 => 1.23.0
4 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java index 5b747b93268..981f6aa0d29 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java @@ -28,6 +28,7 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { private final double fractionOfMemoryReserved; // "Reserve" 0.5GB of memory for other processes running on the content node (config-proxy, metrics-proxy). + // And 0.2GB for distributor and proton basics. public static final double reservedMemoryGb = 0.7; public NodeResourcesTuning(NodeResources resources, diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 29c5fa69429..f2334a6ef00 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -15,7 +15,7 @@ commons-io:commons-io:2.11.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 org.apache.commons:commons-collections4:4.2 -org.apache.commons:commons-compress:1.22 +org.apache.commons:commons-compress:1.23.0 org.apache.commons:commons-lang3:3.12.0 org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.7 diff --git a/parent/pom.xml b/parent/pom.xml index 71e0c35eb6c..f6fdaf20a7a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -716,7 +716,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.22</version> + <version>1.23.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 7c2db779693..de2ee3fb412 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -90,7 +90,7 @@ net.openhft:zero-allocation-hashing:0.16 org.antlr:antlr-runtime:3.5.3 org.antlr:antlr4-runtime:4.11.1 org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6 -org.apache.commons:commons-compress:1.22 +org.apache.commons:commons-compress:1.23.0 org.apache.commons:commons-csv:1.8 org.apache.commons:commons-exec:1.3 org.apache.commons:commons-lang3:3.12.0 |