struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject struts git commit: WW-4402 Updates struts-annotations to support JDK8
Date Tue, 06 Oct 2015 06:43:15 GMT
Repository: struts
Updated Branches:
  refs/heads/master a6241552b -> 221ef32e3


WW-4402 Updates struts-annotations to support JDK8


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/221ef32e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/221ef32e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/221ef32e

Branch: refs/heads/master
Commit: 221ef32e37dfd7b8e2a10e7c1586609d4cba8aec
Parents: a624155
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Tue Oct 6 08:21:23 2015 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Tue Oct 6 08:21:28 2015 +0200

----------------------------------------------------------------------
 core/pom.xml | 42 +++++++++++++++++++-----------------------
 pom.xml      |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/221ef32e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b5088f7..e87a4a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,35 +40,31 @@
     <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>
+                <version>3.3</version>
                 <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>
+                            <goal>compile</goal>
                         </goals>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/struts/blob/221ef32e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3e8df70..678e5b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,7 @@
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
-                <version>1.0.5</version>
+                <version>1.0.6</version>
             </dependency>
 
             <dependency>


Mime
View raw message