Commit Graph

353 Commits

Author SHA1 Message Date
Lukasz Lenart 98d7756cbb [maven-release-plugin] prepare for next development iteration 2015-07-17 09:36:30 +02:00
Lukasz Lenart 2a37a2e32d [maven-release-plugin] prepare release STRUTS_2_5_BETA1 2015-07-17 09:36:16 +02:00
Lukasz Lenart 3bbe681346 WW-4207 Upgrades OGNL to latest available version 2015-06-22 08:33:59 +02:00
Lukasz Lenart 31af5842e0 Merges xwork packages into struts 2015-06-17 23:08:04 +02:00
Aaron Johnson c71c3def74 WW-4515 Convert try blocks to try-with-resources 2015-06-17 09:32:57 -05:00
Aaron Johnson 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
Johannes Geppert 3720bbff41 Fiy typo in commons-digester artifact id 2015-06-17 08:04:13 +02:00
Aaron Johnson 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
Johannes Geppert bacc571444 Switch to latest commons-collections, commons-io, commons-lang3 and commons-digester versions 2015-06-16 20:52:26 +02:00
Johannes Geppert 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
Johannes Geppert c951b15c1c Merge branch 'master' into spring4 2015-06-07 11:55:02 +02:00
Johannes Geppert 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
Johannes Geppert d788700009 WW-4510 Upgrade spring plugin dependencies to spring version 4.x 2015-06-07 11:35:46 +02:00
Aaron Johnson 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
Lukasz Lenart 0a71c5c9af Drops version of maven-compiler-plugin as this breaks build 2015-05-28 10:11:42 +02:00
Lukasz Lenart 25cdfd62e3 WW-4503 Sitches to JDK7 2015-05-28 08:22:24 +02:00
Johannes Geppert 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
Aaron Johnson b922d5aad1 Merge branch 'master' of github.com:apache/struts 2015-05-26 15:41:20 -05:00
Johannes Geppert 73ef38d727 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into WW-4504 2015-05-26 19:14:34 +02:00
Lukasz Lenart 8c2b321aa0 Cleans up after dropping deprecated plugins 2015-05-26 18:39:34 +02:00
Aaron Johnson 08fad71aaf WW-4402 JDK 8: build fails due to missing apt tool 2015-05-26 09:36:33 -05:00
Johannes Geppert 340312ed3f WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Switch to latest log4j2 version
2015-05-25 12:25:23 +02:00
Aaron Johnson e262854e2a WW-4503 Build Struts with JDK 7 2015-05-22 09:28:08 -05:00
Lukasz Lenart 9a33d29bec Starts work on 2.5 version 2015-05-21 20:43:19 +02:00
Lukasz Lenart c19a14f1a7 [maven-release-plugin] prepare for next development iteration 2015-05-03 12:08:08 +02:00
Lukasz Lenart 925741ad1e [maven-release-plugin] prepare release STRUTS_2_3_24 2015-05-03 12:07:56 +02:00
Johannes Geppert 7afa4ae925 WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Move log4j2 version to properties
2015-05-01 11:19:51 +02:00
Johannes Geppert 48c0764f73 WW-4492 Add support for Log4J2 as a struts and xwork logging backend 2015-04-18 12:29:13 +02:00
Lukasz Lenart 75027a3cb8 Sets proper version 2015-04-07 11:27:40 +02:00
Lukasz Lenart 6d16144e31 Sets proper version 2015-04-07 11:26:30 +02:00
Lukasz Lenart a31af91199 [maven-release-plugin] prepare for next development iteration 2015-04-07 09:52:42 +02:00
Lukasz Lenart d469fffed9 [maven-release-plugin] prepare release STRUTS_2_3_23 2015-04-07 09:52:32 +02:00
Lukasz Lenart 4651f37501 WW-4484 Upgrades Freemarker 2015-04-03 07:16:29 +02:00
Lukasz Lenart 3e23f2191e [maven-release-plugin] prepare for next development iteration 2015-03-19 07:11:27 +01:00
Lukasz Lenart 22573f8de8 [maven-release-plugin] prepare release STRUTS_2_3_22 2015-03-19 07:11:15 +01:00
Lukasz Lenart 22cbf40fc2 [maven-release-plugin] prepare for next development iteration 2014-12-31 14:53:22 +01:00
Lukasz Lenart a40e9a90bf [maven-release-plugin] prepare release STRUTS_2_3_21 2014-12-31 14:53:04 +01:00
Lukasz Lenart 6774e840c8 Reverts to old version of ASM and adds ASM 5 as well 2014-12-20 21:44:18 +01:00
Lukasz Lenart 5f2898eadf Cleans up Maven generated website 2014-12-02 12:41:06 +01:00
Lukasz Lenart ae4e3d116b Reformats source code 2014-11-21 21:55:40 +01:00
Lukasz Lenart 5078537ff6 [maven-release-plugin] prepare for next development iteration 2014-11-21 19:30:20 +01:00
Lukasz Lenart 0320310406 [maven-release-plugin] prepare release STRUTS_2_3_20 2014-11-21 19:30:08 +01:00
Lukasz Lenart f7f4915bd3 [maven-release-plugin] prepare for next development iteration 2014-11-14 08:31:27 +01:00
Lukasz Lenart 0032390ee8 [maven-release-plugin] prepare release STRUTS_2_3_19 2014-11-14 08:31:12 +01:00
Lukasz Lenart 70af4b649a Prepares for next development cycle 2014-11-14 08:17:15 +01:00
Lukasz Lenart e01109697f WW-4347 Adds support for JDK8 lambdas 2014-09-16 09:37:37 +02:00
Lukasz Lenart ce49822e1e Adds mockito mocking lib 2014-08-05 09:37:44 +02:00
Lukasz Lenart 2da93000d7 WW-4326 Defines bom to simplify version management 2014-07-09 21:06:29 +02:00
Lukasz Lenart 3575bebf01 Corrects version in poms 2014-04-28 08:52:37 +02:00
Lukasz Lenart 1be8ed61e4 Merge branch 'hotfix/2.3.16.2'
Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	core/src/main/resources/struts-default.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml
2014-04-28 08:50:53 +02:00