1. Atlassian
  2. Project: Atlassian
  3. atlassian-soy-templates

Commits

Jason Hinch [Atlassian]  committed 532428a Merge

Merged in jwinters/atlassian-soy-templates (pull request #35)

SOY-21: Use the provided sisu-guice rather than google guice

  • Participants
  • Parent commits 9220e9b, d6cba3a
  • Branches master

Comments (0)

Files changed (2)

File pom.xml

View file
         <slf4j.version>1.5.8</slf4j.version>
         <atlassian.concurrent.version>2.3.0</atlassian.concurrent.version>
         <commons.lang.version>2.6</commons.lang.version>
+        <sisu.guice.version>3.1.3</sisu.guice.version>
         <soy.version>20112212-r27-atlassian3</soy.version>
     </properties>
     <modules>
                 <groupId>com.google.template.soy</groupId>
                 <artifactId>soycompiler</artifactId>
                 <version>${soy.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.ibm.icu</groupId>
+                        <artifactId>icu4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <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>com.atlassian.sal</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>1.9.5</version>
             </dependency>
+            <dependency>
+                <groupId>org.sonatype.sisu.inject</groupId>
+                <artifactId>guice-multibindings</artifactId>
+                <version>${sisu.guice.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.sonatype.sisu.inject</groupId>
+                <artifactId>guice-assistedinject</artifactId>
+                <version>${sisu.guice.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.sonatype.sisu</groupId>
+                <artifactId>sisu-guice</artifactId>
+                <version>${sisu.guice.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.inject</groupId>
+                <artifactId>javax.inject</artifactId>
+                <version>1</version>
+            </dependency>
+            <dependency>
+                <groupId>aopalliance</groupId>
+                <artifactId>aopalliance</artifactId>
+                <version>1.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

File soy-template-plugin/pom.xml

View file
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.atlassian.soy</groupId>
                         <configuration>
                             <target>
                                 <echo>
-                                    Replacing first occurrence of /* with /*! in soyutils.js so we don't minify the license
+                                    Replacing first occurrence of /* with /*! in soyutils.js so we don't minify the
+                                    license
                                 </echo>
-                                <replaceregexp file="${project.basedir}/src/main/resources/js/soyutils.js" match="/\*" replace="/*!">
+                                <replaceregexp file="${project.basedir}/src/main/resources/js/soyutils.js" match="/\*"
+                                               replace="/*!">
                                 </replaceregexp>
                             </target>
                         </configuration>
                     <instructions>
                         <!-- we need to export enough of Soy for other plugins to be able to write custom functions -->
                         <Export-Package>com.atlassian.soy.renderer,<!-- Needed because it gets wrongly exported -->
-                        com.atlassian.soy.impl, <!--TODO TEMPORARY-->
-                        org.apache.commons.beanutils;version="${beanutils.version}",
-                        com.google.template.soy.shared,
-                        com.google.template.soy.shared.restricted,
-                        com.google.template.soy.data,
-                        com.google.template.soy.data.restricted,
-                        com.google.template.soy.tofu,
-                        com.google.template.soy.tofu.restricted,
-                        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.atlassian.soy.impl, <!--TODO TEMPORARY-->
+                            org.apache.commons.beanutils;version="${beanutils.version}",
+                            com.google.template.soy.shared,
+                            com.google.template.soy.shared.restricted,
+                            com.google.template.soy.data,
+                            com.google.template.soy.data.restricted,
+                            com.google.template.soy.tofu,
+                            com.google.template.soy.tofu.restricted,
+                            com.google.template.soy.jssrc,
+                            com.google.template.soy.jssrc.restricted,
+                            com.google.template.soy.base,
+                            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}",
         <dependency>
             <groupId>com.google.template.soy</groupId>
             <artifactId>soycompiler</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.ibm.icu</groupId>
-                    <artifactId>icu4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.sisu.inject</groupId>
+            <artifactId>guice-multibindings</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.sisu.inject</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.sisu</groupId>
+            <artifactId>sisu-guice</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>