Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6671 Update to apache jsp 8.5.70 (#6676) 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2021-08-30 12:24:40 +10:00 committed by GitHub
parent 59b21557a7
commit ef95c9b3ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -73,20 +73,20 @@
javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional,
javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional,
javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional,
org.apache.el;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.el.lang;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.el.stream;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.el.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.el.parser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.compiler;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.runtime;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.security;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.servlet;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.jasper.xmlparser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.el;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.el.lang;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.el.stream;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.el.util;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.el.parser;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.compiler;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.compiler.tagplugin;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.runtime;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.security;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.servlet;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.tagplugins.jstl;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.util;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.jasper.xmlparser;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.apache.taglibs.standard;version="1.2";resolution:=optional,
org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
@ -110,7 +110,7 @@
org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
org.apache.tomcat;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
org.apache.tomcat;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
org.osgi.*,
org.xml.*;resolution:=optional,
@ -121,8 +121,8 @@
javax.xml.parser;resolution:=optional
</Import-Package>
<DynamicImport-Package>org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",
org.apache.jasper.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))",
org.apache.el.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))"</DynamicImport-Package>
org.apache.jasper.*;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))",
org.apache.el.*;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))"</DynamicImport-Package>
</instructions>
</configuration>
</plugin>

17
jetty-osgi/pom.xml
View File

@ -79,6 +79,23 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>set-jsp-osgi-version</id>
<phase>validate</phase>
<goals>
<goal>parse-version</goal>
</goals>
<configuration>
<propertyPrefix>parsedJspVersion</propertyPrefix>
<versionString>${jsp.version}</versionString>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

2
pom.xml
View File

@ -24,7 +24,7 @@
<logback.version>1.2.3</logback.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
<alpn.api.version>1.1.3.v20160715</alpn.api.version>
<jsp.version>8.5.68</jsp.version>
<jsp.version>8.5.70</jsp.version>
<infinispan.version>9.4.8.Final</infinispan.version>
<infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
<gson.version>2.8.6</gson.version>