diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 3 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-athenz/pom.xml | 7 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 10 |
4 files changed, 15 insertions, 7 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 0931ad85ad3..a8b836d5846 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -20,7 +20,8 @@ <junit5.platform.version>1.8.1</junit5.platform.version> <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> - <athenz.version>1.10.54</athenz.version> + <athenz.version>1.11.28</athenz.version> + <bouncycastle.version>1.73</bouncycastle.version> <commons-codec.version>1.15</commons-codec.version> <felix.version>7.0.1</felix.version> diff --git a/parent/pom.xml b/parent/pom.xml index c8ccc65b2fe..71e0c35eb6c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1124,7 +1124,7 @@ <asm.version>9.3</asm.version> <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories --> - <athenz.version>1.10.54</athenz.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> + <athenz.version>1.11.28</athenz.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> <aws-sdk.version>1.12.460</aws-sdk.version> <!-- Athenz END --> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 0d6ef5ccc45..a6f83fb102f 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -34,6 +34,13 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-disc</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <!-- Stop bundle-plugin from generating Import-Package on jakarta.servlet.http. Caused by Athenz libs --> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> <scope>provided</scope> </dependency> <dependency> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 69b7cf1b8a6..a408486d2a5 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -48,11 +48,11 @@ com.thaiopensource:jing:20091111 com.theokanning.openai-gpt3-java:api:0.12.0 com.theokanning.openai-gpt3-java:client:0.12.0 com.theokanning.openai-gpt3-java:service:0.12.0 -com.yahoo.athenz:athenz-auth-core:1.10.54 -com.yahoo.athenz:athenz-client-common:1.10.54 -com.yahoo.athenz:athenz-zms-core:1.10.54 -com.yahoo.athenz:athenz-zpe-java-client:1.10.54 -com.yahoo.athenz:athenz-zts-core:1.10.54 +com.yahoo.athenz:athenz-auth-core:1.11.28 +com.yahoo.athenz:athenz-client-common:1.11.28 +com.yahoo.athenz:athenz-zms-core:1.11.28 +com.yahoo.athenz:athenz-zpe-java-client:1.11.28 +com.yahoo.athenz:athenz-zts-core:1.11.28 com.yahoo.rdl:rdl-java:1.5.4 commons-cli:commons-cli:1.5.0 commons-codec:commons-codec:1.15 |