Skip to content

Commit d1e6eea

Browse files
mbienmbien
committed
updated dependencies + added commons-text to fix deprecation of lang3.StringEscapeUtils.
1 parent f1862f7 commit d1e6eea

File tree

17 files changed

+46
-34
lines changed

17 files changed

+46
-34
lines changed

‎app/pom.xml

+19-7
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ limitations under the License.
4040
<jstl.version>1.2</jstl.version>
4141
<angular.version>1.7.8</angular.version>
4242
<ant.version>1.10.8</ant.version>
43-
<asm.version>8.0.1</asm.version>
44-
<commons-validator.version>1.6</commons-validator.version>
43+
<asm.version>9.0-beta</asm.version>
44+
<commons-validator.version>1.7</commons-validator.version>
4545
<commons-beanutils.version>1.9.4</commons-beanutils.version>
4646
<commons-httpclient.version>3.1</commons-httpclient.version>
47-
<commons-codec.version>1.14</commons-codec.version>
47+
<commons-codec.version>1.15</commons-codec.version>
4848
<eclipse-link.version>2.7.7</eclipse-link.version>
4949
<guice.version>4.2.3</guice.version>
50-
<log4j2.version>2.12.1</log4j2.version>
51-
<lucene.version>8.6.0</lucene.version>
50+
<log4j2.version>2.13.3</log4j2.version>
51+
<lucene.version>8.6.2</lucene.version>
5252
<oauth-core.version>20100527</oauth-core.version>
5353
<maven-war.version>3.2.3</maven-war.version>
5454
<maven-surefire.version>2.17</maven-surefire.version>
5555
<maven-antrun.version>1.0b3</maven-antrun.version>
5656
<rome.version>1.15.0</rome.version>
5757
<slf4j.version>1.7.30</slf4j.version>
58-
<spring.version>5.2.7.RELEASE</spring.version>
59-
<spring.security.version>5.3.3.RELEASE</spring.security.version>
58+
<spring.version>5.2.9.RELEASE</spring.version>
59+
<spring.security.version>5.4.0</spring.security.version>
6060
<struts.version>2.5.22</struts.version>
6161
<velocity.version>2.2</velocity.version>
6262
<webjars.version>1.5</webjars.version>
@@ -215,6 +215,12 @@ limitations under the License.
215215
<groupId>org.apache.struts</groupId>
216216
<artifactId>struts2-core</artifactId>
217217
<version>${struts.version}</version>
218+
<exclusions>
219+
<exclusion>
220+
<groupId>org.apache.logging.log4j</groupId>
221+
<artifactId>log4j-api</artifactId>
222+
</exclusion>
223+
</exclusions>
218224
</dependency>
219225

220226
<dependency>
@@ -367,6 +373,12 @@ limitations under the License.
367373
<artifactId>commons-codec</artifactId>
368374
<version>${commons-codec.version}</version>
369375
</dependency>
376+
377+
<dependency>
378+
<groupId>org.apache.commons</groupId>
379+
<artifactId>commons-text</artifactId>
380+
<version>1.9</version>
381+
</dependency>
370382

371383
<dependency>
372384
<groupId>xml-security</groupId>

‎app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.Calendar;
3838
import java.util.Date;
3939
import java.util.List;
40-
import org.apache.commons.lang3.StringEscapeUtils;
40+
import org.apache.commons.text.StringEscapeUtils;
4141
import org.apache.commons.lang3.StringUtils;
4242
import org.apache.commons.logging.Log;
4343
import org.apache.commons.logging.LogFactory;

‎app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.roller.weblogger.business.plugins.entry;
2020

21-
import org.apache.commons.lang3.StringEscapeUtils;
21+
import org.apache.commons.text.StringEscapeUtils;
2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;
2424
import org.apache.roller.weblogger.WebloggerException;

‎app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Properties;
2323
import java.util.regex.Matcher;
2424
import java.util.regex.Pattern;
25-
import org.apache.commons.lang3.StringEscapeUtils;
25+
import org.apache.commons.text.StringEscapeUtils;
2626
import org.apache.commons.logging.Log;
2727
import org.apache.commons.logging.LogFactory;
2828
import org.apache.roller.weblogger.WebloggerException;

