You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/17 20:13:23 UTC
[03/11] struts git commit: WW-4402 JDK 8: build fails due to missing
apt tool
WW-4402 JDK 8: build fails due to missing apt tool
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08fad71a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08fad71a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08fad71a
Branch: refs/heads/master
Commit: 08fad71aafb1215438d65f817412a04b3584f5bb
Parents: 0ad77d4
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue May 26 09:36:33 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue May 26 09:36:33 2015 -0500
----------------------------------------------------------------------
core/pom.xml | 47 +++++++++++++++++------------------------------
pom.xml | 2 +-
2 files changed, 18 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/08fad71a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6eed44f..6d63119 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,38 +40,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <version>1.0.15</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <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>
+ <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>execute</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/struts/blob/08fad71a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83582ec..08e0d54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
</dependency>
<dependency>