diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-09-04 13:42:44 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-09-04 16:31:44 +0200 |
| commit | bb436916fd27e669ba0107761312d1cd4229a303 (patch) | |
| tree | 3a3719375bed566d760b540c590a79b7f167ad13 /jdisc_core | |
| parent | d52e759812a446ae454f2829ee12e6d6e669592d (diff) | |
Use Guice 6.0
https://github.com/google/guice/wiki/Guice600
We cannot upgrade to 7.x as we export javax.inject from container.
6.x supports both the old javax.inject and the new jakarta.inject replacement.
Diffstat (limited to 'jdisc_core')
| -rw-r--r-- | jdisc_core/pom.xml | 3 | ||||
| -rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 4471269358a..009eee26d9c 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <classifier>no_aop</classifier> <!-- Non-AOP version required for Java 8 compatibility --> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -217,7 +216,7 @@ <!-- WARNING: Removing jars from the list below usually requires a new major Vespa version. --> <!-- NOTE: This list must be kept in sync with ExportPackagesIT.java --> <argument>__REPLACE_VERSION__${project.build.directory}/dependency/guava.jar</argument> - <argument>${project.build.directory}/dependency/guice-no_aop.jar</argument> + <argument>${project.build.directory}/dependency/guice.jar</argument> <argument>${project.build.directory}/dependency/slf4j-api.jar</argument> <argument>${project.build.directory}/dependency/slf4j-jdk14.jar</argument> <argument>${project.build.directory}/dependency/jcl-over-slf4j.jar</argument> diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java index b5a9e19bb2a..2d0b9ba9651 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java @@ -36,7 +36,7 @@ public class ExportPackagesIT { // This list must be kept in sync with the list in the export-packages execution in pom.xml. private static final List<String> RE_EXPORTED_BUNDLES = Stream.of( "guava.jar", - "guice-no_aop.jar", + "guice.jar", "slf4j-api.jar", "slf4j-jdk14.jar", "jcl-over-slf4j.jar", |