3a78fd1a11
[maven-release-plugin] prepare for next development iteration
2016-05-05 15:21:50 +02:00
4bee55fee3
[maven-release-plugin] prepare release STRUTS_2_5
2016-05-05 15:21:26 +02:00
4ad085469e
Upgrades common-collections
2016-05-05 10:37:09 +02:00
0bde27169a
Upgrades OGNL to the latest version
2016-05-04 09:06:36 +02:00
2b92ebb500
Upgrades lib to latest version
2016-03-04 18:39:24 +01:00
754c8a247a
WW-4593 Upgrades easy-mock
2016-03-04 07:09:53 +01:00
d8e4cb8b48
Merge branch 'master' into easymock_update
...
# Conflicts:
# core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
2016-03-03 17:43:17 -04:00
e5d693a8df
WW-3940 Upgrades Velocity tools
2016-03-03 17:38:37 +01:00
94691e0afd
Every 2nd build on jenkins with jdk8 fails while generating javadoc for tiles-plugin. It fails at file serialized-form.html because it misses class org.apache.tiles.context.TilesRequestContextWrapper. That class was present in tiles 2 but is not present in tiles 3 anymore. To avoid failing builds due to this failOnError is set to false.
2016-02-01 11:33:20 +01:00
249d2f8d83
[maven-release-plugin] prepare for next development iteration
2016-01-21 09:26:18 +01:00
9a63e6504b
[maven-release-plugin] prepare release STRUTS_2_5_BETA3
2016-01-21 09:25:54 +01:00
0835c33adf
Cleans up after migrating to Tiles 3 and dropped struts2-tiles3-plugin
2016-01-21 09:20:05 +01:00
83910714e8
WW-3940 Upgrade to Velocity Tools 2.0
...
JWebUnit upgrade to 3.3 too
2016-01-20 17:42:54 -04:00
20e13f1625
WW-4593 Easymock upgrade to 3.4
2016-01-20 16:28:36 -04:00
d923c7c4f2
WW-4584 Upgrades Tiles plugin to Tiles 3
...
Also drops existing Tiles 3 plugin
2016-01-18 15:55:59 +01:00
9f6a0c9c94
WW-4403 - add JDK 8 profile, disabling JavaDoc lint checker when building with JDK8
...
(cherry picked from commit 7c4bb7e
2016-01-14 17:47:43 +01:00
b417894ebc
Adds missing dependencies to tiles-request
2016-01-13 12:04:43 +01:00
e56d8b2e07
Merge remote-tracking branch 'upstream/master' into upgrade-tiles-plugin
...
Conflicts:
pom.xml
2016-01-12 10:42:04 +01:00
33edfffbe2
Migrates tiles-portlet to the same version
2016-01-12 10:36:46 +01:00
4638b33457
Adds missing Tiles API dependency
2016-01-12 10:13:38 +01:00
af82d23c95
Upgrade Tiles dependencies
2016-01-12 08:51:14 +01:00
9cc383e436
Fix to ww-4577 and ww-4576
...
Upgrade OGNL to version 3.1.2
Upgrade to Log4j2 version 2.5
2015-12-31 16:53:38 -04:00
6622fab25b
Fixes dependency clash
2015-11-27 16:09:37 +01:00
6edc0ff5e0
Updates Portal Tiles integration
2015-11-25 20:37:42 +01:00
85b219813f
Adds required dependencies
2015-11-25 20:22:31 +01:00
7a06fe47e1
WW-4567 Cleans up poms
2015-11-12 20:45:21 +01:00
afb0c2a228
WW-4561 Upgrades OGNL to 3.1.1
2015-11-04 18:15:37 +01:00
617bfd23d9
WW-2891 Cleans up poms and update Freemarker to the latest available version
2015-10-13 19:46:30 +02:00
9c5c568fc5
Upgrades to master-10 and cleans up plugins
2015-10-13 06:54:12 +02:00
221ef32e37
WW-4402 Updates struts-annotations to support JDK8
2015-10-06 08:21:28 +02:00
6fbdab1848
[maven-release-plugin] prepare for next development iteration
2015-09-28 21:15:50 +02:00
56ae397d75
[maven-release-plugin] prepare release STRUTS_2_5_BETA2
2015-09-28 21:15:38 +02:00
98d7756cbb
[maven-release-plugin] prepare for next development iteration
2015-07-17 09:36:30 +02:00
2a37a2e32d
[maven-release-plugin] prepare release STRUTS_2_5_BETA1
2015-07-17 09:36:16 +02:00
3bbe681346
WW-4207 Upgrades OGNL to latest available version
2015-06-22 08:33:59 +02:00
31af5842e0
Merges xwork packages into struts
2015-06-17 23:08:04 +02:00
c71c3def74
WW-4515 Convert try blocks to try-with-resources
2015-06-17 09:32:57 -05:00
bf15ad20b1
Merge branch 'master' of github.com:apache/struts into feature/WW-4515
...
# By Johannes Geppert
# Via Johannes Geppert
* 'master' of github.com:apache/struts:
Fiy typo in commons-digester artifact id
2015-06-17 08:35:24 -05:00
3720bbff41
Fiy typo in commons-digester artifact id
2015-06-17 08:04:13 +02:00
ebf4b170c0
Merge branch 'master' of github.com:apache/struts
...
# By Johannes Geppert (16) and others
# Via Johannes Geppert (2) and others
* 'master' of github.com:apache/struts: (27 commits)
Switch to latest commons-collections, commons-io, commons-lang3 and commons-digester versions
Minor code improvements's in the cdi, convention, jasperreports, junit, rest and sitemesh plugin
Minor code improvements's in the xwork-core module
Remove provider class generic to fix compile error which breaks the build
adjusted h1 to match page title
fixed display of last two fields
using java.util.Date instead of java.sql.Date
using ObjectFactory instead of Class.forName()
small updates to logging
WW-4513 Move mailreader app to struts2-examples
WW-4512 Move struts2 jboss-blank app to struts2-examples
WW-4511 Move struts2 blank app to struts2-examples
added some more eclipse specific directories to .gitignore
added testcase for action with method prefixed by 'do'
fixed some typos in javadoc
fixed some generics related warnings and did a little re-formatting
added missing jquery file
Minor code improvement's in the struts json plugin
Minor code improvement's in the struts spring plugin
Minor code improvements's in the struts core module
...
2015-06-16 14:24:38 -05:00
bacc571444
Switch to latest commons-collections, commons-io, commons-lang3 and commons-digester versions
2015-06-16 20:52:26 +02:00
243c92bf46
WW-4510 Upgrade spring plugin dependencies to spring version 4.x
...
- The Servlet API mocks in Spring Framework 4.x only supports Servlet 3.0 and higher
2015-06-07 20:59:42 +02:00
c951b15c1c
Merge branch 'master' into spring4
2015-06-07 11:55:02 +02:00
9c67e4e836
Solve problem when xwork and core tests are running on a machine where default local is different from "en"
2015-06-07 11:54:46 +02:00
d788700009
WW-4510 Upgrade spring plugin dependencies to spring version 4.x
2015-06-07 11:35:46 +02:00
6c9ca6201c
Merge branch 'master' of github.com:apache/struts
...
# By Johannes Geppert (9) and others
# Via Johannes Geppert (3) and Lukasz Lenart (1)
* 'master' of github.com:apache/struts:
Refactor showcase and migrate to bootstrap 3
WW-4505 Add plugin to support bean validation
Drops version of maven-compiler-plugin as this breaks build
WW-4503 Sitches to JDK7
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Create README.md
Add test cases for ModelDriven action, standard actions and FieldMatch validator
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
Fix missing import of LoggerFactory
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
2015-05-29 10:42:12 -05:00
0a71c5c9af
Drops version of maven-compiler-plugin as this breaks build
2015-05-28 10:11:42 +02:00
25cdfd62e3
WW-4503 Sitches to JDK7
2015-05-28 08:22:24 +02:00
b6afefeea7
WW-4505 Add plugin to support bean validation
...
Add new bean validation plugin to assembly, bom and parent sections
2015-05-27 20:56:17 +02:00
b922d5aad1
Merge branch 'master' of github.com:apache/struts
2015-05-26 15:41:20 -05:00
Lukasz Lenart