WW-2891 Cleans up poms and update Freemarker to the latest available version

This commit is contained in:
Lukasz Lenart
2015-10-13 19:46:06 +02:00
parent 692e763e43
commit 617bfd23d9
2 changed files with 43 additions and 25 deletions
+41 -24
View File
@@ -42,32 +42,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<compilerArgs>
<arg>-Auri=/struts-tags</arg>
<arg>-AtlibVersion=${tlib.version}</arg>
<arg>-AjspVersion=2.0</arg>
<arg>-AshortName=s</arg>
<arg>-AdisplayName=Struts Tags</arg>
<arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
<arg>-Adescription="To make it easier to access dynamic data;
the Apache Struts framework includes a library of custom tags.
The tags interact with the framework's validation and
internationalization features;
to ensure that input is correct and output is localized.
The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
<arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
</compilerArgs>
<source>1.7</source>
<target>1.7</target>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,6 +107,45 @@
</build>
<profiles>
<profile>
<id>build-maven</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-Auri=/struts-tags</arg>
<arg>-AtlibVersion=${tlib.version}</arg>
<arg>-AjspVersion=2.0</arg>
<arg>-AshortName=s</arg>
<arg>-AdisplayName=Struts Tags</arg>
<arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
<arg>-Adescription="To make it easier to access dynamic data;
the Apache Struts framework includes a library of custom tags.
The tags interact with the framework's validation and
internationalization features;
to ensure that input is correct and output is localized.
The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
<arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
</compilerArgs>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>alljars</id>
<build>
+2 -1
View File
@@ -161,6 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -455,7 +456,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.22</version>
<version>2.3.23</version>
</dependency>
<dependency>