‎app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.StringTokenizer;
3838
import java.util.TreeSet;
3939

40-
import org.apache.commons.lang3.StringEscapeUtils;
40+
import org.apache.commons.text.StringEscapeUtils;
4141
import org.apache.commons.lang3.StringUtils;
4242
import org.apache.commons.lang3.builder.EqualsBuilder;
4343
import org.apache.commons.lang3.builder.HashCodeBuilder;

‎app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.roller.weblogger.pojos.wrapper;
2020

2121
import java.sql.Timestamp;
22-
import org.apache.commons.lang3.StringEscapeUtils;
22+
import org.apache.commons.text.StringEscapeUtils;
2323
import org.apache.roller.weblogger.business.URLStrategy;
2424
import org.apache.roller.weblogger.business.WebloggerFactory;
2525
import org.apache.roller.weblogger.business.plugins.PluginManager;

‎app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.roller.weblogger.pojos.wrapper;
2020

21-
import org.apache.commons.lang3.StringEscapeUtils;
21+
import org.apache.commons.text.StringEscapeUtils;
2222
import org.apache.roller.weblogger.WebloggerException;
2323
import org.apache.roller.weblogger.business.URLStrategy;
2424
import org.apache.roller.weblogger.pojos.TagStat;

‎app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.Map;
2727
import java.util.Set;
2828
import java.util.TreeSet;
29-
import org.apache.commons.lang3.StringEscapeUtils;
29+
import org.apache.commons.text.StringEscapeUtils;
3030

