This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch WW-5049-velocity-plugin
in repository https://gitbox.apache.org/repos/asf/struts.git.
omit 11571f0 WW-5049 Reverts to static final as this will be refactored
anyway
omit 69c9a10 WW-5049 Drops empty space
omit dddb380 WW-5047 Avoids confusion about scope's default value
omit 93b6efe WW-5049 Supports bean-selection via Java config
omit 5a27216 WW-5049 Drops unused files
omit 4033b68 WW-5049 Sets proper order of configuration elements
omit 383cc29 WW-5049 Adds missing internal dependency
omit edba1ac WW-5049 Renames default bean provider
omit 03b3352 WW-5049 Includes the new plugin in assembly
omit 258153b WW-5049 Extends xwork DTD as well
omit 13ee3d0 WW-5049 Drops name as not needed
omit b6c24de Reorder modules to build apps at the end
omit 73ae360 WW-5049 Allows define a custom bean provider
omit da28c5a WW-5049 Moves Velocity support into a dedicated plugin
add 12ed52e Remove unused xerces import
add 0c17c65 Fix warning: Use parameterized types instead of raw types
add 8485b26 Merge pull request #381 from
sepe81/fix-XmlConfigurationProviderTest
add 2211fab Supresses false positives which will be removed once Velocity
will be upgraded
add b40ea9a Update slf4j to 1.7.29
add 377b0ca Update jackson-databind to 2.10.1
add db9f01a Update asm to 7.2
add 4cff397 Update maven-surefire-plugin to 2.22.2
add 0f5fc65 Update commons-collections4 to 4.4
add 156d9a1 Update commons-lang3 to 3.9
add d705cca Update commons-text to 1.8
add 22d1afd Merge pull request #382 from sepe81/update-dependencies
add 6504e67 Adds a link to Struts Examples pages
add 54d01ae Merge pull request #385 from
JCgH4164838Gh792C124B5/local_25x_TstFix1
add dfbacfc Merge pull request #386 from
JCgH4164838Gh792C124B5/local_26x_TstFix1
add 3082b94 Update maven-wrapper to 0.5.6 and maven to 3.6.3
add fb4c716 Merge pull request #389 from sepe81/update-mvnw
add ba7cd74 Update OWASP dependency-check-maven to 5.2.4
add 7313d4e Merge pull request #388 from sepe81/update-owasp
add 03da857 Fixes Showcase app Tiles example
add 11999d1 WW-5041 Upgrade to OGNL 3.1.26 and adapt to its new features
add 84cf17e Minor follow-up changes to PR #371 - added some additional
exclusions in struts-default.xml. - added log warning that specifies the value
of maxLength involved if applyExpressionMaxLength(maxLength) fails. - added
null guards to two handleOgnlException() methods that could result in an NPE
with #371 changes (a null OgnlException parameter was permissible previously,
correct or not).
add a23db41 Additional change - added unit test (hoping to make coveralls
happy).
add 28a7912 Disable expressionMaxLength by default for Struts 2.5.x.
(#380)
add 7dddaf5 refactor duplicate code. add log info.
add 93f9cf6 increase security log levels to error
add 5e40998 Merge pull request #390 from yasserzamani/ognl3_2_12
add 2fc4b6c Syncs maven-site-plugin version with the latest fluido-skin
version
add 6cec3f4 Avoids failing site generation because of the outdated
dependencies
add 140bea2 WW-5003 Drops XWorkException and uses StrutsException instead
add 8952cff Merge pull request #391 from
apache/WW-5003-drops-xwork-exception
new 5c55e69 WW-5049 Moves Velocity support into a dedicated plugin
new a7cfed7 WW-5049 Allows define a custom bean provider
new ea8e2b5 Reorder modules to build apps at the end
new d0039d1 WW-5049 Drops name as not needed
new df4e193 WW-5049 Extends xwork DTD as well
new 934b5d1 WW-5049 Includes the new plugin in assembly
new 84f8438 WW-5049 Renames default bean provider
new 868ec77 WW-5049 Adds missing internal dependency
new 7c6dfe1 WW-5049 Sets proper order of configuration elements
new 0009bde WW-5049 Drops unused files
new 9c1b0cf WW-5049 Supports bean-selection via Java config
new 503c8b7 WW-5047 Avoids confusion about scope's default value
new 8d8b306 WW-5049 Drops empty space
new a456b1f WW-5049 Reverts to static final as this will be refactored
anyway
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (11571f0)
\
N -- N -- N refs/heads/WW-5049-velocity-plugin (a456b1f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.mvn/wrapper/maven-wrapper.properties | 4 +-
apps/showcase/src/main/webapp/WEB-INF/showcase.jsp | 2 +-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 7 +
.../com/opensymphony/xwork2/ActionChainResult.java | 3 +-
.../com/opensymphony/xwork2/ActionContext.java | 3 +-
.../xwork2/DefaultActionInvocation.java | 9 +-
.../com/opensymphony/xwork2/UnknownHandler.java | 9 +-
.../com/opensymphony/xwork2/XWorkException.java | 144 ---------------------
.../xwork2/config/ConfigurationException.java | 22 ++--
.../config/providers/XmlConfigurationProvider.java | 4 +-
.../xwork2/conversion/TypeConversionException.java | 13 +-
.../xwork2/conversion/impl/DateConverter.java | 6 +-
.../xwork2/conversion/impl/NumberConverter.java | 20 +--
.../conversion/impl/XWorkBasicConverter.java | 16 +--
.../xwork2/conversion/impl/XWorkList.java | 4 +-
.../opensymphony/xwork2/inject/ContainerImpl.java | 11 +-
.../interceptor/ScopedModelDrivenInterceptor.java | 4 +-
.../annotations/AnnotationWorkflowInterceptor.java | 4 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 22 ++++
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 20 ++-
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 6 +-
.../ognl/accessor/XWorkListPropertyAccessor.java | 6 +-
.../opensymphony/xwork2/util/ClassPathFinder.java | 4 +-
.../com/opensymphony/xwork2/util/DomHelper.java | 8 +-
.../util/classloader/ReloadingClassLoader.java | 6 +-
.../util/reflection/ReflectionException.java | 4 +-
.../xwork2/validator/DefaultValidatorFactory.java | 4 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../java/org/apache/struts2/StrutsException.java | 49 ++++++-
.../apache/struts2/util/StrutsTypeConverter.java | 2 +-
.../org/apache/struts2/views/jsp/ui/OgnlTool.java | 7 +
.../org/apache/struts2/default.properties | 11 ++
core/src/main/resources/struts-default.xml | 9 ++
.../opensymphony/xwork2/ActionInvocationTest.java | 8 +-
.../com/opensymphony/xwork2/ChainResultTest.java | 3 +-
.../config/providers/SomeUnknownHandler.java | 6 +-
.../providers/XmlConfigurationProviderTest.java | 37 +++---
.../conversion/impl/XWorkBasicConverterTest.java | 12 +-
.../ExceptionMappingInterceptorTest.java | 57 ++++----
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 64 ++++++++-
.../xwork2/ognl/OgnlValueStackTest.java | 103 ++++++++++++++-
.../DefaultActionValidatorManagerTest.java | 4 +-
.../validator/DefaultValidatorFileParserTest.java | 10 +-
.../apache/struts2/StrutsExceptionTest.java} | 29 +++--
.../interceptor/FileUploadInterceptorTest.java | 9 +-
.../apache/struts2/result/StreamResultTest.java | 17 ++-
.../providers/xwork-test-exception-mappings.xml | 2 +-
mvnw | 8 +-
mvnw.cmd | 8 +-
.../convention/ConventionUnknownHandler.java | 11 +-
.../struts2/convention/DefaultClassFinder.java | 6 +-
pom.xml | 24 ++--
src/etc/project-suppression.xml | 120 ++++++++++++++++-
54 files changed, 615 insertions(+), 371 deletions(-)
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/XWorkException.java
rename core/src/test/java/{com/opensymphony/xwork2/XWorkExceptionTest.java =>
org/apache/struts2/StrutsExceptionTest.java} (66%)
