packages/freemarker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 解决ISSUE：更新依赖版本：jakarta.el:jakarta.el-api:4.0.0

Browse Source 
From: @desert-sailor 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-06-20 07:38:25 +00:00 committed by Gitee
commit 4f4e32178f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freemarker-2.3.30-use-jakarta-el.patch → freemarker-2.3.31-use-jakarta-el.patch
View File

@ -7,7 +7,7 @@ index 0b03c2b..e880d34 100644
<dependency org="javax.servlet" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" /> <dependency org="javax.servlet" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" /> <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
- -
+ <dependency org="jakarta.el" name="jakarta.el-api" rev="3.0.3" /> + <dependency org="jakarta.el" name="jakarta.el-api" rev="4.0.0" />
+ +
<dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" /> <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />

8
freemarker.spec
View File

@ -2,7 +2,7 @@
Name: freemarker Name: freemarker
Version: 2.3.31 Version: 2.3.31
Release: 1 Release: 2
Summary: The Apache FreeMarker Template Engine Summary: The Apache FreeMarker Template Engine
License: ASL 2.0 License: ASL 2.0
URL: https://freemarker.apache.org/ URL: https://freemarker.apache.org/
@ -13,13 +13,14 @@ Patch3: fix-javadoc-encoding.patch
Patch5: no-javarebel.patch Patch5: no-javarebel.patch
Patch6: enable-jdom.patch Patch6: enable-jdom.patch
Patch7: javacc-7.patch Patch7: javacc-7.patch
Patch8: freemarker-2.3.30-use-jakarta-el.patch Patch8: freemarker-2.3.31-use-jakarta-el.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: java-1.8.0-openjdk-devel ant apache-parent apache-commons-logging aqute-bnd hamcrest BuildRequires: java-1.8.0-openjdk-devel ant apache-parent apache-commons-logging aqute-bnd hamcrest
BuildRequires: ivy-local glassfish-jsp-api glassfish-servlet-api javacc >= 7.0 jaxen >= 1.1 BuildRequires: ivy-local glassfish-jsp-api glassfish-servlet-api javacc >= 7.0 jaxen >= 1.1
BuildRequires: jcl-over-slf4j jdom >= 1.0 junit log4j-over-slf4j slf4j BuildRequires: jcl-over-slf4j jdom >= 1.0 junit log4j-over-slf4j slf4j
BuildRequires: xalan-j2 >= 2.7.0 BuildRequires: xalan-j2 >= 2.7.0
BuildRequires: jakarta-el >= 4.0.0
%if %{without jp_minimal} %if %{without jp_minimal}
BuildRequires: dom4j BuildRequires: dom4j
@ -90,6 +91,9 @@ export LANG=C.UTF-8
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Tue Apr 18 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.3.31-2
- Update jakarta-el to 4.0.0
* Wed Jun 01 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 2.3.31-1 * Wed Jun 01 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 2.3.31-1
- Update to 2.3.31 - Update to 2.3.31