Commit Graph

320 Commits

Author SHA1 Message Date
Lukasz Lenart f5c34b9b5b [maven-release-plugin] prepare for next development iteration 2016-04-19 08:32:52 +02:00
Lukasz Lenart d793648069 [maven-release-plugin] prepare release STRUTS_2_3_20_2 2016-04-19 08:32:05 +02:00
Lukasz Lenart 1bc68321cb Upgrades OGNL 2016-04-19 08:25:18 +02:00
Lukasz Lenart 18ebe2f698 [maven-release-plugin] prepare for next development iteration 2016-04-18 20:50:35 +02:00
Lukasz Lenart c7113e9d65 [maven-release-plugin] prepare release STRUTS_2_3_20_2 2016-04-18 20:50:17 +02:00
Lukasz Lenart a966570ad2 Sets SNAPSHOT version to allow prepare a new release 2016-04-18 20:40:50 +02:00
Lukasz Lenart a9974eec56 [maven-release-plugin] prepare release STRUTS_2_3_20_1 2015-05-06 07:57:47 +02:00
Lukasz Lenart 8ab3272d9f Sets SNAPSHOT version to allow release plugin to work 2015-05-03 20:44:32 +02: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
Lukasz Lenart fbd75a892b [maven-release-plugin] prepare for next development iteration 2014-04-24 21:32:49 +02:00
Lukasz Lenart 7dd83dff48 [maven-release-plugin] prepare release STRUTS_2_3_16_2 2014-04-24 21:32:35 +02:00
Lukasz Lenart 78096665fe Updates maven-release-plugin to solve problem with tagging 2014-04-24 21:13:06 +02:00
Lukasz Lenart 1540ab3c74 Updates maven-release-plugin to solve problem with tagging 2014-04-24 20:46:43 +02:00
Lukasz Lenart a2d0ecdcd3 Sets -SNAPSHOT version 2014-04-22 11:54:59 +02:00
Lukasz Lenart e1f97c8b07 [maven-release-plugin] prepare for next development iteration 2014-04-06 14:02:04 +02:00
Lukasz Lenart 7908a88a40 [maven-release-plugin] prepare release STRUTS_2_3_17 2014-04-06 14:01:53 +02:00
Lukasz Lenart 676e66b1d9 Corrects url closing tag and updates release plugin 2014-04-06 13:39:03 +02:00
Lukasz Lenart a5823058ab Updated project url 2014-04-06 13:31:51 +02:00
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