struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch struts-2-4 updated: Reverts to Java 1.6
Date Mon, 16 Apr 2018 07:00:04 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch struts-2-4
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/struts-2-4 by this push:
     new 4160ff3  Reverts to Java 1.6
4160ff3 is described below

commit 4160ff33d442adf5175159a37a7f19474f0d24b5
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Mon Apr 16 08:56:53 2018 +0200

    Reverts to Java 1.6
---
 apps/blank/pom.xml                                 |  2 +-
 apps/jboss-blank/pom.xml                           |  2 +-
 core/pom.xml                                       | 75 ++++++++--------------
 core/src/site/resources/tags/ajax/a.html           |  8 ---
 .../site/resources/tags/ajax/autocompleter.html    |  8 ---
 .../site/resources/tags/ajax/datetimepicker.html   |  8 ---
 core/src/site/resources/tags/ajax/div.html         |  8 ---
 core/src/site/resources/tags/ajax/submit.html      |  8 ---
 core/src/site/resources/tags/ajax/tabbedpanel.html |  8 ---
 core/src/site/resources/tags/ajax/textarea.html    |  8 ---
 core/src/site/resources/tags/ajax/tree.html        |  8 ---
 core/src/site/resources/tags/ajax/treenode.html    |  8 ---
 plugins/dojo/pom.xml                               | 41 ++++++++----
 plugins/embeddedjsp/pom.xml                        |  2 +-
 plugins/junit/pom.xml                              |  2 +-
 plugins/pom.xml                                    |  2 +-
 plugins/spring/pom.xml                             |  2 +-
 pom.xml                                            | 11 ++--
 18 files changed, 69 insertions(+), 142 deletions(-)

diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 44453e7..92e4c2c 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 899730d..cf184ff 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index cbfa816..c7c289b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,56 +39,37 @@
     <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>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Duser.language=en -Duser.region=US</argLine>
-                    <properties>
-                        <property>
-                            <name>maven.testng.output.dir</name>
-                            <value>${project.basedir}/target/surefire-reports</value>
-                        </property>
-                    </properties>
-                    <useSystemClassLoader>false</useSystemClassLoader>
-                    <additionalClasspathElements>
-                        <element>${project.build.testOutputDirectory}/xwork-jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork-zip.zip</element>
-                        <element>${project.build.testOutputDirectory}/xwork - jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork - zip.zip</element>
-                    </additionalClasspathElements>
+                    <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>
                     <includes>
-                        <include>**/*Test.java</include>
+                        <include>**/*.java</include>
                     </includes>
