Repository: struts Updated Branches: refs/heads/master ed1b8cc7b -> 617bfd23d
WW-2891 Cleans up poms and update Freemarker to the latest available version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/617bfd23 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/617bfd23 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/617bfd23 Branch: refs/heads/master Commit: 617bfd23d9deaa1b0e8783964f8d010ff83d7eb9 Parents: 692e763 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Oct 13 19:46:06 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Oct 13 19:46:30 2015 +0200 ---------------------------------------------------------------------- core/pom.xml | 65 +++++++++++++++++++++++++++++++++++-------------------- pom.xml | 3 ++- 2 files changed, 43 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/617bfd23/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index e87a4a4..2f78ca7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -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> @@ -130,6 +108,45 @@ <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> <plugins> http://git-wip-us.apache.org/repos/asf/struts/blob/617bfd23/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16bf852..8afd9ae 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
