Commits

Samuel Le Berrigaud committed 4b3c886

Up version of Plugins. Use non-default AbstractModuleDescriptor constructor.

  • Participants
  • Parent commits 0c9f1f7

Comments (0)

Files changed (4)

     </licenses>
 
     <properties>
-        <plugins.version>2.9.1</plugins.version>
+        <plugins.version>2.13.3-SNAPSHOT</plugins.version>
+        <webresource.version>2.13.3-SNAPSHOT</webresource.version>
         <sal.version>2.7.0</sal.version>
         <guava.version>10.0.1</guava.version>
         <guava.osgi.version>6.0.0</guava.osgi.version>
             <dependency>
                 <groupId>com.atlassian.plugins</groupId>
                 <artifactId>atlassian-plugins-webresource</artifactId>
-                <version>${plugins.version}</version>
+                <version>${webresource.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>log4j</artifactId>

soy-template-plugin/pom.xml

                             com.google.common.*;version="${guava.osgi.version}",
                             org.slf4j;version="${slf4j.version}",
                             org.apache.commons.beanutils;version="${beanutils.version}",
-                            org.apache.commons.lang;version="${commons.lang.version}",
+                            org.apache.commons.lang;version="[2.0,3.0)",
                             org.apache.commons.logging,
                             org.xml.sax;version="0.0.0",
                             org.xml.sax.helpers;version="0.0.0",

soy-template-plugin/src/main/resources/atlassian-plugin.xml

     <component-import key="i18nResolver" interface="com.atlassian.sal.api.message.I18nResolver" />
     <component-import key="applicationProperties" interface="com.atlassian.sal.api.ApplicationProperties" />
     <component-import key="webResourceManager" interface="com.atlassian.plugin.webresource.WebResourceManager" />
+    <component-import key="moduleFactory" interface="com.atlassian.plugin.module.ModuleFactory" />
 
     <component key="soyManager" name="Soy Manager" class="com.atlassian.soy.impl.DefaultSoyManager">
         <interface>com.atlassian.soy.impl.SoyManager</interface>

soy-template-renderer-api/src/main/java/com/atlassian/soy/renderer/SoyResourceModuleDescriptor.java

 
 import com.atlassian.plugin.Plugin;
 import com.atlassian.plugin.PluginParseException;
-import com.atlassian.plugin.descriptors.AbstractModuleDescriptor;
 import com.atlassian.plugin.hostcontainer.HostContainer;
 import com.atlassian.plugin.module.ContainerManagedPlugin;
+import com.atlassian.plugin.module.ModuleFactory;
 import com.atlassian.plugin.util.ClassLoaderUtils;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import org.dom4j.Element;
 import com.atlassian.plugin.webresource.WebResourceModuleDescriptor;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class SoyResourceModuleDescriptor extends WebResourceModuleDescriptor
 {
-
     public static final String XML_ELEMENT_NAME = "soy-resource".intern(); // Prevent compiler replacement of constants for literals
 
     private Iterable<String> functionNames = Collections.emptyList();
     private Iterable<Class<?>> nativeFunctions = Collections.emptyList();
     private HostContainer hostContainer;
 
-    public SoyResourceModuleDescriptor(final HostContainer hostContainer)
+    public SoyResourceModuleDescriptor(final ModuleFactory moduleFactory, final HostContainer hostContainer)
     {
-        super(hostContainer);
+        super(moduleFactory, hostContainer);
         this.hostContainer = hostContainer;
     }