3131
import org.apache.commons.lang3.StringUtils;
3232
import org.apache.lucene.document.Document;
@@ -240,7 +240,7 @@ public WeblogWrapper getWeblog() {
240240
public String getTerm() {
241241
String query =feedRequest.getTerm() ;
242242
return (query == null)
243-
? "" : StringEscapeUtils.escapeXml(Utilities.escapeHTML(query));
243+
? "" : StringEscapeUtils.escapeXml11(Utilities.escapeHTML(query));
244244
}
245245

246246
public int getHits() {

‎app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.TreeMap;
2828
import java.util.TreeSet;
2929

30-
import org.apache.commons.lang3.StringEscapeUtils;
30+
import org.apache.commons.text.StringEscapeUtils;
3131
import org.apache.commons.lang3.StringUtils;
3232
import org.apache.lucene.document.Document;
3333
import org.apache.lucene.search.ScoreDoc;

‎app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.TimeZone;
2525
import java.util.regex.Matcher;
2626
import java.util.regex.Pattern;
27-
import org.apache.commons.lang3.StringEscapeUtils;
27+
import org.apache.commons.text.StringEscapeUtils;
2828
import org.apache.commons.lang3.StringUtils;
2929
import org.apache.commons.logging.Log;
3030
import org.apache.commons.logging.LogFactory;
@@ -253,7 +253,7 @@ public String unescapeHTML(String str) {
253253
}
254254

255255
public String escapeXML(String str) {
256-
return StringEscapeUtils.escapeXml(str);
256+
return StringEscapeUtils.escapeXml11(str);
257257
}
258258

259259
public String unescapeXML(String str) {

‎app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.roller.weblogger.ui.rendering.util;
2020

21-
import org.apache.commons.lang3.StringEscapeUtils;
21+
import org.apache.commons.text.StringEscapeUtils;
2222
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
2323
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
2424

‎app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import javax.servlet.http.HttpServlet;
2424
import javax.servlet.http.HttpServletRequest;
2525
import javax.servlet.http.HttpServletResponse;
26-
import org.apache.commons.lang3.StringEscapeUtils;
27-
import org.apache.commons.lang3.text.WordUtils;
26+
import org.apache.commons.text.StringEscapeUtils;
27+
import org.apache.commons.text.WordUtils;
2828
import org.apache.roller.weblogger.business.Weblogger;
2929
import org.apache.roller.weblogger.business.WebloggerFactory;
3030
import org.apache.roller.weblogger.business.WeblogEntryManager;

‎app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.roller.weblogger.ui.struts2.util;
2020

2121
import com.opensymphony.xwork2.ActionSupport;
22-
import org.apache.commons.lang3.StringEscapeUtils;
22+
import org.apache.commons.text.StringEscapeUtils;
2323
import org.apache.roller.weblogger.business.UserManager;
2424
import org.apache.roller.weblogger.business.WebloggerFactory;
2525
import org.apache.roller.weblogger.config.WebloggerConfig;

‎app/src/main/java/org/apache/roller/weblogger/util/Trackback.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.commons.httpclient.HttpMethod;
3131
import org.apache.commons.httpclient.HttpStatus;
3232
import org.apache.commons.httpclient.methods.PostMethod;
33-
import org.apache.commons.lang3.StringEscapeUtils;
33+
import org.apache.commons.text.StringEscapeUtils;
3434
import org.apache.commons.lang3.StringUtils;
3535
import org.apache.commons.logging.Log;
3636
import org.apache.commons.logging.LogFactory;

‎app/src/main/java/org/apache/roller/weblogger/util/Utilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import javax.mail.internet.InternetAddress;
2929

3030
import org.apache.commons.codec.binary.Base64;
31-
import org.apache.commons.lang3.StringEscapeUtils;
31+
import org.apache.commons.text.StringEscapeUtils;
3232
import org.apache.commons.lang3.StringUtils;
3333
import org.apache.commons.logging.Log;
3434
import org.apache.commons.logging.LogFactory;

‎app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import javax.servlet.http.HttpServlet;
2424
import javax.servlet.http.HttpServletRequest;
2525
import javax.servlet.http.HttpServletResponse;
26-
import org.apache.commons.lang3.StringEscapeUtils;
26+
import org.apache.commons.text.StringEscapeUtils;
2727
import org.apache.roller.weblogger.WebloggerException;
2828
import org.apache.roller.weblogger.business.URLStrategy;
2929
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -79,24 +79,24 @@ public void doGet(
7979
} catch (WebloggerException ex) {
8080
throw new ServletException("ERROR: fetching specified weblog");
8181
}
82-
searchPage = StringEscapeUtils.escapeXml(
82+
searchPage = StringEscapeUtils.escapeXml11(
8383
strat.getWeblogSearchPageURLTemplate(weblog));
84-
searchFeed = StringEscapeUtils.escapeXml(
84+
searchFeed = StringEscapeUtils.escapeXml11(
8585
strat.getWeblogSearchFeedURLTemplate(weblog));
8686

8787
boolean siteWide = WebloggerRuntimeConfig.isSiteWideWeblog(handle);
8888
if (siteWide) {
89-
shortName = "[Search Descriptor] " + StringEscapeUtils.escapeXml(
89+
shortName = "[Search Descriptor] " + StringEscapeUtils.escapeXml11(
9090
WebloggerRuntimeConfig.getProperty("site.shortName"));
91-
description = StringEscapeUtils.escapeXml(
91+
description = StringEscapeUtils.escapeXml11(
9292
WebloggerRuntimeConfig.getProperty("site.description"));
93-
contact = StringEscapeUtils.escapeXml(
93+
contact = StringEscapeUtils.escapeXml11(
9494
WebloggerRuntimeConfig.getProperty("site.adminemail"));
9595

9696
} else {
97-
shortName = StringEscapeUtils.escapeXml(weblog.getName());
98-
description = StringEscapeUtils.escapeXml(weblog.getTagline());
99-
contact = StringEscapeUtils.escapeXml(weblog.getEmailAddress());
97+
shortName = StringEscapeUtils.escapeXml11(weblog.getName());
98+
description = StringEscapeUtils.escapeXml11(weblog.getTagline());
99+
contact = StringEscapeUtils.escapeXml11(weblog.getEmailAddress());
100100
}
101101

102102
response.setContentType("application/opensearchdescription+xml");

‎app/src/main/webapp/WEB-INF/security.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
xsi:schemaLocation="http://www.springframework.org/schema/beans
2323
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
2424
http://www.springframework.org/schema/security
25-
http://www.springframework.org/schema/security/spring-security-5.3.xsd">
25+
http://www.springframework.org/schema/security/spring-security-5.4.xsd">
2626

2727
<http pattern="/images/**" security="none"/>
2828
<http pattern="/scripts/**" security="none"/>

0 commit comments

Comments
 (0)