Commit Graph

294 Commits

Author SHA1 Message Date
Lukasz Lenart 6064b0cd92 Updates Commons Lang3 version to match version before hotfix release 2014-03-06 22:53:03 +01:00
Lukasz Lenart 040fd67615 Bumps version to 2.3.17-SNAPSHOT 2014-03-06 21:57:37 +01:00
Lukasz Lenart a79955483b Merge branch 'release/fast-track-2-3-16-1'
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/site/resources/tags/checkboxlist.html
	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-03-06 21:41:39 +01:00
Lukasz Lenart b042b36365 [maven-release-plugin] prepare for next development iteration 2014-03-01 21:32:30 +01:00
Lukasz Lenart 6cddee6fc5 [maven-release-plugin] prepare release STRUTS_2_3_16 2014-03-01 21:31:38 +01:00
Lukasz Lenart 48f11742ed Updates <scm> tag 2014-03-01 16:57:21 +01:00
Lukasz Lenart 2dceb870fd Upgrades Commons File Upload to the latest version 2014-03-01 15:40:19 +01:00
Lukasz Lenart 19e73e48fa Reverts version to -SNAPSHOT 2014-03-01 15:34:10 +01:00
Johannes Geppert d71f9b70fd Update ciManagment section and change the outdated url value 2014-01-14 21:06:33 +01:00
Johannes Geppert 986771fa38 Update scm section with new git repository location 2014-01-14 21:04:08 +01:00
Lukasz Lenart 1a40ff505a Tests git migration 2014-01-14 18:07:14 +01:00
Lukasz Lenart 3c3168bff4 WW-4041 Uses the latest Commons Lang3 3.2 version and escapeJson method to solve problem with escaping single quote
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554923 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 21:27:30 +00:00
Lukasz Lenart 0df28a4194 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1546715 13f79535-47bb-0310-9956-ffa450edef68
2013-11-30 10:28:53 +00:00
Lukasz Lenart ced5f0ea1a [maven-release-plugin] prepare release STRUTS_2_3_16
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1546710 13f79535-47bb-0310-9956-ffa450edef68
2013-11-30 09:35:02 +00:00
Lukasz Lenart 615bf35f4f WW-4233 Adds UTF-8 encoding property to all poms
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1534982 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 10:56:53 +00:00
Christian Grobmeier ce5621bced support for markdown in site
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519983 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 11:11:54 +00:00
Lukasz Lenart ac5a18c4b8 Adds FEST assert to simplify testing
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519917 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 06:50:12 +00:00
Lukasz Lenart 303eb9f66d WW-3872 Moves files to appropriate locations
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1509085 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 06:04:23 +00:00
Bruce Allen Phillips ee0ab365a9 WW-4127 - updated version of commons-io from 2.0.1 to 2.2 to match commons-fileuploa's cross dependency on commons-io 2.2
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1504157 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 14:43:03 +00:00
Lukasz Lenart 597b14b13b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1493007 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 09:30:23 +00:00
Lukasz Lenart edb9c5e120 [maven-release-plugin] prepare release STRUTS_2_3_15
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1493005 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 09:29:42 +00:00
Lukasz Lenart eb2a9eb8ff WW-3593 Adds missing html files
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1486344 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 16:37:42 +00:00
Lukasz Lenart 62cb4575c3 WW-4072 Upgrade commons-logging to latest available version 1.1.3
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1485634 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 09:48:46 +00:00
Lukasz Lenart 1c5b931cfb WW-3958 Updates Apache Felix and adds option to cooperate with Felix integrated in Glassfish
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1484815 13f79535-47bb-0310-9956-ffa450edef68
2013-05-21 14:14:03 +00:00
Lukasz Lenart 01d979b039 WW-4070 Removes support for translating project to JDK4
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1484447 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 12:39:31 +00:00
Lukasz Lenart f3dc60ac8a WW-4021 Cleans up poms
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1484384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 07:29:24 +00:00
Lukasz Lenart 150088f79d WW-4020 Upgrades commons-logging into the latest 1.1.2 version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1484340 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 19:21:36 +00:00
Maurizio Cucchiara 341140426c Updated commons-fileupload to the latest version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1465025 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 16:21:50 +00:00
Lukasz Lenart e82957c5eb [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1462299 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:52:33 +00:00
Lukasz Lenart 07fca85b08 [maven-release-plugin] prepare release STRUTS_2_3_14
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1462297 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:51:02 +00:00
Lukasz Lenart 00ce58a3d6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1460302 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 09:58:59 +00:00
Lukasz Lenart 8ca0e87d35 [maven-release-plugin] prepare release STRUTS_2_3_13
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1460299 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 09:57:28 +00:00
Lukasz Lenart da6fa05ed9 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1453279 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 10:44:43 +00:00
Lukasz Lenart 0de4b61ff2 [maven-release-plugin] prepare release STRUTS_2_3_12
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1453277 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 10:44:20 +00:00
Lukasz Lenart 8daf1db8d9 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1451116 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 06:34:21 +00:00
Lukasz Lenart 8cefc26601 [maven-release-plugin] prepare release STRUTS_2_3_11
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1451114 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 06:33:55 +00:00
Lukasz Lenart 890e62bcf8 WW-3977 changes site target
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1451109 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 06:17:33 +00:00
Lukasz Lenart fe36e8bf08 Changes how links to parent site are generated
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1448580 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 11:06:22 +00:00
Lukasz Lenart 44615af72b Adjusts website to folder structure
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1445912 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 20:46:24 +00:00
Lukasz Lenart 0aefd0a8c1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1443341 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 07:54:10 +00:00
Lukasz Lenart feafa63d71 [maven-release-plugin] prepare release STRUTS_2_3_10
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1443339 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 07:53:43 +00:00
Lukasz Lenart a34bb460f5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1442037 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 07:11:54 +00:00
Lukasz Lenart 77d51c4222 [maven-release-plugin] prepare release STRUTS_2_3_9
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1442035 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 07:11:30 +00:00
Lukasz Lenart 98ec0ea1bb WW-3977 changes site target
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1442032 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 06:53:48 +00:00
Lukasz Lenart 8a8c193fde Corrects site endpoint
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1441896 13f79535-47bb-0310-9956-ffa450edef68
2013-02-03 11:46:19 +00:00
Lukasz Lenart 596858143f Adjusts site configuration to use new Apache scm plugin
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1441613 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 20:12:37 +00:00
Lukasz Lenart 186d2c1346 WW-3673 upgrades Log4j version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1435936 13f79535-47bb-0310-9956-ffa450edef68
2013-01-20 19:57:56 +00:00
Lukasz Lenart 6d5c38bea2 WW-3808 adds xerces to allow pass build on JDK7
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1435934 13f79535-47bb-0310-9956-ffa450edef68
2013-01-20 19:52:55 +00:00
Johannes Geppert 5f083d4b23 WW-3959 Support for Slf4j as optional XWork Logging Backend
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1431482 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 16:26:26 +00:00
Lukasz Lenart 612e6f6611 Reverts back site target
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1425299 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 15:43:47 +00:00