WW-4515 Convert try blocks to try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c71c3def Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c71c3def Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c71c3def Branch: refs/heads/master Commit: c71c3def74aae42ad205bd1ec839044c220b7ac0 Parents: 3fab155 Author: Aaron Johnson <[email protected]> Authored: Wed Jun 17 09:32:57 2015 -0500 Committer: Aaron Johnson <[email protected]> Committed: Wed Jun 17 09:32:57 2015 -0500 ---------------------------------------------------------------------- core/pom.xml | 47 ++++++++++++++++++++++++++++++----------------- pom.xml | 3 +-- 2 files changed, 31 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/c71c3def/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index dd91ca1..be09a0b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -40,25 +40,38 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <groupId>org.apache.myfaces.tobago</groupId> + <artifactId>maven-apt-plugin</artifactId> + <version>1.0.15</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> + <A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName=Struts Tags, + outFile=${basedir}/target/classes/META-INF/struts-tags.tld, + description="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.", + outTemplatesDir=${basedir}/src/site/resources/tags + </A> + <resourceTargetPath>target</resourceTargetPath> + <fork>false</fork> + <force>true</force> + <nocompile>true</nocompile> + <showWarnings>true</showWarnings> + <factory>org.apache.struts.annotations.taglib.apt.TLDAnnotationProcessorFactory</factory> + <target>1.5</target> + <includes> + <include>**/*.java</include> + </includes> </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>execute</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/struts/blob/c71c3def/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 32e16c9..73d9599 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,6 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -354,7 +353,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-annotations</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.5</version> </dependency> <dependency>
