diff options
| author | gjoranv <gv@yahooinc.com> | 2023-07-03 14:38:24 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahooinc.com> | 2023-07-03 22:37:54 +0200 |
| commit | 394c04ac5bdaea3a56ac01f123d09af75f8e550d (patch) | |
| tree | d5b30d85fd31361c6feac908ab8668bbc5731fb8 | |
| parent | 73dc0d31608a597685baf47e9b245f9d9422379c (diff) | |
Depend on container-dev and allow embeddeding provided deps for now.
| -rw-r--r-- | cloud-tenant-cd/pom.xml | 4 | ||||
| -rw-r--r-- | config-model/pom.xml | 5 | ||||
| -rw-r--r-- | configserver/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc-cloud-aws/pom.xml | 18 | ||||
| -rw-r--r-- | zkfacade/pom.xml | 2 |
5 files changed, 17 insertions, 14 deletions
diff --git a/cloud-tenant-cd/pom.xml b/cloud-tenant-cd/pom.xml index baccbab54f5..11e680f75d8 100644 --- a/cloud-tenant-cd/pom.xml +++ b/cloud-tenant-cd/pom.xml @@ -83,6 +83,8 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> + <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-core:2.15.2, com.yahoo.vespa:annotations:8-SNAPSHOT, + org.bouncycastle:bcpkix-jdk18on:1.74, org.bouncycastle:bcprov-jdk18on:1.74, org.bouncycastle:bcutil-jdk18on:1.74</allowEmbeddedArtifacts> <useCommonAssemblyIds>true</useCommonAssemblyIds> </configuration> </plugin> @@ -92,4 +94,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/config-model/pom.xml b/config-model/pom.xml index a634a40c93b..a05a246cc4b 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -300,6 +300,11 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> + <configuration> + <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-annotations:2.15.2, com.fasterxml.jackson.core:jackson-core:2.15.2, + com.fasterxml.jackson.core:jackson-databind:2.15.2, com.yahoo.vespa:metrics:*, com.yahoo.vespa:predicate-search-core:*, + com.yahoo.vespa:searchcore:*</allowEmbeddedArtifacts> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/configserver/pom.xml b/configserver/pom.xml index 5bd155c797b..6a9b659e046 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -296,6 +296,8 @@ <!-- TODO: Vespa > 8: remove importPackage when the jackson-jaxrs-json-provider bundle is no longer installed in jdisc --> <!-- added to ensure using the same class as orchestrator, core-dump-reporter, provision-controller and controller-clients --> <importPackage>com.fasterxml.jackson.jaxrs.json;version="[2.12.6,3)"</importPackage> + <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-annotations:2.15.2, com.fasterxml.jackson.core:jackson-core:2.15.2, + com.yahoo.vespa:airlift-zstd:*</allowEmbeddedArtifacts> </configuration> </plugin> <plugin> diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 5ae3e056309..a383edfbbc9 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -19,7 +19,7 @@ <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-disc</artifactId> + <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -47,18 +47,6 @@ <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ssm</artifactId> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_core</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>component</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> @@ -71,6 +59,10 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> + <configuration> + <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-annotations:2.15.2, com.fasterxml.jackson.core:jackson-core:2.15.2, + com.fasterxml.jackson.core:jackson-databind:2.15.2, commons-logging:commons-logging:1.2</allowEmbeddedArtifacts> + </configuration> </plugin> </plugins> </build> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index dd890fef3a8..365b3e1bea5 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -126,6 +126,8 @@ <extensions>true</extensions> <configuration> <importPackage>com.sun.management</importPackage> + <allowEmbeddedArtifacts>com.google.errorprone:error_prone_annotations:2.18.0, com.google.guava:failureaccess:1.0.1, + com.google.guava:guava:27.1-jre, com.google.j2objc:j2objc-annotations:1.1</allowEmbeddedArtifacts> </configuration> </plugin> <plugin> |