-                    <excludes>
-                        <exclude>**/XWorkTestCase.java</exclude>
-                        <exclude>**/TestBean.java</exclude>
-                        <exclude>**/TestBean2.java</exclude>
-                        <exclude>**/TestInterceptor.java</exclude>
-                        <exclude>**/AnnotatedTestBean.java</exclude>
-                        <exclude>**/DefaultFileManagerTest.java</exclude>
-                    </excludes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -302,7 +283,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/src/site/resources/tags/ajax/a.html b/core/src/site/resources/tags/ajax/a.html
index 6f4af2d..6b1293d 100644
--- a/core/src/site/resources/tags/ajax/a.html
+++ b/core/src/site/resources/tags/ajax/a.html
@@ -66,14 +66,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Comma delimmited list of topics that will published
before the request</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cssClass</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/autocompleter.html b/core/src/site/resources/tags/ajax/autocompleter.html
index f63ee49..7f9c2a5 100644
--- a/core/src/site/resources/tags/ajax/autocompleter.html
+++ b/core/src/site/resources/tags/ajax/autocompleter.html
@@ -66,14 +66,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Comma delimmited list of topics that will published
before the request</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cssClass</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/datetimepicker.html b/core/src/site/resources/tags/ajax/datetimepicker.html
index 6ff1b92..30c0817 100644
--- a/core/src/site/resources/tags/ajax/datetimepicker.html
+++ b/core/src/site/resources/tags/ajax/datetimepicker.html
@@ -50,14 +50,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">If true, weekly size of calendar changes to acomodate
the month if false, 42 day format is used</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cssClass</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/div.html b/core/src/site/resources/tags/ajax/div.html
index 2936d34..caa2a52 100644
--- a/core/src/site/resources/tags/ajax/div.html
+++ b/core/src/site/resources/tags/ajax/div.html
@@ -66,14 +66,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Comma delimmited list of topics that will published
before the request</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">closable</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top">false</td>
diff --git a/core/src/site/resources/tags/ajax/submit.html b/core/src/site/resources/tags/ajax/submit.html
index fab7f05..8f3f3d0 100644
--- a/core/src/site/resources/tags/ajax/submit.html
+++ b/core/src/site/resources/tags/ajax/submit.html
@@ -74,14 +74,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Comma delimmited list of topics that will published
before the request</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cssClass</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/tabbedpanel.html b/core/src/site/resources/tags/ajax/tabbedpanel.html
index 47ed9fd..00817df 100644
--- a/core/src/site/resources/tags/ajax/tabbedpanel.html
+++ b/core/src/site/resources/tags/ajax/tabbedpanel.html
@@ -58,14 +58,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Comma separated list of topics to be published when
a tab is clicked on (before it is selected)The tab container widget will be passed as the
first argument to the topic. The second parameter is the tab widget.The event can be cancelled
setting to 'true' the 'cancel' property of the third parameter passed to the topics.</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">closeButton</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/textarea.html b/core/src/site/resources/tags/ajax/textarea.html
index 778165b..edf8578 100644
--- a/core/src/site/resources/tags/ajax/textarea.html
+++ b/core/src/site/resources/tags/ajax/textarea.html
@@ -42,14 +42,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Set the html accesskey attribute on rendered html
element</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cols</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/tree.html b/core/src/site/resources/tags/ajax/tree.html
index ac86c26..c2d5ddc 100644
--- a/core/src/site/resources/tags/ajax/tree.html
+++ b/core/src/site/resources/tags/ajax/tree.html
@@ -58,14 +58,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">The childCollectionProperty property.</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">collapsedNotifyTopics</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/core/src/site/resources/tags/ajax/treenode.html b/core/src/site/resources/tags/ajax/treenode.html
index b03346a..0daad28 100644
--- a/core/src/site/resources/tags/ajax/treenode.html
+++ b/core/src/site/resources/tags/ajax/treenode.html
@@ -42,14 +42,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Set the html accesskey attribute on rendered html
element</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">class</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top"></td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The css class to use for element - it's an alias
of cssClass attribute.</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">cssClass</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top"></td>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 41960b0..05e222d 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -85,20 +85,37 @@
     <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=sx</arg>
-                        <arg>-AdisplayName=Struts Dojo Tags</arg>
-                        <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-dojo-tags.tld</arg>
-                        <arg>-Adescription="Struts AJAX tags based on Dojo."</arg>
-                        <arg>-AoutTemplatesDir=${basedir}/../../core/src/site/resources/tags/ajax</arg>
-                    </compilerArgs>
+                    <A>
+                        uri=/struts-dojo-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=sx,
+                        displayName="Struts Dojo Tags",
+                        outFile=${basedir}/target/classes/META-INF/struts-dojo-tags.tld,
+                        description="Struts AJAX tags based on Dojo.",
+                        outTemplatesDir=${basedir}/../../core/src/site/resources/tags/ajax
+                    </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>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 769d01a..09142ec 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 1fce4f7..813214c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index ecabe57..e39e620 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index b175db0..64a485e 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 5c0715a..d9de080 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
         <ognl.version>3.1.17</ognl.version>
         <asm.version>5.2</asm.version>
         <tiles.version>2.2.2</tiles.version>
-        <log4j2.version>2.11.0</log4j2.version>
+        <log4j2.version>2.3</log4j2.version>
         <tlib.version>2.3</tlib.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -126,10 +126,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.7.0</version>
+                    <version>3.6.1</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -143,6 +143,7 @@
                         <excludes>
                             <exclude>**/TestBean.java</exclude>
                             <exclude>**/Struts2PortletTest.java</exclude>
+                            <exclude>**/ChartResultTest.java</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
@@ -334,7 +335,7 @@
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.5</version>
             </dependency>
 
             <dependency>

-- 
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.

Mime
View raw message