You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/05/05 06:44:47 UTC
[01/19] git commit: Merge branch 'release/2.3.17'
Repository: struts
Updated Branches:
refs/heads/feature/exclude-object-class ba0ac0dfd -> a5946d081
Merge branch 'release/2.3.17'
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6d55d015
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6d55d015
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6d55d015
Branch: refs/heads/feature/exclude-object-class
Commit: 6d55d01522a34310ad4f2b2580d90cdd402886b9
Parents: a77f28d e1f97c8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Apr 6 16:00:55 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Apr 6 16:00:55 2014 +0200
----------------------------------------------------------------------
.gitignore | 3 +
apps/blank/README.txt | 8 +-
apps/blank/pom.xml | 4 +-
apps/blank/src/main/webapp/WEB-INF/web.xml | 5 +
apps/jboss-blank/README.txt | 8 +-
apps/jboss-blank/pom.xml | 4 +-
apps/jboss-blank/src/main/resources/example.xml | 6 +-
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 +
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 +
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 +
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 +
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 +
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 +
.../jboss-blank/src/main/webapp/WEB-INF/web.xml | 17 +
.../src/main/webapp/example/HelloWorld.jsp | 28 -
.../src/main/webapp/example/Login.jsp | 15 -
.../src/main/webapp/example/Menu.jsp | 3 -
.../src/main/webapp/example/Missing.jsp | 11 -
.../src/main/webapp/example/Register.jsp | 3 -
.../src/main/webapp/example/Welcome.jsp | 18 -
apps/mailreader/README.txt | 9 +-
apps/mailreader/pom.xml | 4 +-
.../src/main/java/mailreader-support.xml | 10 +-
.../src/main/webapp/ChangePassword.jsp | 25 -
apps/mailreader/src/main/webapp/Error.jsp | 40 -
apps/mailreader/src/main/webapp/Footer.jsp | 6 -
apps/mailreader/src/main/webapp/Login.jsp | 30 -
apps/mailreader/src/main/webapp/MainMenu.jsp | 25 -
.../mailreader/src/main/webapp/Registration.jsp | 115 ---
.../mailreader/src/main/webapp/Subscription.jsp | 60 --
.../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 +
.../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 +
.../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 +
.../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 +
.../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 +
.../main/webapp/WEB-INF/jsp/Registration.jsp | 115 +++
.../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 ++
.../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 ++
apps/mailreader/src/main/webapp/WEB-INF/web.xml | 17 +
apps/mailreader/src/main/webapp/Welcome.jsp | 55 --
apps/pom.xml | 3 +-
apps/portlet/README.txt | 9 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/README.txt | 15 +
apps/rest-showcase/pom.xml | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 17 +
apps/showcase/README.txt | 8 +-
apps/showcase/pom.xml | 2 +-
.../main/resources/struts-actionchaining.xml | 2 +-
.../showcase/src/main/resources/struts-ajax.xml | 69 +-
.../showcase/src/main/resources/struts-chat.xml | 28 +-
.../src/main/resources/struts-conversion.xml | 44 +-
.../src/main/resources/struts-filedownload.xml | 4 +
.../src/main/resources/struts-fileupload.xml | 14 +-
.../src/main/resources/struts-freemarker.xml | 4 +-
.../src/main/resources/struts-hangman.xml | 18 +-
.../src/main/resources/struts-integration.xml | 6 +-
.../src/main/resources/struts-interactive.xml | 7 +-
apps/showcase/src/main/resources/struts-jsf.xml | 4 +
.../src/main/resources/struts-model-driven.xml | 4 +-
.../src/main/resources/struts-tags-non-ui.xml | 57 +-
.../src/main/resources/struts-tags-ui.xml | 58 +-
.../src/main/resources/struts-tiles.xml | 2 +-
.../src/main/resources/struts-token.xml | 24 +-
.../src/main/resources/struts-validation.xml | 37 +-
.../showcase/src/main/resources/struts-wait.xml | 24 +-
apps/showcase/src/main/resources/struts.xml | 25 +-
.../actionchaining/actionChainingResult.jsp | 23 +
.../src/main/webapp/WEB-INF/ajax/AjaxResult.jsp | 12 +
.../src/main/webapp/WEB-INF/ajax/AjaxResult2.js | 2 +
.../main/webapp/WEB-INF/ajax/AjaxResult3.jsp | 12 +
.../webapp/WEB-INF/ajax/autocompleter/index.jsp | 186 +++++
.../src/main/webapp/WEB-INF/ajax/bind/index.jsp | 61 ++
.../main/webapp/WEB-INF/ajax/commonInclude.jsp | 5 +
.../src/main/webapp/WEB-INF/ajax/footer.jsp | 8 +
.../src/main/webapp/WEB-INF/ajax/options.ftl | 5 +
.../webapp/WEB-INF/ajax/remotebutton/index.jsp | 70 ++
.../webapp/WEB-INF/ajax/remotediv/example1.jsp | 23 +
.../webapp/WEB-INF/ajax/remotediv/example10.jsp | 31 +
.../webapp/WEB-INF/ajax/remotediv/example2.jsp | 28 +
.../webapp/WEB-INF/ajax/remotediv/example3.jsp | 27 +
.../webapp/WEB-INF/ajax/remotediv/example4.jsp | 28 +
.../webapp/WEB-INF/ajax/remotediv/example5.jsp | 27 +
.../webapp/WEB-INF/ajax/remotediv/example6.jsp | 24 +
.../webapp/WEB-INF/ajax/remotediv/example7.jsp | 27 +
.../webapp/WEB-INF/ajax/remotediv/example8.jsp | 57 ++
.../webapp/WEB-INF/ajax/remotediv/example9.jsp | 63 ++
.../webapp/WEB-INF/ajax/remotediv/index.jsp | 55 ++
.../webapp/WEB-INF/ajax/remoteforms/index.jsp | 119 +++
.../webapp/WEB-INF/ajax/remotelink/index.jsp | 127 +++
.../WEB-INF/ajax/tabbedpanel/example1.jsp | 95 +++
.../WEB-INF/ajax/tabbedpanel/example2.jsp | 26 +
.../WEB-INF/ajax/tabbedpanel/example3.jsp | 46 +
.../WEB-INF/ajax/tabbedpanel/example4.jsp | 57 ++
.../WEB-INF/ajax/tabbedpanel/example5.jsp | 29 +
.../WEB-INF/ajax/tabbedpanel/example5Ok.jsp | 9 +
.../WEB-INF/ajax/tabbedpanel/example6.jsp | 40 +
.../webapp/WEB-INF/ajax/tabbedpanel/index.jsp | 28 +
.../ajax/tabbedpanel/nodecorate/panel1.ftl | 3 +
.../ajax/tabbedpanel/nodecorate/panel2.ftl | 7 +
.../tabbedpanel/nodecorate/panel2Submit.ftl | 2 +
.../ajax/tabbedpanel/nodecorate/panel3.ftl | 9 +
.../tabbedpanel/nodecorate/panel3Submit.ftl | 2 +
.../src/main/webapp/WEB-INF/ajax/testjs.jsp | 14 +
.../webapp/WEB-INF/ajax/tree/getCategory.jsp | 23 +
.../WEB-INF/ajax/tree/partialChunkHeader.jsp | 6 +
.../main/webapp/WEB-INF/ajax/tree/toggle.jsp | 12 +
.../src/main/webapp/WEB-INF/ajax/tree/tree.jsp | 13 +
.../main/webapp/WEB-INF/ajax/widgets/index.jsp | 40 +
.../src/main/webapp/WEB-INF/chat/chatLogin.ftl | 27 +
.../src/main/webapp/WEB-INF/chat/createRoom.ftl | 2 +
.../src/main/webapp/WEB-INF/chat/index.jsp | 3 +
.../WEB-INF/chat/messagesAvailableInRoom.ftl | 33 +
.../main/webapp/WEB-INF/chat/roomSelection.ftl | 172 ++++
.../main/webapp/WEB-INF/chat/roomsAvailable.ftl | 44 +
.../WEB-INF/chat/sendMessageToRoomResult.ftl | 2 +
.../src/main/webapp/WEB-INF/chat/showRoom.ftl | 167 ++++
.../main/webapp/WEB-INF/chat/usersAvailable.ftl | 6 +
.../WEB-INF/chat/usersAvailableInRoom.ftl | 8 +
.../webapp/WEB-INF/conversion/Address.java.txt | 35 +
.../WEB-INF/conversion/AddressAction.java.txt | 44 +
.../conversion/EnumTypeConverter.java.txt | 55 ++
.../WEB-INF/conversion/OperationsEnum.java.txt | 30 +
.../conversion/OperationsEnumAction.java.txt | 53 ++
.../OperationsEnumActionConversion.txt | 4 +
.../webapp/WEB-INF/conversion/Person.java.txt | 34 +
.../WEB-INF/conversion/PersonAction.java.txt | 43 +
.../WEB-INF/conversion/enterAddressInfo.jsp | 53 ++
.../WEB-INF/conversion/enterOperations.jsp | 38 +
.../WEB-INF/conversion/enterPersonInfo.jsp | 67 ++
.../main/webapp/WEB-INF/conversion/index.jsp | 35 +
.../WEB-INF/conversion/showAddressInfo.jsp | 21 +
.../WEB-INF/conversion/showOperations.jsp | 21 +
.../WEB-INF/conversion/showPersonInfo.jsp | 24 +
apps/showcase/src/main/webapp/WEB-INF/date.jsp | 2 +
.../src/main/webapp/WEB-INF/decorators/main.jsp | 34 +-
.../webapp/WEB-INF/empmanager/editEmployee.jsp | 56 ++
.../webapp/WEB-INF/empmanager/editSkill.jsp | 42 +
.../webapp/WEB-INF/empmanager/listEmployees.jsp | 43 +
.../webapp/WEB-INF/empmanager/listSkills.jsp | 41 +
.../main/webapp/WEB-INF/filedownload/index.jsp | 36 +
.../fileupload/multipleUploadUsingArray.jsp | 32 +
.../fileupload/multipleUploadUsingList.jsp | 32 +
.../WEB-INF/fileupload/upload-success.jsp | 31 +
.../main/webapp/WEB-INF/fileupload/upload.jsp | 27 +
.../freemarker/customFreemarkerManagerUsage.ftl | 34 +
.../main/webapp/WEB-INF/freemarker/index.jsp | 3 +
.../webapp/WEB-INF/freemarker/standardTags.ftl | 24 +
.../src/main/webapp/WEB-INF/hangman/blank.ftl | 0
.../main/webapp/WEB-INF/hangman/hangmanAjax.ftl | 247 ++++++
.../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 144 ++++
.../hangman/updateCharacterAvailable.ftl | 45 +
.../webapp/WEB-INF/hangman/updateGuessLeft.ftl | 7 +
.../webapp/WEB-INF/hangman/updateScaffold.ftl | 3 +
.../WEB-INF/hangman/updateVocabCharacters.ftl | 20 +
apps/showcase/src/main/webapp/WEB-INF/help.jsp | 32 +
.../webapp/WEB-INF/integration/modelDriven.jsp | 44 +
.../WEB-INF/integration/modelDrivenResult.jsp | 43 +
.../main/webapp/WEB-INF/interactive/demo.jsp | 0
.../WEB-INF/interactive/example-action.jsp | 76 ++
.../main/webapp/WEB-INF/interactive/index.jsp | 241 ++++++
.../main/webapp/WEB-INF/interactive/jsp_0.jsp | 62 ++
.../main/webapp/WEB-INF/interactive/jsp_1.jsp | 52 ++
.../main/webapp/WEB-INF/interactive/jsp_2.jsp | 54 ++
.../main/webapp/WEB-INF/interactive/jsp_3.jsp | 65 ++
.../main/webapp/WEB-INF/interactive/jsp_4.jsp | 16 +
.../main/webapp/WEB-INF/interactive/ognl_0.jsp | 30 +
.../main/webapp/WEB-INF/interactive/ognl_1.jsp | 28 +
.../main/webapp/WEB-INF/interactive/ognl_2.jsp | 43 +
.../main/webapp/WEB-INF/interactive/ognl_3.jsp | 54 ++
.../main/webapp/WEB-INF/interactive/ognl_4.jsp | 32 +
.../main/webapp/WEB-INF/interactive/ognl_5.jsp | 25 +
.../main/webapp/WEB-INF/interactive/ognl_6.jsp | 43 +
.../main/webapp/WEB-INF/interactive/ognl_7.jsp | 55 ++
.../main/webapp/WEB-INF/interactive/ognl_8.jsp | 18 +
.../main/webapp/WEB-INF/jsf/employee/edit.jsp | 113 +++
.../main/webapp/WEB-INF/jsf/employee/list.jsp | 75 ++
.../src/main/webapp/WEB-INF/jsf/index.jsp | 35 +
.../webapp/WEB-INF/modelDriven/modelDriven.jsp | 42 +
.../WEB-INF/modelDriven/modelDrivenResult.jsp | 42 +
.../main/webapp/WEB-INF/person/edit-person.jsp | 53 ++
.../main/webapp/WEB-INF/person/list-people.ftl | 44 +
.../main/webapp/WEB-INF/person/new-person.ftl | 49 ++
.../src/main/webapp/WEB-INF/showcase.jsp | 30 +
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 25 +
.../non-ui/actionPrefix/actionPrefixExample.ftl | 54 ++
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 25 +
.../tags/non-ui/actionPrefix/normalSubmit.ftl | 24 +
.../actionPrefix/redirectActionPrefix.ftl | 28 +
.../tags/non-ui/actionTag/includedPage.jsp | 1 +
.../tags/non-ui/actionTag/includedPage2.jsp | 2 +
.../tags/non-ui/actionTag/includedPage3.jsp | 2 +
.../tags/non-ui/actionTag/showActionTagDemo.jsp | 52 ++
.../main/webapp/WEB-INF/tags/non-ui/date.jsp | 114 +++
.../main/webapp/WEB-INF/tags/non-ui/debug.jsp | 30 +
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl | 618 ++++++++++++++
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp | 619 ++++++++++++++
.../iteratorTag/appendIteratorTagDemoResult.jsp | 34 +
.../iteratorGeneratorTagDemoResult.jsp | 29 +
.../iteratorTag/mergeIteratorTagDemoResult.jsp | 33 +
.../iteratorTag/showAppendIteratorTagDemo.jsp | 28 +
.../showIteratorGeneratorTagDemo.jsp | 29 +
.../iteratorTag/showMergeIteratorTagDemo.jsp | 29 +
.../iteratorTag/subsetIteratorTagDemo.jsp | 29 +
.../iteratorTag/subsetIteratorTagDemoResult.jsp | 30 +
.../WEB-INF/tags/ui/actionTagExampleCalled.jsp | 2 +
.../WEB-INF/tags/ui/actionTagExampleCalling.jsp | 24 +
.../WEB-INF/tags/ui/componentTagExample.jsp | 69 ++
.../webapp/WEB-INF/tags/ui/datepicker/index.jsp | 33 +
.../WEB-INF/tags/ui/dynamicTreeSelect.jsp | 6 +
.../src/main/webapp/WEB-INF/tags/ui/example.jsp | 149 ++++
.../src/main/webapp/WEB-INF/tags/ui/example.vm | 39 +
.../webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 58 ++
.../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 61 ++
.../WEB-INF/tags/ui/images/backgroundImage.jpg | Bin 0 -> 13192 bytes
.../webapp/WEB-INF/tags/ui/images/leopard.jpg | Bin 0 -> 3850 bytes
.../tags/ui/lotsOfOptiontransferselect.jsp | 101 +++
.../ui/lotsOfOptiontransferselectSubmit.jsp | 103 +++
.../main/webapp/WEB-INF/tags/ui/moreSelects.jsp | 69 ++
.../WEB-INF/tags/ui/moreSelectsSubmit.jsp | 63 ++
.../webapp/WEB-INF/tags/ui/staticTreeSelect.jsp | 11 +
.../webapp/WEB-INF/tags/ui/timepicker/index.jsp | 31 +
.../WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl | 9 +
.../WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp | 25 +
.../WEB-INF/tags/ui/treeExampleDynamic.jsp | 54 ++
.../WEB-INF/tags/ui/treeExampleStatic.jsp | 61 ++
apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 18 +-
.../src/main/webapp/WEB-INF/tiles/body.ftl | 16 +
.../src/main/webapp/WEB-INF/tiles/body.jsp | 24 +
.../src/main/webapp/WEB-INF/tiles/header.jsp | 3 +
.../src/main/webapp/WEB-INF/tiles/layout.ftl | 10 +
.../src/main/webapp/WEB-INF/tiles/layout.jsp | 13 +
.../main/webapp/WEB-INF/token/doublePost.jsp | 28 +
.../src/main/webapp/WEB-INF/token/example1.jsp | 50 ++
.../src/main/webapp/WEB-INF/token/example2.jsp | 38 +
.../src/main/webapp/WEB-INF/token/example3.jsp | 37 +
.../src/main/webapp/WEB-INF/token/example4.ftl | 40 +
.../main/webapp/WEB-INF/token/transferDone.jsp | 48 ++
.../validation/clientSideValidationExample.jsp | 64 ++
.../validation/fieldValidatorsExample.jsp | 63 ++
.../main/webapp/WEB-INF/validation/footer.jsp | 8 +
.../main/webapp/WEB-INF/validation/index.jsp | 51 ++
.../validation/nonFieldValidatorsExample.jsp | 46 +
.../webapp/WEB-INF/validation/quiz-ajax.jsp | 104 +++
.../webapp/WEB-INF/validation/quiz-basic.jsp | 41 +
.../WEB-INF/validation/quiz-client-css.jsp | 37 +
.../webapp/WEB-INF/validation/quiz-client.jsp | 37 +
.../webapp/WEB-INF/validation/quiz-success.jsp | 27 +
.../storeErrorsAcrossRequestCancel.jsp | 30 +
.../storeErrorsAcrossRequestExample.jsp | 54 ++
.../validation/storeErrorsAcrossRequestOk.jsp | 31 +
.../successClientSideValidationExample.jsp | 64 ++
.../successFieldValidatorsExample.jsp | 61 ++
.../successNonFieldValidatorsExample.jsp | 45 +
.../successVisitorValidatorsExample.jsp | 46 +
.../validation/visitorValidatorsExample.jsp | 43 +
.../src/main/webapp/WEB-INF/viewSource.jsp | 54 ++
.../src/main/webapp/WEB-INF/wait/complete.jsp | 25 +
.../src/main/webapp/WEB-INF/wait/example1.jsp | 28 +
.../src/main/webapp/WEB-INF/wait/example2.jsp | 29 +
.../src/main/webapp/WEB-INF/wait/example3.jsp | 29 +
.../src/main/webapp/WEB-INF/wait/wait.jsp | 53 ++
apps/showcase/src/main/webapp/WEB-INF/web.xml | 17 +
.../src/main/webapp/WEB-INF/xslt/index.jsp | 26 +
.../actionchaining/actionChainingResult.jsp | 23 -
.../src/main/webapp/ajax/AjaxResult.jsp | 12 -
.../src/main/webapp/ajax/AjaxResult2.js | 2 -
.../src/main/webapp/ajax/AjaxResult3.jsp | 12 -
.../main/webapp/ajax/autocompleter/index.jsp | 178 ----
.../src/main/webapp/ajax/bind/index.jsp | 61 --
.../src/main/webapp/ajax/commonInclude.jsp | 5 -
apps/showcase/src/main/webapp/ajax/footer.jsp | 8 -
apps/showcase/src/main/webapp/ajax/index.html | 24 +
apps/showcase/src/main/webapp/ajax/index.jsp | 24 -
apps/showcase/src/main/webapp/ajax/options.ftl | 5 -
.../src/main/webapp/ajax/remotebutton/index.jsp | 70 --
.../src/main/webapp/ajax/remotediv/example1.jsp | 23 -
.../main/webapp/ajax/remotediv/example10.jsp | 31 -
.../src/main/webapp/ajax/remotediv/example2.jsp | 28 -
.../src/main/webapp/ajax/remotediv/example3.jsp | 27 -
.../src/main/webapp/ajax/remotediv/example4.jsp | 28 -
.../src/main/webapp/ajax/remotediv/example5.jsp | 27 -
.../src/main/webapp/ajax/remotediv/example6.jsp | 24 -
.../src/main/webapp/ajax/remotediv/example7.jsp | 27 -
.../src/main/webapp/ajax/remotediv/example8.jsp | 57 --
.../src/main/webapp/ajax/remotediv/example9.jsp | 63 --
.../src/main/webapp/ajax/remotediv/index.jsp | 55 --
.../src/main/webapp/ajax/remoteforms/index.jsp | 119 ---
.../src/main/webapp/ajax/remotelink/index.jsp | 127 ---
.../main/webapp/ajax/tabbedpanel/example1.jsp | 95 ---
.../main/webapp/ajax/tabbedpanel/example2.jsp | 26 -
.../main/webapp/ajax/tabbedpanel/example3.jsp | 46 -
.../main/webapp/ajax/tabbedpanel/example4.jsp | 57 --
.../main/webapp/ajax/tabbedpanel/example5.jsp | 29 -
.../main/webapp/ajax/tabbedpanel/example5Ok.jsp | 9 -
.../main/webapp/ajax/tabbedpanel/example6.jsp | 40 -
.../src/main/webapp/ajax/tabbedpanel/index.jsp | 28 -
.../ajax/tabbedpanel/nodecorate/panel1.ftl | 3 -
.../ajax/tabbedpanel/nodecorate/panel2.ftl | 7 -
.../tabbedpanel/nodecorate/panel2Submit.ftl | 2 -
.../ajax/tabbedpanel/nodecorate/panel3.ftl | 9 -
.../tabbedpanel/nodecorate/panel3Submit.ftl | 2 -
apps/showcase/src/main/webapp/ajax/testjs.jsp | 14 -
.../src/main/webapp/ajax/tree/getCategory.jsp | 23 -
.../webapp/ajax/tree/partialChunkHeader.jsp | 6 -
.../src/main/webapp/ajax/tree/toggle.jsp | 12 -
.../showcase/src/main/webapp/ajax/tree/tree.jsp | 13 -
.../src/main/webapp/ajax/widgets/index.jsp | 40 -
.../showcase/src/main/webapp/chat/chatLogin.ftl | 27 -
.../src/main/webapp/chat/createRoom.ftl | 2 -
apps/showcase/src/main/webapp/chat/index.jsp | 3 -
.../webapp/chat/messagesAvailableInRoom.ftl | 33 -
.../src/main/webapp/chat/roomSelection.ftl | 172 ----
.../src/main/webapp/chat/roomsAvailable.ftl | 44 -
.../webapp/chat/sendMessageToRoomResult.ftl | 2 -
apps/showcase/src/main/webapp/chat/showRoom.ftl | 167 ----
.../src/main/webapp/chat/usersAvailable.ftl | 6 -
.../main/webapp/chat/usersAvailableInRoom.ftl | 8 -
.../src/main/webapp/conversion/Address.java.txt | 35 -
.../webapp/conversion/AddressAction.java.txt | 44 -
.../conversion/EnumTypeConverter.java.txt | 55 --
.../webapp/conversion/OperationsEnum.java.txt | 30 -
.../conversion/OperationsEnumAction.java.txt | 53 --
.../OperationsEnumActionConversion.txt | 4 -
.../src/main/webapp/conversion/Person.java.txt | 34 -
.../webapp/conversion/PersonAction.java.txt | 43 -
.../main/webapp/conversion/enterAddressInfo.jsp | 53 --
.../main/webapp/conversion/enterOperations.jsp | 38 -
.../main/webapp/conversion/enterPersonInfo.jsp | 67 --
.../src/main/webapp/conversion/index.jsp | 35 -
.../main/webapp/conversion/showAddressInfo.jsp | 21 -
.../main/webapp/conversion/showOperations.jsp | 21 -
.../main/webapp/conversion/showPersonInfo.jsp | 24 -
apps/showcase/src/main/webapp/date.jsp | 2 -
.../src/main/webapp/empmanager/editEmployee.jsp | 56 --
.../src/main/webapp/empmanager/editSkill.jsp | 42 -
.../src/main/webapp/empmanager/index.jsp | 1 -
.../main/webapp/empmanager/listEmployees.jsp | 43 -
.../src/main/webapp/empmanager/listSkills.jsp | 41 -
.../src/main/webapp/filedownload/index.jsp | 36 -
.../fileupload/multipleUploadUsingArray.jsp | 32 -
.../fileupload/multipleUploadUsingList.jsp | 32 -
.../main/webapp/fileupload/upload-success.jsp | 31 -
.../src/main/webapp/fileupload/upload.jsp | 27 -
.../freemarker/customFreemarkerManagerUsage.ftl | 34 -
.../src/main/webapp/freemarker/index.jsp | 3 -
.../src/main/webapp/freemarker/standardTags.ftl | 24 -
apps/showcase/src/main/webapp/hangman/blank.ftl | 0
.../src/main/webapp/hangman/hangmanAjax.ftl | 247 ------
.../src/main/webapp/hangman/hangmanNonAjax.ftl | 144 ----
.../webapp/hangman/updateCharacterAvailable.ftl | 45 -
.../src/main/webapp/hangman/updateGuessLeft.ftl | 7 -
.../src/main/webapp/hangman/updateScaffold.ftl | 3 -
.../webapp/hangman/updateVocabCharacters.ftl | 20 -
apps/showcase/src/main/webapp/help.jsp | 32 -
.../src/main/webapp/integration/modelDriven.jsp | 44 -
.../webapp/integration/modelDrivenResult.jsp | 43 -
.../src/main/webapp/interactive/demo.jsp | 0
.../main/webapp/interactive/example-action.jsp | 76 --
.../src/main/webapp/interactive/index.jsp | 241 ------
.../src/main/webapp/interactive/jsp_0.jsp | 62 --
.../src/main/webapp/interactive/jsp_1.jsp | 52 --
.../src/main/webapp/interactive/jsp_2.jsp | 54 --
.../src/main/webapp/interactive/jsp_3.jsp | 65 --
.../src/main/webapp/interactive/jsp_4.jsp | 16 -
.../src/main/webapp/interactive/ognl_0.jsp | 30 -
.../src/main/webapp/interactive/ognl_1.jsp | 28 -
.../src/main/webapp/interactive/ognl_2.jsp | 43 -
.../src/main/webapp/interactive/ognl_3.jsp | 54 --
.../src/main/webapp/interactive/ognl_4.jsp | 32 -
.../src/main/webapp/interactive/ognl_5.jsp | 25 -
.../src/main/webapp/interactive/ognl_6.jsp | 43 -
.../src/main/webapp/interactive/ognl_7.jsp | 55 --
.../src/main/webapp/interactive/ognl_8.jsp | 18 -
.../src/main/webapp/jsf/employee/edit.jsp | 113 ---
.../src/main/webapp/jsf/employee/list.jsp | 75 --
apps/showcase/src/main/webapp/jsf/index.jsp | 35 -
.../src/main/webapp/modelDriven/modelDriven.jsp | 42 -
.../webapp/modelDriven/modelDrivenResult.jsp | 42 -
.../src/main/webapp/person/edit-person.jsp | 53 --
apps/showcase/src/main/webapp/person/index.html | 10 +
apps/showcase/src/main/webapp/person/index.jsp | 1 -
.../src/main/webapp/person/list-people.ftl | 44 -
.../src/main/webapp/person/new-person.ftl | 49 --
apps/showcase/src/main/webapp/showcase.jsp | 30 -
apps/showcase/src/main/webapp/skill/index.html | 10 +
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 25 -
.../non-ui/actionPrefix/actionPrefixExample.ftl | 54 --
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 25 -
.../tags/non-ui/actionPrefix/normalSubmit.ftl | 24 -
.../actionPrefix/redirectActionPrefix.ftl | 28 -
.../tags/non-ui/actionTag/includedPage.jsp | 1 -
.../tags/non-ui/actionTag/includedPage2.jsp | 2 -
.../tags/non-ui/actionTag/includedPage3.jsp | 2 -
.../tags/non-ui/actionTag/showActionTagDemo.jsp | 52 --
.../src/main/webapp/tags/non-ui/date.jsp | 114 ---
.../src/main/webapp/tags/non-ui/debug.jsp | 30 -
.../main/webapp/tags/non-ui/ifTag/testIf.ftl | 618 --------------
.../main/webapp/tags/non-ui/ifTag/testIf.jsp | 619 --------------
.../iteratorTag/appendIteratorTagDemoResult.jsp | 34 -
.../iteratorGeneratorTagDemoResult.jsp | 29 -
.../iteratorTag/mergeIteratorTagDemoResult.jsp | 33 -
.../iteratorTag/showAppendIteratorTagDemo.jsp | 28 -
.../showIteratorGeneratorTagDemo.jsp | 29 -
.../iteratorTag/showMergeIteratorTagDemo.jsp | 29 -
.../iteratorTag/subsetIteratorTagDemo.jsp | 29 -
.../iteratorTag/subsetIteratorTagDemoResult.jsp | 30 -
.../webapp/tags/ui/actionTagExampleCalled.jsp | 2 -
.../webapp/tags/ui/actionTagExampleCalling.jsp | 24 -
.../main/webapp/tags/ui/componentTagExample.jsp | 69 --
.../main/webapp/tags/ui/datepicker/index.jsp | 33 -
.../main/webapp/tags/ui/dynamicTreeSelect.jsp | 6 -
.../src/main/webapp/tags/ui/example.jsp | 149 ----
.../showcase/src/main/webapp/tags/ui/example.vm | 39 -
.../src/main/webapp/tags/ui/exampleSubmited.jsp | 58 --
.../src/main/webapp/tags/ui/exampleSubmited.vm | 61 --
.../webapp/tags/ui/images/backgroundImage.jpg | Bin 13192 -> 0 bytes
.../src/main/webapp/tags/ui/images/leopard.jpg | Bin 3850 -> 0 bytes
.../tags/ui/lotsOfOptiontransferselect.jsp | 101 ---
.../ui/lotsOfOptiontransferselectSubmit.jsp | 103 ---
.../src/main/webapp/tags/ui/moreSelects.jsp | 69 --
.../main/webapp/tags/ui/moreSelectsSubmit.jsp | 63 --
.../main/webapp/tags/ui/staticTreeSelect.jsp | 11 -
.../main/webapp/tags/ui/timepicker/index.jsp | 31 -
.../webapp/tags/ui/treeExampleAjaxDynamic.ftl | 9 -
.../webapp/tags/ui/treeExampleAjaxDynamic.jsp | 25 -
.../main/webapp/tags/ui/treeExampleDynamic.jsp | 54 --
.../main/webapp/tags/ui/treeExampleStatic.jsp | 61 --
apps/showcase/src/main/webapp/tiles/body.ftl | 16 -
apps/showcase/src/main/webapp/tiles/body.jsp | 24 -
apps/showcase/src/main/webapp/tiles/header.jsp | 3 -
apps/showcase/src/main/webapp/tiles/layout.ftl | 10 -
apps/showcase/src/main/webapp/tiles/layout.jsp | 13 -
.../src/main/webapp/token/doublePost.jsp | 28 -
.../showcase/src/main/webapp/token/example1.jsp | 50 --
.../showcase/src/main/webapp/token/example2.jsp | 38 -
.../showcase/src/main/webapp/token/example3.jsp | 37 -
.../showcase/src/main/webapp/token/example4.ftl | 40 -
apps/showcase/src/main/webapp/token/index.html | 47 ++
apps/showcase/src/main/webapp/token/index.jsp | 48 --
.../src/main/webapp/token/transferDone.jsp | 48 --
.../validation/clientSideValidationExample.jsp | 64 --
.../validation/fieldValidatorsExample.jsp | 63 --
.../src/main/webapp/validation/footer.jsp | 8 -
.../src/main/webapp/validation/index.jsp | 51 --
.../validation/nonFieldValidatorsExample.jsp | 46 -
.../src/main/webapp/validation/quiz-ajax.jsp | 104 ---
.../src/main/webapp/validation/quiz-basic.jsp | 41 -
.../main/webapp/validation/quiz-client-css.jsp | 37 -
.../src/main/webapp/validation/quiz-client.jsp | 37 -
.../src/main/webapp/validation/quiz-success.jsp | 27 -
.../storeErrorsAcrossRequestCancel.jsp | 30 -
.../storeErrorsAcrossRequestExample.jsp | 54 --
.../validation/storeErrorsAcrossRequestOk.jsp | 31 -
.../successClientSideValidationExample.jsp | 64 --
.../successFieldValidatorsExample.jsp | 61 --
.../successNonFieldValidatorsExample.jsp | 45 -
.../successVisitorValidatorsExample.jsp | 46 -
.../validation/visitorValidatorsExample.jsp | 43 -
apps/showcase/src/main/webapp/viewSource.jsp | 54 --
apps/showcase/src/main/webapp/wait/complete.jsp | 25 -
apps/showcase/src/main/webapp/wait/example1.jsp | 28 -
apps/showcase/src/main/webapp/wait/example2.jsp | 29 -
apps/showcase/src/main/webapp/wait/example3.jsp | 29 -
apps/showcase/src/main/webapp/wait/index.html | 33 +
apps/showcase/src/main/webapp/wait/index.jsp | 34 -
apps/showcase/src/main/webapp/wait/wait.jsp | 53 --
apps/showcase/src/main/webapp/xslt/index.jsp | 26 -
archetypes/pom.xml | 4 +-
.../struts2-archetype-angularjs/README.txt | 7 +
archetypes/struts2-archetype-angularjs/pom.xml | 3 +-
archetypes/struts2-archetype-blank/README.txt | 7 +
archetypes/struts2-archetype-blank/pom.xml | 3 +-
.../struts2-archetype-convention/README.txt | 7 +
archetypes/struts2-archetype-convention/pom.xml | 3 +-
.../struts2-archetype-dbportlet/README.txt | 7 +
archetypes/struts2-archetype-dbportlet/pom.xml | 3 +-
archetypes/struts2-archetype-plugin/pom.xml | 3 +-
archetypes/struts2-archetype-portlet/README.txt | 9 +-
archetypes/struts2-archetype-portlet/pom.xml | 3 +-
archetypes/struts2-archetype-starter/README.txt | 8 +
archetypes/struts2-archetype-starter/pom.xml | 3 +-
assembly/pom.xml | 88 +-
assembly/src/main/assembly/all.xml | 12 +-
assembly/src/main/assembly/docs.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../org/apache/struts2/StrutsConstants.java | 2 +
.../struts2/components/ActionComponent.java | 41 +-
.../struts2/components/DateTextField.java | 51 ++
.../struts2/components/GenericUIBean.java | 5 +-
.../org/apache/struts2/components/Hidden.java | 7 +
.../org/apache/struts2/components/UIBean.java | 9 +-
.../config/DefaultBeanSelectionProvider.java | 3 +
.../DefaultDispatcherErrorHandler.java | 124 +++
.../apache/struts2/dispatcher/Dispatcher.java | 211 +++--
.../dispatcher/DispatcherErrorHandler.java | 29 +
.../struts2/dispatcher/FilterDispatcher.java | 6 +-
.../dispatcher/ServletRedirectResult.java | 48 +-
.../struts2/dispatcher/StrutsResultSupport.java | 75 +-
.../dispatcher/ng/ExecuteOperations.java | 10 +-
.../dispatcher/ng/PrepareOperations.java | 13 +-
.../ng/filter/StrutsExecuteFilter.java | 4 +-
.../filter/StrutsPrepareAndExecuteFilter.java | 4 +-
.../ng/filter/StrutsPrepareFilter.java | 2 +-
.../dispatcher/ng/listener/StrutsListener.java | 2 +-
.../dispatcher/ng/servlet/StrutsServlet.java | 4 +-
.../interceptor/DateTextFieldInterceptor.java | 128 +++
.../views/freemarker/FreemarkerResult.java | 18 +-
.../org/apache/struts2/views/jsp/TagUtils.java | 23 +-
.../struts2/views/jsp/ui/DateTextFieldTag.java | 35 +
.../org/apache/struts2/default.properties | 6 +-
core/src/main/resources/struts-default.xml | 16 +-
.../resources/template/css_xhtml/checkbox.ftl | 17 +-
.../template/css_xhtml/controlfooter.ftl | 7 +-
.../template/css_xhtml/controlheader-core.ftl | 9 +-
.../template/css_xhtml/controlheader.ftl | 7 +-
.../main/resources/template/css_xhtml/reset.ftl | 9 +-
.../template/css_xhtml/submit-close.ftl | 7 +-
.../resources/template/css_xhtml/submit.ftl | 7 +-
.../resources/template/simple/checkboxlist.ftl | 14 +-
.../main/resources/template/simple/radiomap.ftl | 8 -
.../main/resources/template/xhtml/checkbox.ftl | 15 +-
.../template/xhtml/controlheader-core.ftl | 9 +-
.../template/xhtml/form-close-validate.ftl | 2 +-
.../main/resources/template/xhtml/hidden.ftl | 27 +
core/src/site/resources/tags/checkboxlist.html | 832 +++++++++----------
core/src/site/resources/tags/datetextfield.html | 376 +++++++++
.../apache/struts2/StrutsInternalTestCase.java | 9 +-
.../dispatcher/FilterDispatcherTest.java | 13 +-
.../apache/struts2/dispatcher/FilterTest.java | 6 +-
.../dispatcher/ServletRedirectResultTest.java | 109 ++-
.../dispatcher/StrutsResultSupportTest.java | 31 +
.../DateTextFieldInterceptorTest.java | 58 ++
.../views/freemarker/FreeMarkerResultTest.java | 207 +----
.../freemarker/FreemarkerResultMockedTest.java | 262 ++++++
.../struts2/views/jsp/AbstractTagTest.java | 7 +-
.../apache/struts2/views/jsp/URLTagTest.java | 3 +-
.../struts2/views/jsp/ui/FormTagTest.java | 82 ++
.../apache/struts2/views/jsp/ui/Formtag-27.txt | 10 +
.../apache/struts2/views/jsp/ui/Formtag-28.txt | 10 +
.../apache/struts2/views/jsp/ui/Hidden-1.txt | 6 +-
.../apache/struts2/views/jsp/ui/Hidden-2.txt | 6 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
.../CodebehindUnknownHandlerTest.java | 2 +
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
.../dojo/views/jsp/ui/AbstractTagTest.java | 3 +-
plugins/dwr/pom.xml | 2 +-
.../apache/struts2/validators/DWRValidator.java | 12 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
.../views/java/simple/DateTextFieldHandler.java | 91 ++
.../struts2/views/java/simple/SimpleTheme.java | 1 +
.../views/java/simple/SubmitHandler.java | 11 +-
.../views/java/simple/DateTextFieldTest.java | 51 ++
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
.../apache/struts2/StrutsJUnit4TestCase.java | 2 +-
.../java/org/apache/struts2/StrutsTestCase.java | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 7 +-
.../struts2/views/jsp/PortletUrlTagTest.java | 22 +-
plugins/rest/pom.xml | 4 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
.../OldDecorator2NewStrutsDecorator.java | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 17 +-
xwork-core/pom.xml | 2 +-
.../config/impl/DefaultConfiguration.java | 7 +
.../providers/XmlConfigurationProvider.java | 2 +-
.../conversion/impl/DefaultTypeConverter.java | 4 +-
.../xwork2/interceptor/I18nInterceptor.java | 2 +-
.../interceptor/ParametersInterceptor.java | 10 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 85 +-
.../xwork2/ognl/OgnlValueStack.java | 4 -
.../xwork2/ognl/PropertiesJudge.java | 7 -
.../xwork2/ognl/SecurityMemberAccess.java | 13 +-
.../ognl/accessor/CompoundRootAccessor.java | 27 +-
.../xwork2/spring/SpringObjectFactory.java | 2 +-
.../xwork2/util/LocalizedTextUtil.java | 9 +-
.../xwork2/util/MemberAccessValueStack.java | 4 -
.../opensymphony/xwork2/util/TextParseUtil.java | 87 ++
.../com/opensymphony/xwork2/util/URLUtil.java | 1 +
...nnotationValidationConfigurationBuilder.java | 6 +
.../validator/DelegatingValidatorContext.java | 21 +-
.../validator/annotations/UrlValidator.java | 76 +-
.../validator/validators/URLValidator.java | 66 +-
.../xwork2/TestNGXWorkTestCaseTest.java | 1 +
.../interceptor/ParametersInterceptorTest.java | 99 ++-
.../xwork2/util/TextParseUtilTest.java | 45 +-
.../xwork2/validator/URLValidatorTest.java | 50 ++
.../validator/VisitorFieldValidatorTest.java | 2 +-
.../xwork2/AnnotatedTestBean.properties | 5 -
.../TestBean-beanMessageBundle-validation.xml | 2 +-
614 files changed, 12981 insertions(+), 11055 deletions(-)
----------------------------------------------------------------------
[02/19] git commit: Sets -SNAPSHOT version
Posted by lu...@apache.org.
Sets -SNAPSHOT version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a2d0ecdc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a2d0ecdc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a2d0ecdc
Branch: refs/heads/feature/exclude-object-class
Commit: a2d0ecdcd3594c87265f483ecb3c202fec18937c
Parents: 6cddee6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Apr 22 11:54:59 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Apr 22 11:54:59 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
51 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 2b2cf63..dce8aa0 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e16d5ff..9a6abee 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 1992cde..de7cfb2 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 921abef..762ff8f 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 73162cc..e7db34c 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b4eb6ba..a37db7a 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 927f882..cfc3aa7 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index da001b5..efd5d19 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 2a4044f..ddd6d18 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 778f204..47a2cd6 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index cf40954..ebf65cd 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 38dc66f..7d7324c 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 2d102e2..4c8a91d 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index cb7c7b2..4456c50 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index c5dd6ba..5272e3e 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0f3d457..d5bd71b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 25f1089..9c93e5b 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 933394c..b643638 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 0537b1e..41523e5 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 225113e..c875c6d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index a5b2429..6ce324e 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index ed8e16b..d9cd9d0 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index c8d7cc1..aefa347 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 5fb7170..6ef817f 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 4cf7aea..dbda4fb 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index e38598a..c3de1b0 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 2eb6bc0..5f48827 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 52c0cec..f8fdd21 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 4dd58e8..ed5441b 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 0b58b8a..60f3fc9 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index b56396b..2b718fb 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index afd6158..f9b48f3 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index f094c0b..df285ba 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 8aa034c..8a33c3e 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index d0fe79d..8fa9d3c 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 9789448..79687b8 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 216e27e..c109cc9 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 61d1729..698e093 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index e283683..7529c52 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index d1d243e..8a70349 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 52823bc..2ae7758 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 7c71515..41e6ff0 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 7d4d437..4cba507 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index bb2bf79..d244c4a 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index efe4bbb..3805202 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 1c393ff..c683cf1 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 87c25bb..5433f06 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 8047d26..235d83c 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index cf976e4..8168346 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 004a697..1e89047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/2.x/</url>
http://git-wip-us.apache.org/repos/asf/struts/blob/a2d0ecdc/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index e16c324..e9b35af 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[10/19] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by lu...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbd75a89
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbd75a89
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbd75a89
Branch: refs/heads/feature/exclude-object-class
Commit: fbd75a892bdad741f8a4247e3b8e5c2727651816
Parents: 7dd83df
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 21:32:49 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 21:32:49 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 4 ++--
xwork-core/pom.xml | 2 +-
51 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 6054fc4..81a88d5 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 0aebae0..b77c977 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index f2fc344..bb7ae7c 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index a16b4d7..3444414 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index f98d72b..e105aab 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b0c6589..55d5d5f 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 6cf2aef..9d52e4b 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index bf9b7f8..fcf351b 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index a15b957..3f40657 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 237b35a..00a6f4b 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index aa3e820..fca83b0 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index c1e7749..15a48ed 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 8535f80..bdb702f 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index a3baed8..1bc6d9f 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 229a591..935b471 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7984c29..97aef43 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e9fdc78..5ea89c4 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index a8613a3..0f67c7d 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b86c91f..f896c0c 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 02aee40..6404358 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 8cd0325..ba6bbf2 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index e978b79..78701b2 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 284f1c7..7a9016b 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a55a797..54346ba 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 29846ea..f0f950d 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index dba899b..76259d2 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 51488be..19b85fc 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 5ef6f6b..d984aca 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 3cf1c94..45d22b2 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index e3a44c4..6d3ff2d 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 849c815..bb888b9 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 33d00ea..3f284ab 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 444d311..f77b226 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 2571fcb..6d02695 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 11e2c22..2762bfa 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 457383f..997b2a7 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index b2ab339..307fc05 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 8569137..79ce6af 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d98fc9a..0d764e6 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 9d41d84..a937e7c 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 8134dad..4bea2e7 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index aec4075..3c416a4 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 243b1d2..829f883 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 3c7b1b8..717c2bf 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 6bcf252..c5bf45b 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index fb84799..fbbd4f1 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index eec0caf..6879f54 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 47b3980..f3fa2b6 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 77fb083..2204fcf 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc336c1..aaa30eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
<connection>scm:git:git://git.apache.org/struts.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
<url>http://git.apache.org/struts.git</url>
- <tag>STRUTS_2_3_16_2</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 34fe8e2..9d1c34c 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[03/19] git commit: Moves global exclude patterns into dedicated class
Posted by lu...@apache.org.
Moves global exclude patterns into dedicated class
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2e2da292
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2e2da292
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2e2da292
Branch: refs/heads/feature/exclude-object-class
Commit: 2e2da292166adbc78c4cb1e308b30ddb4fba6d3f
Parents: a2d0ecd
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 19:51:02 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 19:51:02 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 8 +++----
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++++++++++++++++
2 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/2e2da292/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 2f5b259..398dd43 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -197,7 +197,7 @@
<interceptor-ref name="multiselect"/>
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
- <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="deprecation"/>
@@ -253,7 +253,7 @@
<interceptor-ref name="checkbox"/>
<interceptor-ref name="multiselect"/>
<interceptor-ref name="params">
- <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
@@ -263,7 +263,7 @@
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
- <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
@@ -300,7 +300,7 @@
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
- <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
http://git-wip-us.apache.org/repos/asf/struts/blob/2e2da292/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
new file mode 100644
index 0000000..b618a52
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
@@ -0,0 +1,22 @@
+package com.opensymphony.xwork2;
+
+/**
+ * ExcludedPatterns contains hard-coded patterns that must be rejected by {@link com.opensymphony.xwork2.interceptor.ParametersInterceptor}
+ * and partially in CookInterceptor
+ */
+public class ExcludedPatterns {
+
+ public static final String CLASS_ACCESS_PATTERN = "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*";
+
+ public static final String[] EXCLUDED_PATTERNS = {
+ CLASS_ACCESS_PATTERN,
+ "^dojo\\..*",
+ "^struts\\..*",
+ "^session\\..*",
+ "^request\\..*",
+ "^application\\..*",
+ "^servlet(Request|Response)\\..*",
+ "^parameters\\..*"
+ };
+
+}
[13/19] git commit: Corrects version in poms
Posted by lu...@apache.org.
Corrects version in poms
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3575bebf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3575bebf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3575bebf
Branch: refs/heads/feature/exclude-object-class
Commit: 3575bebf01caa7f8676383495c8276cd8d4e688e
Parents: c22146b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 28 08:52:37 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 28 08:52:37 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
archetypes/struts2-archetype-convention/pom.xml | 2 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
51 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 190b21e..675de3f 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e321ab8..3335999 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 6e4e5d5..7275fdf 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index ac06753..94771b4 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 86d4958..3a87ebb 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 270f5e6..4d9507e 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 7e6d28d..ef10007 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 5ea2556..cad40b9 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 4adf8b4..5d6d4ab 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 27f9351..a9e0d1a 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 17a912c..da7e8cb 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index da8f1b8..bd17444 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 24f1a3d..05ee3de 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index c8a6f64..5525568 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 1e533a8..c642510 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 56a551b..6028a14 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e9fdc78..ddc8cdf 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index a8613a3..f0bd5ad 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b86c91f..e40fe1c 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 02aee40..d9527f2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 8cd0325..9c7c503 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index e978b79..9cfbbd6 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 284f1c7..f0d9ce2 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a55a797..7b19112 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 29846ea..39d1638 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index dba899b..01ae734 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 51488be..0445f79 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 5ef6f6b..d46ba4c 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 3cf1c94..218ade5 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index e3a44c4..fbe8776 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 849c815..d591c2d 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 33d00ea..756635e 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 444d311..7e99c65 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 2571fcb..aaabc72 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 11e2c22..9c765dd 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 457383f..b988bde 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index b2ab339..c372a4b 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 8569137..d757334 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d98fc9a..c2fda24 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 9d41d84..0ce09ff 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 8134dad..7e7919d 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index aec4075..66d566f 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 243b1d2..c1e6c1b 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 3c7b1b8..6d20390 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 6bcf252..cb0d6a1 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index fb84799..4ae4a23 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index eec0caf..b813949 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 47b3980..a7a188d 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 77fb083..ddb92d0 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9db8cdb..44db8a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 34fe8e2..a35ead4 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.18-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[11/19] git commit: Merge branch 'hotfix/2.3.16.2'
Posted by lu...@apache.org.
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
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1be8ed61
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1be8ed61
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1be8ed61
Branch: refs/heads/feature/exclude-object-class
Commit: 1be8ed61e499b58b3fb6a45253f47865f83f35fb
Parents: 6d55d01 fbd75a8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 28 08:50:53 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 28 08:50:53 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
archetypes/struts2-archetype-convention/pom.xml | 2 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
core/src/main/resources/struts-default.xml | 8 +--
.../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 5 +-
src/site/resources/archetype-catalog.xml | 12 ++--
xwork-core/pom.xml | 2 +-
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++
.../interceptor/ParametersInterceptor.java | 19 +++--
.../interceptor/ParametersInterceptorTest.java | 64 +++++++++++++++++
58 files changed, 302 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/blank/pom.xml
----------------------------------------------------------------------
diff --cc apps/blank/pom.xml
index 675de3f,81a88d5..190b21e
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --cc apps/jboss-blank/pom.xml
index 3335999,b77c977..e321ab8
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --cc apps/mailreader/pom.xml
index 7275fdf,bb7ae7c..6e4e5d5
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/pom.xml
----------------------------------------------------------------------
diff --cc apps/pom.xml
index 94771b4,3444414..ac06753
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@@ -26,11 -26,12 +26,11 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
- <name>Webapps</name>
+ <name>Struts 2 Webapps</name>
<modules>
<module>blank</module>
<module>jboss-blank</module>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --cc apps/portlet/pom.xml
index 3a87ebb,e105aab..86d4958
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --cc apps/rest-showcase/pom.xml
index 4d9507e,55d5d5f..270f5e6
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@@ -26,13 -26,13 +26,13 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
- <name>Struts 2 Rest Showcase Example</name>
++ <version>2.3.16.2</version>
+ <name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --cc apps/showcase/pom.xml
index ef10007,9d52e4b..7e6d28d
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/pom.xml
index cad40b9,fcf351b..5ea2556
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@@ -26,9 -26,9 +26,9 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
- <groupId>org.apache.struts</groupId>
+
<artifactId>struts2-archetypes</artifactId>
<packaging>pom</packaging>
<name>Struts 2 Maven Archetypes</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-angularjs/pom.xml
index 5d6d4ab,3f40657..4adf8b4
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-blank/pom.xml
index a9e0d1a,00a6f4b..27f9351
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-convention/pom.xml
index da7e8cb,fca83b0..17a912c
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-dbportlet/pom.xml
index bd17444,15a48ed..da8f1b8
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-plugin/pom.xml
index 05ee3de,bdb702f..24f1a3d
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-portlet/pom.xml
index 5525568,1bc6d9f..c8a6f64
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/struts2-archetype-starter/pom.xml
index c642510,935b471..1e533a8
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/assembly/pom.xml
----------------------------------------------------------------------
diff --cc assembly/pom.xml
index 6028a14,97aef43..56a551b
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --cc bundles/admin/pom.xml
index ddc8cdf,5ea89c4..e9fdc78
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --cc bundles/demo/pom.xml
index f0bd5ad,0f67c7d..a8613a3
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/bundles/pom.xml
----------------------------------------------------------------------
diff --cc bundles/pom.xml
index e40fe1c,f896c0c..b86c91f
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index d9527f2,6404358..02aee40
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --cc core/src/main/resources/struts-default.xml
index 87f1ff5,398dd43..6e85801
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@@ -257,10 -251,9 +257,10 @@@
<interceptor-ref name="alias"/>
<interceptor-ref name="i18n"/>
<interceptor-ref name="checkbox"/>
+ <interceptor-ref name="datetime"/>
<interceptor-ref name="multiselect"/>
<interceptor-ref name="params">
- <param name="excludeParams">(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
+ <param name="excludeParams">^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --cc plugins/cdi/pom.xml
index 9c7c503,ba6bbf2..8cd0325
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --cc plugins/codebehind/pom.xml
index 9cfbbd6,78701b2..e978b79
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --cc plugins/config-browser/pom.xml
index f0d9ce2,7a9016b..284f1c7
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --cc plugins/convention/pom.xml
index 7b19112,54346ba..a55a797
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --cc plugins/dojo/pom.xml
index 39d1638,f0f950d..29846ea
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --cc plugins/dwr/pom.xml
index 01ae734,76259d2..dba899b
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --cc plugins/embeddedjsp/pom.xml
index 0445f79,19b85fc..51488be
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --cc plugins/gxp/pom.xml
index d46ba4c,d984aca..5ef6f6b
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jasperreports/pom.xml
index 218ade5,45d22b2..3cf1c94
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --cc plugins/javatemplates/pom.xml
index fbe8776,6d3ff2d..e3a44c4
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jfreechart/pom.xml
index d591c2d,bb888b9..849c815
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --cc plugins/jsf/pom.xml
index 756635e,3f284ab..33d00ea
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/json/pom.xml
----------------------------------------------------------------------
diff --cc plugins/json/pom.xml
index 7e99c65,f77b226..444d311
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --cc plugins/junit/pom.xml
index aaabc72,6d02695..2571fcb
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --cc plugins/osgi/pom.xml
index 9c765dd,2762bfa..11e2c22
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --cc plugins/oval/pom.xml
index b988bde,997b2a7..457383f
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --cc plugins/pell-multipart/pom.xml
index c372a4b,307fc05..b2ab339
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --cc plugins/plexus/pom.xml
index d757334,79ce6af..8569137
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/pom.xml
----------------------------------------------------------------------
diff --cc plugins/pom.xml
index c2fda24,0d764e6..d98fc9a
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --cc plugins/portlet-tiles/pom.xml
index 0ce09ff,a937e7c..9d41d84
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --cc plugins/portlet/pom.xml
index 7e7919d,4bea2e7..8134dad
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --cc plugins/rest/pom.xml
index 66d566f,3c416a4..aec4075
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@@ -26,11 -26,11 +26,11 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --cc plugins/sitegraph/pom.xml
index c1e6c1b,829f883..243b1d2
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --cc plugins/sitemesh/pom.xml
index 6d20390,717c2bf..3c7b1b8
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --cc plugins/spring/pom.xml
index cb0d6a1,c5bf45b..6bcf252
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --cc plugins/struts1/pom.xml
index 4ae4a23,fbbd4f1..fb84799
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --cc plugins/testng/pom.xml
index b813949,6879f54..eec0caf
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --cc plugins/tiles/pom.xml
index a7a188d,f3fa2b6..47b3980
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --cc plugins/tiles3/pom.xml
index ddb92d0,2204fcf..77fb083
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 231a4ed,aaa30eb..9db8cdb
--- a/pom.xml
+++ b/pom.xml
@@@ -9,7 -9,7 +9,7 @@@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@@ -31,8 -31,8 +31,7 @@@
<connection>scm:git:git://git.apache.org/struts.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
<url>http://git.apache.org/struts.git</url>
-- <tag>HEAD</tag>
-- </scm>
++ </scm>
<issueManagement>
<system>JIRA</system>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/pom.xml
----------------------------------------------------------------------
diff --cc xwork-core/pom.xml
index a35ead4,9d1c34c..34fe8e2
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@@ -5,7 -5,7 +5,7 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- <version>2.3.16.3-SNAPSHOT</version>
++ <version>2.3.16.2</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1be8ed61/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
[14/19] git commit: Removes version and add packaging
Posted by lu...@apache.org.
Removes version and add packaging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dddb273b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dddb273b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dddb273b
Branch: refs/heads/feature/exclude-object-class
Commit: dddb273b1db7b16c66691da49636d5cdb7d344b4
Parents: 3575beb
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 28 08:55:50 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 28 08:55:50 2014 +0200
----------------------------------------------------------------------
plugins/rest/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/dddb273b/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 66d566f..afae587 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -30,8 +30,8 @@
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.18-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
+ <packaging>jar</packaging>
<properties>
<jackson.version>1.9.2</jackson.version>
[04/19] git commit: Uses global exclude patterns to initialise
excludeParams
Posted by lu...@apache.org.
Uses global exclude patterns to initialise excludeParams
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63152417
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63152417
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63152417
Branch: refs/heads/feature/exclude-object-class
Commit: 6315241719be167542962da436b38782ed730c62
Parents: 2e2da29
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 19:51:40 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 19:51:40 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
.../interceptor/ParametersInterceptor.java | 19 +++--
2 files changed, 86 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/63152417/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 939956c..3e2e81d 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -24,6 +24,7 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.ExcludedPatterns;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -173,7 +174,8 @@ public class CookieInterceptor extends AbstractInterceptor {
private Set<String> cookiesValueSet = Collections.emptySet();
// Allowed names of cookies
- private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN);
+ private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN, Pattern.CASE_INSENSITIVE);
+ private Pattern excludedPattern = Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN, Pattern.CASE_INSENSITIVE);
/**
* Set the <code>cookiesName</code> which if matched will allow the cookie
@@ -223,7 +225,7 @@ public class CookieInterceptor extends AbstractInterceptor {
String name = cookie.getName();
String value = cookie.getValue();
- if (acceptedPattern.matcher(name).matches()) {
+ if (isAcceptableName(name) && isAcceptableValue(value)) {
if (cookiesNameSet.contains("*")) {
if (LOG.isDebugEnabled()) {
LOG.debug("contains cookie name [*] in configured cookies name set, cookie with name [" + name + "] with value [" + value + "] will be injected");
@@ -233,7 +235,7 @@ public class CookieInterceptor extends AbstractInterceptor {
populateCookieValueIntoStack(name, value, cookiesMap, stack);
}
} else {
- LOG.warn("Cookie name [" + name + "] does not match accepted cookie names pattern [" + acceptedPattern + "]");
+ LOG.warn("Cookie name [#0] with value [#1] was rejected!", name, value);
}
}
}
@@ -245,6 +247,72 @@ public class CookieInterceptor extends AbstractInterceptor {
}
/**
+ * Checks if value of Cookie doesn't contain vulnerable code
+ *
+ * @param value of Cookie
+ * @return true|false
+ */
+ protected boolean isAcceptableValue(String value) {
+ boolean matches = !excludedPattern.matcher(value).matches();
+ if (!matches) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+ }
+ }
+ return matches;
+ }
+
+ /**
+ * Checks if name of Cookie doesn't contain vulnerable code
+ *
+ * @param name of Cookie
+ * @return true|false
+ */
+ protected boolean isAcceptableName(String name) {
+ return !isExcluded(name) && isAccepted(name);
+ }
+
+ /**
+ * Checks if name of Cookie match {@link #acceptedPattern}
+ *
+ * @param name of Cookie
+ * @return true|false
+ */
+ protected boolean isAccepted(String name) {
+ boolean matches = acceptedPattern.matcher(name).matches();
+ if (matches) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] matches acceptedPattern [#1]", name, ACCEPTED_PATTERN);
+ }
+ } else {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] doesn't match acceptedPattern [#1]", name, ACCEPTED_PATTERN);
+ }
+ }
+ return matches;
+ }
+
+ /**
+ * Checks if name of Cookie match {@link #excludedPattern}
+ *
+ * @param name of Cookie
+ * @return true|false
+ */
+ protected boolean isExcluded(String name) {
+ boolean matches = excludedPattern.matcher(name).matches();
+ if (matches) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+ }
+ } else {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+ }
+ }
+ return matches;
+ }
+
+ /**
* Hook that populate cookie value into value stack (hence the action)
* if the criteria is satisfied (if the cookie value matches with those configured).
*
http://git-wip-us.apache.org/repos/asf/struts/blob/63152417/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index af6e0b7..d6adf99 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ExcludedPatterns;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
@@ -149,16 +150,20 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH;
protected boolean ordered = false;
- protected Set<Pattern> excludeParams = Collections.emptySet();
+ protected Set<Pattern> excludeParams;
protected Set<Pattern> acceptParams = Collections.emptySet();
private boolean devMode = false;
// Allowed names of parameters
- private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PARAM_NAMES);
+ private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PARAM_NAMES, Pattern.CASE_INSENSITIVE);
private ValueStackFactory valueStackFactory;
+ public ParametersInterceptor() {
+ initializeHardCodedExcludePatterns();
+ }
+
@Inject
public void setValueStackFactory(ValueStackFactory valueStackFactory) {
this.valueStackFactory = valueStackFactory;
@@ -494,6 +499,13 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
return excludeParams;
}
+ protected void initializeHardCodedExcludePatterns() {
+ excludeParams = new HashSet<Pattern>();
+ for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
+ excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
+ }
+ }
+
/**
* Sets a comma-delimited list of regular expressions to match
* parameters that should be removed from the parameter map.
@@ -503,9 +515,8 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
public void setExcludeParams(String commaDelim) {
Collection<String> excludePatterns = ArrayUtils.asCollection(commaDelim);
if (excludePatterns != null) {
- excludeParams = new HashSet<Pattern>();
for (String pattern : excludePatterns) {
- excludeParams.add(Pattern.compile(pattern));
+ excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
}
[06/19] git commit: Updates archetypes' version
Posted by lu...@apache.org.
Updates archetypes' version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/98621574
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/98621574
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/98621574
Branch: refs/heads/feature/exclude-object-class
Commit: 986215740a0c51c4a2a2eb3e2b22c66ebeb279ed
Parents: 149181a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 20:19:02 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 20:19:02 2014 +0200
----------------------------------------------------------------------
src/site/resources/archetype-catalog.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/98621574/src/site/resources/archetype-catalog.xml
----------------------------------------------------------------------
diff --git a/src/site/resources/archetype-catalog.xml b/src/site/resources/archetype-catalog.xml
index d1989bb..fab8fde 100644
--- a/src/site/resources/archetype-catalog.xml
+++ b/src/site/resources/archetype-catalog.xml
@@ -7,42 +7,42 @@
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Blank</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Blank Convention</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Database Portlet</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Plugin</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Portlet</description>
</archetype>
<archetype>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.1</version>
+ <version>2.3.16.2</version>
<repository>http://repo1.maven.org/maven2/</repository>
<description>Struts 2 Archetypes - Starter</description>
</archetype>
[09/19] git commit: [maven-release-plugin] prepare release
STRUTS_2_3_16_2
Posted by lu...@apache.org.
[maven-release-plugin] prepare release STRUTS_2_3_16_2
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7dd83dff
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7dd83dff
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7dd83dff
Branch: refs/heads/feature/exclude-object-class
Commit: 7dd83dff485d324980f3d22c726cfd969ecf41f8
Parents: 7809666
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 21:32:35 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 21:32:35 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 5 +++--
xwork-core/pom.xml | 2 +-
51 files changed, 62 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index dce8aa0..6054fc4 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 9a6abee..0aebae0 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index de7cfb2..f2fc344 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 762ff8f..a16b4d7 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index e7db34c..f98d72b 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index a37db7a..b0c6589 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index cfc3aa7..6cf2aef 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index efd5d19..bf9b7f8 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index ddd6d18..a15b957 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 47a2cd6..237b35a 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index ebf65cd..aa3e820 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 7d7324c..c1e7749 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 4c8a91d..8535f80 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 4456c50..a3baed8 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 5272e3e..229a591 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d5bd71b..7984c29 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 9c93e5b..e9fdc78 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index b643638..a8613a3 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 41523e5..b86c91f 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c875c6d..02aee40 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 6ce324e..8cd0325 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index d9cd9d0..e978b79 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index aefa347..284f1c7 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 6ef817f..a55a797 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index dbda4fb..29846ea 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index c3de1b0..dba899b 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 5f48827..51488be 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index f8fdd21..5ef6f6b 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index ed5441b..3cf1c94 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 60f3fc9..e3a44c4 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 2b718fb..849c815 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index f9b48f3..33d00ea 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index df285ba..444d311 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 8a33c3e..2571fcb 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 8fa9d3c..11e2c22 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 79687b8..457383f 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index c109cc9..b2ab339 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 698e093..8569137 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 7529c52..d98fc9a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 8a70349..9d41d84 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 2ae7758..8134dad 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 41e6ff0..aec4075 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 4cba507..243b1d2 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index d244c4a..3c7b1b8 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 3805202..6bcf252 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index c683cf1..fb84799 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 5433f06..eec0caf 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 235d83c..47b3980 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 8168346..77fb083 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d2ef8b..dc336c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +31,8 @@
<connection>scm:git:git://git.apache.org/struts.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
<url>http://git.apache.org/struts.git</url>
- </scm>
+ <tag>STRUTS_2_3_16_2</tag>
+ </scm>
<issueManagement>
<system>JIRA</system>
http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index e9b35af..34fe8e2 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[05/19] git commit: Adds test cases to test ClassLoader pollution
Posted by lu...@apache.org.
Adds test cases to test ClassLoader pollution
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/149181a7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/149181a7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/149181a7
Branch: refs/heads/feature/exclude-object-class
Commit: 149181a776afc94a39676a570bda72e14826476e
Parents: 6315241
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 19:52:03 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 19:52:03 2014 +0200
----------------------------------------------------------------------
.../interceptor/CookieInterceptorTest.java | 66 ++++++++++++++++++++
.../interceptor/ParametersInterceptorTest.java | 64 +++++++++++++++++++
2 files changed, 130 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/149181a7/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index 2d22fac..d1014a8 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -22,10 +22,12 @@
package org.apache.struts2.interceptor;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.Cookie;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -316,6 +318,70 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
assertEquals(ActionContext.getContext().getValueStack().findValue("cookie3"), null);
}
+ public void testCookiesWithClassPollution() throws Exception {
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ String pollution1 = "model['class']['classLoader']['jarPath']";
+ String pollution2 = "model.class.classLoader.jarPath";
+ String pollution3 = "class.classLoader.jarPath";
+ String pollution4 = "class['classLoader']['jarPath']";
+ String pollution5 = "model[\"class\"]['classLoader']['jarPath']";
+ String pollution6 = "class[\"classLoader\"]['jarPath']";
+
+ request.setCookies(
+ new Cookie(pollution1, "pollution1"),
+ new Cookie("pollution1", pollution1),
+ new Cookie(pollution2, "pollution2"),
+ new Cookie("pollution2", pollution2),
+ new Cookie(pollution3, "pollution3"),
+ new Cookie("pollution3", pollution3),
+ new Cookie(pollution4, "pollution4"),
+ new Cookie("pollution4", pollution4),
+ new Cookie(pollution5, "pollution5"),
+ new Cookie("pollution5", pollution5),
+ new Cookie(pollution6, "pollution6"),
+ new Cookie("pollution6", pollution6)
+ );
+ ServletActionContext.setRequest(request);
+
+ final Map<String, Boolean> excludedName = new HashMap<String, Boolean>();
+ final Map<String, Boolean> excludedValue = new HashMap<String, Boolean>();
+
+ CookieInterceptor interceptor = new CookieInterceptor() {
+ @Override
+ protected boolean isAcceptableName(String name) {
+ boolean accepted = super.isAcceptableName(name);
+ excludedName.put(name, accepted);
+ return accepted;
+ }
+
+ @Override
+ protected boolean isAcceptableValue(String value) {
+ boolean accepted = super.isAcceptableValue(value);
+ excludedValue.put(value, accepted);
+ return accepted;
+ }
+ };
+ interceptor.setCookiesName("*");
+
+ MockActionInvocation invocation = new MockActionInvocation();
+ invocation.setAction(new MockActionWithCookieAware());
+
+ interceptor.intercept(invocation);
+
+ assertFalse(excludedName.get(pollution1));
+ assertFalse(excludedName.get(pollution2));
+ assertFalse(excludedName.get(pollution3));
+ assertFalse(excludedName.get(pollution4));
+ assertFalse(excludedName.get(pollution5));
+ assertFalse(excludedName.get(pollution6));
+
+ assertFalse(excludedValue.get(pollution1));
+ assertFalse(excludedValue.get(pollution2));
+ assertFalse(excludedValue.get(pollution3));
+ assertFalse(excludedValue.get(pollution4));
+ assertFalse(excludedValue.get(pollution5));
+ assertFalse(excludedValue.get(pollution6));
+ }
public static class MockActionWithCookieAware extends ActionSupport implements CookiesAware {
http://git-wip-us.apache.org/repos/asf/struts/blob/149181a7/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index e616fb8..21c7da9 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -18,6 +18,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ExcludedPatterns;
import com.opensymphony.xwork2.ModelDrivenAction;
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.TestBean;
@@ -44,10 +45,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
/**
@@ -184,6 +187,62 @@ public class ParametersInterceptorTest extends XWorkTestCase {
assertNull(session.get("user5"));
}
+ public void testArrayClassPollutionBlockedByPattern() throws Exception {
+ // given
+ final String pollution1 = "model.class.classLoader.jarPath";
+ final String pollution2 = "model['class']['classLoader']['jarPath']";
+ final String pollution3 = "model[\"class\"]['classLoader']['jarPath']";
+ final String pollution4 = "class.classLoader.jarPath";
+ final String pollution5 = "class['classLoader']['jarPath']";
+ final String pollution6 = "class[\"classLoader\"]['jarPath']";
+
+ loadConfigurationProviders(new XWorkConfigurationProvider(), new XmlConfigurationProvider("xwork-param-test.xml"));
+ final Map<String, Object> params = new HashMap<String, Object>() {
+ {
+ put(pollution1, "bad");
+ put(pollution2, "bad");
+ put(pollution3, "bad");
+ put(pollution4, "bad");
+ put(pollution5, "bad");
+ put(pollution6, "bad");
+ }
+ };
+
+ final Map<String, Boolean> excluded = new HashMap<String, Boolean>();
+ ParametersInterceptor pi = new ParametersInterceptor() {
+
+ @Override
+ protected void initializeHardCodedExcludePatterns() {
+ this.excludeParams = new HashSet<Pattern>();
+ }
+
+ @Override
+ protected boolean isExcluded(String paramName) {
+ boolean result = super.isExcluded(paramName);
+ excluded.put(paramName, result);
+ return result;
+ }
+
+ };
+
+ pi.setExcludeParams("(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*");
+ container.inject(pi);
+ ValueStack vs = ActionContext.getContext().getValueStack();
+
+ // when
+ ValidateAction action = new ValidateAction();
+ pi.setParameters(action, vs, params);
+
+ // then
+ assertEquals(0, action.getActionMessages().size());
+ assertTrue(excluded.get(pollution1));
+ assertTrue(excluded.get(pollution2));
+ assertTrue(excluded.get(pollution3));
+ assertTrue(excluded.get(pollution4));
+ assertTrue(excluded.get(pollution5));
+ assertTrue(excluded.get(pollution6));
+ }
+
public void testAccessToOgnlInternals() throws Exception {
// given
Map<String, Object> params = new HashMap<String, Object>();
@@ -571,6 +630,11 @@ public class ParametersInterceptorTest extends XWorkTestCase {
assertEquals(expected, actual);
}
+ public void testExcludedPatternsGetInitialized() throws Exception {
+ ParametersInterceptor parametersInterceptor = new ParametersInterceptor();
+ assertEquals(ExcludedPatterns.EXCLUDED_PATTERNS.length, parametersInterceptor.excludeParams.size());
+ }
+
private ValueStack injectValueStack(Map<String, Object> actual) {
ValueStack stack = createStubValueStack(actual);
container.inject(stack);
[18/19] git commit: Adds default param to reduce noise in the logs
during building
Posted by lu...@apache.org.
Adds default param to reduce noise in the logs during building
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/086c0a0d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/086c0a0d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/086c0a0d
Branch: refs/heads/feature/exclude-object-class
Commit: 086c0a0d5200acb04fe62eb86f5462d23d5891ba
Parents: d35072c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 06:41:07 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 06:41:07 2014 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/mock/MockResult.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/086c0a0d/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
index 53eac63..d988df5 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
@@ -26,6 +26,8 @@ import com.opensymphony.xwork2.Result;
*/
public class MockResult implements Result {
+ public static final String DEFAULT_PARAM = null;
+
@Override
public boolean equals(Object o) {
if (this == o) {
[08/19] git commit: Updates maven-release-plugin to solve problem
with tagging
Posted by lu...@apache.org.
Updates maven-release-plugin to solve problem with tagging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/78096665
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/78096665
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/78096665
Branch: refs/heads/feature/exclude-object-class
Commit: 78096665fea8f4265df172b1bc6f74facedfcd99
Parents: 1540ab3
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 21:13:06 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 21:13:06 2014 +0200
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/78096665/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d7f275..9d2ef8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<version>2.3.16.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
- <url>http://struts.apache.org/2.x/</url>
+ <url>http://struts.apache.org/</url>
<description>Apache Struts 2</description>
<inceptionYear>2000</inceptionYear>
@@ -123,7 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.52</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -175,6 +175,11 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
[07/19] git commit: Updates maven-release-plugin to solve problem
with tagging
Posted by lu...@apache.org.
Updates maven-release-plugin to solve problem with tagging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1540ab3c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1540ab3c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1540ab3c
Branch: refs/heads/feature/exclude-object-class
Commit: 1540ab3c74b323890caa82046e69d507c936e361
Parents: 9862157
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Apr 24 20:46:43 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Apr 24 20:46:43 2014 +0200
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1540ab3c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e89047..0d7f275 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
</plugin>
[17/19] git commit: Merge branch 'master' into develop
Posted by lu...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d35072cd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d35072cd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d35072cd
Branch: refs/heads/feature/exclude-object-class
Commit: d35072cd66f48205ac7e8affdfda8e6e6b86fa04
Parents: 519aefd c9fd44f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 14:52:50 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 14:52:50 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/19] git commit: Merge branch 'master' into develop
Posted by lu...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c22146b9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c22146b9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c22146b9
Branch: refs/heads/feature/exclude-object-class
Commit: c22146b9e30a2ff6b1a6aa446d3698d31eac0835
Parents: 9519cd1 1be8ed6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Apr 28 08:51:05 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Apr 28 08:51:05 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
archetypes/struts2-archetype-convention/pom.xml | 2 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
core/src/main/resources/struts-default.xml | 8 +--
.../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 5 +-
src/site/resources/archetype-catalog.xml | 12 ++--
xwork-core/pom.xml | 2 +-
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++
.../interceptor/ParametersInterceptor.java | 19 +++--
.../interceptor/ParametersInterceptorTest.java | 64 +++++++++++++++++
58 files changed, 302 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
[16/19] git commit: Overrides pattern exclusion initialisation to
allow test to pass
Posted by lu...@apache.org.
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9fd44fb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9fd44fb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9fd44fb
Branch: refs/heads/feature/exclude-object-class
Commit: c9fd44fbd552a8b3474fe846be2d2834453133ef
Parents: 1be8ed6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 14:52:20 2014 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptorTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c9fd44fb/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends XWorkTestCase {
return result;
}
+ @Override
+ protected void initializeHardCodedExcludePatterns() {
+ excludeParams = new HashSet<Pattern>();
+ }
};
container.inject(pi);
[15/19] git commit: Overrides pattern exclusion initialisation to
allow test to pass
Posted by lu...@apache.org.
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/519aefdc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/519aefdc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/519aefdc
Branch: refs/heads/feature/exclude-object-class
Commit: 519aefdc86add277a16e46d235328791d910177c
Parents: dddb273
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 14:50:34 2014 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptorTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/519aefdc/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends XWorkTestCase {
return result;
}
+ @Override
+ protected void initializeHardCodedExcludePatterns() {
+ excludeParams = new HashSet<Pattern>();
+ }
};
container.inject(pi);
[19/19] git commit: Merge branch 'develop' into
feature/exclude-object-class
Posted by lu...@apache.org.
Merge branch 'develop' into feature/exclude-object-class
Conflicts:
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5946d08
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5946d08
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5946d08
Branch: refs/heads/feature/exclude-object-class
Commit: a5946d0814b6245f1e83e4ff8e5f337b045991ae
Parents: ba0ac0d 086c0a0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 06:43:31 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 06:43:31 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
core/src/main/resources/struts-default.xml | 8 +--
.../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++
plugins/rest/pom.xml | 2 +-
pom.xml | 3 +-
src/site/resources/archetype-catalog.xml | 12 ++--
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++
.../interceptor/ParametersInterceptor.java | 2 +-
.../opensymphony/xwork2/mock/MockResult.java | 2 +
.../interceptor/ParametersInterceptorTest.java | 68 ++++++++++++++++++
10 files changed, 242 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --cc xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index e09ab54,c73b057..6de6aad
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@@ -485,9 -507,8 +485,9 @@@ public class ParametersInterceptor exte
public void setExcludeParams(String commaDelim) {
Collection<String> excludePatterns = ArrayUtils.asCollection(commaDelim);
if (excludePatterns != null) {
+ excludeParams = new HashSet<Pattern>();
for (String pattern : excludePatterns) {
- excludeParams.add(Pattern.compile(pattern));
+ excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------