I2P_Developers/i2p.i2p-bote
3
0
Fork 0
Code Issues 4 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade Tomcat to 8.5.40

Browse Source
This commit is contained in:
Jack Grigg
2019-04-21 13:11:32 +01:00
parent 697f31fb41
commit 2451f1503a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/build.gradle
View File

@ -54,15 +54,15 @@ precompileJsp.dependsOn compileJava
compileJspJava.dependsOn precompileJsp
dependencies {
jasper 'org.mortbay.jasper:apache-el:8.5.23'
jasper 'org.mortbay.jasper:apache-jsp:8.5.23'
jasper 'org.mortbay.jasper:apache-el:8.5.40'
jasper 'org.mortbay.jasper:apache-jsp:8.5.40'
compile project(':core')
implementation "net.i2p.client:mstreaming:$rootProject.i2pVersion"
implementation 'org.apache.tomcat:tomcat-jsp-api:8.5.23'
implementation 'org.apache.tomcat:tomcat-servlet-api:8.5.23'
implementation 'org.apache.tomcat:tomcat-jsp-api:8.5.40'
implementation 'org.apache.tomcat:tomcat-servlet-api:8.5.40'
compile 'org.jfree:jcommon:1.0.23'
compile 'org.jfree:jfreechart:1.0.19'
compile 'org.owasp:csrfguard:3.1.0'

3
webapp/src/main/webapp/importContact.jsp
View File

@ -99,8 +99,7 @@
<input type="hidden" name="destination" value="${result.destination}"/>
<input type="hidden" name="picture" value="${result.pictureBase64}"/>
<input type="hidden" name="text" value="${fn:escapeXml(result.text)}"/>
<ib:message key="Import" var="import" scope="request"/>
<input type="submit" value="${import}"/>
<button type="submit"><ib:message key="Import"/></button>
</csrf:form>
</c:if>
</c:if>