diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-04 17:51:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 17:51:15 +0200 |
| commit | bedbd44069d0464bbd23a367e144cb32fad4573a (patch) | |
| tree | 3f11fb611e970719b1b4dcabf9f015ab34dd91e6 /jdisc_core | |
| parent | ecc63b46114df6049464af2956a8cd2f1beee156 (diff) | |
| parent | bb436916fd27e669ba0107761312d1cd4229a303 (diff) | |
Merge pull request #28370 from vespa-engine/renovate/major-guice.vespa.version
Update dependency com.google.inject:guice to v7
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 e8529533320..9bc27cd4e77 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -82,7 +82,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> @@ -208,7 +207,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", |