This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from dca74313 (Added note on what's not forward ported yet. Also, now 2.x
uses Gradle too, so that's not a change anymore.)
new 64ae1097 Servlet: Switched from javax to Jakarta. JSP tag support is
currently broken, but we probably should remove it anyway. Also updated Spring
to 6.x, as that's what already supports on Jakarta.
new 2d9cceb2 Spring: Updated tests to run on Spring 6. (There were many
URL-s with an extra character at the end, that apparently worked on some much
older Spring version.)
The 2 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:
FM3-CHANGE-LOG.txt | 2 +
README.md | 2 +
freemarker-manual/src/main/docgen/en_US/book.xml | 22 +++----
freemarker-servlet/build.gradle.kts | 38 ++++++------
.../freemarker/servlet/AllHttpScopesHashModel.java | 6 +-
.../freemarker/servlet/FreemarkerServlet.java | 16 ++---
.../freemarker/servlet/HttpRequestHashModel.java | 17 ++----
.../servlet/HttpRequestParametersHashModel.java | 17 ++----
.../freemarker/servlet/HttpSessionHashModel.java | 13 ++--
.../org/apache/freemarker/servlet/IncludePage.java | 28 ++++-----
.../apache/freemarker/servlet/InitParamParser.java | 17 +++---
.../servlet/ServletContextHashModel.java | 5 +-
.../freemarker/servlet/WebAppTemplateLoader.java | 23 ++++---
.../freemarker/servlet/jsp/BodyContentImpl.java | 12 ++--
.../freemarker/servlet/jsp/EventForwarding.java | 10 ++--
.../jsp/FreeMarkerJspApplicationContext.java | 28 +++------
.../servlet/jsp/FreeMarkerJspFactory.java | 16 ++---
.../servlet/jsp/FreeMarkerPageContext.java | 22 +++----
.../freemarker/servlet/jsp/JspTagModelBase.java | 6 +-
.../freemarker/servlet/jsp/JspWriterAdapter.java | 7 +--
.../freemarker/servlet/jsp/PageContextFactory.java | 3 +-
.../servlet/jsp/SimpleTagDirectiveModel.java | 21 ++++---
.../freemarker/servlet/jsp/TagDirectiveModel.java | 19 +++---
.../freemarker/servlet/jsp/TaglibFactory.java | 6 +-
.../servlet/DummyMockServletContext.java | 70 +++++++++++++---------
.../freemarker/servlet/FreemarkerServletTest.java | 42 ++++++-------
.../servlet/jsp/JspTestFreemarkerServlet.java | 3 +-
.../servlet/jsp/RealServletContainertTest.java | 35 +++++------
.../freemarker/servlet/jsp/TLDParsingTest.java | 23 ++++---
.../jsp/taglibmembers/AttributeAccessorTag.java | 5 +-
.../jsp/taglibmembers/AttributeInfoTag.java | 13 ++--
.../servlet/jsp/taglibmembers/GetAndSetTag.java | 11 ++--
.../servlet/jsp/taglibmembers/TestSimpleTag.java | 12 ++--
.../servlet/jsp/taglibmembers/TestSimpleTag2.java | 6 +-
.../servlet/jsp/taglibmembers/TestSimpleTag3.java | 6 +-
.../servlet/jsp/taglibmembers/TestTag.java | 10 +---
.../servlet/jsp/taglibmembers/TestTag2.java | 8 +--
.../servlet/jsp/taglibmembers/TestTag3.java | 8 +--
.../servlet/test/DefaultModel2TesterAction.java | 9 ++-
.../freemarker/servlet/test/Model2Action.java | 4 +-
.../servlet/test/Model2TesterServlet.java | 19 +++---
.../freemarker/servlet/test/WebAppTestCase.java | 19 ++----
freemarker-spring/build.gradle.kts | 19 +++---
.../model/AbstractSpringTemplateCallableModel.java | 12 +---
.../AbstractSpringTemplateDirectiveModel.java | 11 ++--
.../model/AbstractSpringTemplateFunctionModel.java | 5 +-
.../freemarker/spring/model/BindDirective.java | 11 ++--
.../spring/model/BindErrorsDirective.java | 11 ++--
.../freemarker/spring/model/EvalFunction.java | 12 +---
.../freemarker/spring/model/MessageFunction.java | 17 ++----
.../spring/model/NestedPathDirective.java | 11 ++--
.../model/SpringTemplateCallableHashModel.java | 13 ++--
.../freemarker/spring/model/ThemeFunction.java | 5 +-
.../freemarker/spring/model/TransformFunction.java | 9 ++-
.../freemarker/spring/model/UrlFunction.java | 47 ++++++---------
...stractCheckedElementTemplateDirectiveModel.java | 9 ++-
...DataBoundFormElementTemplateDirectiveModel.java | 11 ++--
.../form/AbstractFormTemplateDirectiveModel.java | 11 ++--
.../AbstractHtmlElementTemplateDirectiveModel.java | 23 +++----
...ractHtmlInputElementTemplateDirectiveModel.java | 11 ++--
...tMultiCheckedElementTemplateDirectiveModel.java | 22 +++----
...SingleCheckedElementTemplateDirectiveModel.java | 11 ++--
.../model/form/ButtonTemplateDirectiveModel.java | 11 ++--
.../model/form/CheckboxTemplateDirectiveModel.java | 11 ++--
.../form/CheckboxesTemplateDirectiveModel.java | 9 ++-
.../model/form/ErrorsTemplateDirectiveModel.java | 17 +++---
.../model/form/FormTemplateDirectiveModel.java | 28 ++++-----
.../form/HiddenInputTemplateDirectiveModel.java | 11 ++--
.../model/form/InputTemplateDirectiveModel.java | 11 ++--
.../model/form/LabelTemplateDirectiveModel.java | 11 ++--
.../model/form/OptionTemplateDirectiveModel.java | 11 ++--
.../model/form/OptionsTemplateDirectiveModel.java | 11 ++--
.../form/PasswordInputTemplateDirectiveModel.java | 11 ++--
.../form/RadioButtonTemplateDirectiveModel.java | 11 ++--
.../form/RadioButtonsTemplateDirectiveModel.java | 4 +-
.../model/form/SelectTemplateDirectiveModel.java | 23 +++----
.../form/SpringFormTemplateCallableHashModel.java | 13 ++--
.../model/form/TextareaTemplateDirectiveModel.java | 11 ++--
.../spring/web/view/AbstractFreeMarkerView.java | 13 ++--
.../freemarker/spring/web/view/FreeMarkerView.java | 23 +++----
.../spring/web/view/FreeMarkerViewResolver.java | 7 +--
.../spring/web/view/PageContextServlet.java | 12 ++--
.../spring/web/view/PageContextServletConfig.java | 6 +-
.../spring/ConfigurationFactoryBeanTest.java | 22 +++----
.../spring/SpringResourceTemplateLoaderTest.java | 12 ++--
.../freemarker/spring/VersionPropertyTest.java | 5 +-
.../freemarker/spring/model/BindDirectiveTest.java | 10 ++--
.../spring/model/MessageFunctionTest.java | 12 ++--
.../spring/model/NestedPathDirectiveTest.java | 10 ++--
.../freemarker/spring/model/ThemeFunctionTest.java | 10 ++--
.../form/ButtonTemplateDirectiveModelTest.java | 10 ++--
.../form/CheckboxTemplateDirectiveModelTest.java | 16 ++---
.../form/CheckboxesTemplateDirectiveModelTest.java | 14 ++---
.../model/form/FormTemplateDirectiveModelTest.java | 12 ++--
.../HiddenInputTemplateDirectiveModelTest.java | 10 ++--
.../form/InputTemplateDirectiveModelTest.java | 12 ++--
.../form/LabelTemplateDirectiveModelTest.java | 10 ++--
.../PasswordInputTemplateDirectiveModelTest.java | 10 ++--
.../RadioButtonTemplateDirectiveModelTest.java | 12 ++--
.../RadioButtonsTemplateDirectiveModelTest.java | 14 ++---
.../form/SelectTemplateDirectiveModelTest.java | 10 ++--
.../form/TextareaTemplateDirectiveModelTest.java | 10 ++--
.../apache/freemarker/spring/web/view/EchoTag.java | 6 +-
.../web/view/FreeMarkerViewResolverTest.java | 15 +++--
.../spring/web/view/FreeMarkerViewTest.java | 17 +++---
105 files changed, 652 insertions(+), 812 deletions(-)
