diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-09-04 12:30:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 12:30:16 +0200 |
| commit | 86e9337e3c7d664d171782d07d4aca085383c8d7 (patch) | |
| tree | 9d5f25611aa23f304e512a24c6b392d103d38296 | |
| parent | 3e4a2ecdd9ad0b3dab563fd8572644bb3cfae2e3 (diff) | |
| parent | 4d27b6ecd14f69b9e58e2c6a44103c335c823fa5 (diff) | |
Merge pull request #28371 from vespa-engine/balder/control-net-buddy-agent-version
Same version for net-buddy and net-buddy-agent
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index b757c01f57b..319d6874f40 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -68,7 +68,7 @@ org.vafer:jdependency:2.8.0 # Contains dependencies that are used exclusively in 'test' scope junit:junit:4.13.2 net.bytebuddy:byte-buddy:1.14.7 -net.bytebuddy:byte-buddy-agent:1.14.6 +net.bytebuddy:byte-buddy-agent:1.14.7 org.apiguardian:apiguardian-api:1.1.2 org.hamcrest:hamcrest:2.2 org.hamcrest:hamcrest-core:2.2 diff --git a/parent/pom.xml b/parent/pom.xml index 2aa9c76d495..eeacc667b22 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -635,6 +635,11 @@ <version>${byte-buddy.vespa.version}</version> </dependency> <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>${byte-buddy.vespa.version}</version> + </dependency> + <dependency> <groupId>net.openhft</groupId> <artifactId>zero-allocation-hashing</artifactId> <version>${zero-allocation-hashing.vespa.version}</version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 1b428960a76..50ab762bd9b 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -221,7 +221,7 @@ xml-apis:xml-apis:1.4.01 com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.3.0 net.bytebuddy:byte-buddy:1.14.7 -net.bytebuddy:byte-buddy-agent:1.14.6 +net.bytebuddy:byte-buddy-agent:1.14.7 org.apache.curator:curator-test:5.5.0 org.assertj:assertj-core:3.24.2 org.junit.jupiter:junit-jupiter:5.8.1 |