Commits

Don Brown  committed 2e101cb

JRA-28621 Upgrade guice to later build that fixes leak

  • Participants
  • Parent commits 3cf7d09

Comments (0)

Files changed (1)

File soy-template-plugin/pom.xml

                         com.google.template.soy.jssrc,
                         com.google.template.soy.jssrc.restricted,
                         com.google.template.soy.base,
-                        com.google.template.soy.internal.base,
-                        javax.inject,
+                        com.google.template.soy.internal.base
                         </Export-Package>
                         <Import-Package>
                             !com.google.inject.internal.asm.util,
+                            javax.inject*,
+                            org.aopalliance*,
                             com.atlassian.soy.renderer,
                             javax.servlet.http.*,
                             com.atlassian.sal.api*;version="${sal.version}",
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.inject</groupId>
+                    <artifactId>guice</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.inject.extensions</groupId>
+                    <artifactId>guice-assistedinject</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.inject.extensions</groupId>
+                    <artifactId>guice-multibindings</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.sonatype.sisu.inject</groupId>
+            <artifactId>guice-multibindings</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.sisu.inject</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.sisu</groupId>
+            <artifactId>sisu-guice</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>