Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc updates + lang3.StringEscapeUtils deprecation + stylesheet edit action fix #70

Merged
merged 4 commits into from
Mar 16, 2021
Merged

Misc updates + lang3.StringEscapeUtils deprecation + stylesheet edit action fix #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3d5d10
made fast path faster.
mbien Jul 10, 2020
233ba64
updated lucene and rome dependencies to latest version.
mbien Jul 19, 2020
1ad8529
fixed bug: custom stylesheet is never set to the StylesheetEdit.jsp a…
mbien Aug 6, 2020
8475fda
updated dependencies + added commons-text to fix deprecation of lang3…
mbien Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@ limitations under the License.
<jstl.version>1.2</jstl.version>
<angular.version>1.7.8</angular.version>
<ant.version>1.10.8</ant.version>
<asm.version>8.0.1</asm.version>
<commons-validator.version>1.6</commons-validator.version>
<asm.version>9.0-beta</asm.version>
<commons-validator.version>1.7</commons-validator.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.14</commons-codec.version>
<commons-codec.version>1.15</commons-codec.version>
<eclipse-link.version>2.7.7</eclipse-link.version>
<guice.version>4.2.3</guice.version>
<log4j2.version>2.12.1</log4j2.version>
<lucene.version>8.5.1</lucene.version>
<log4j2.version>2.13.3</log4j2.version>
<lucene.version>8.6.2</lucene.version>
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.2.3</maven-war.version>
<maven-surefire.version>2.17</maven-surefire.version>
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.13.1</rome.version>
<rome.version>1.15.0</rome.version>
<slf4j.version>1.7.30</slf4j.version>
<spring.version>5.2.7.RELEASE</spring.version>
<spring.security.version>5.3.3.RELEASE</spring.security.version>
<spring.version>5.2.9.RELEASE</spring.version>
<spring.security.version>5.4.0</spring.security.version>
<struts.version>2.5.22</struts.version>
<velocity.version>2.2</velocity.version>
<webjars.version>1.5</webjars.version>
Expand Down Expand Up @@ -95,6 +95,12 @@ limitations under the License.
<artifactId>mail</artifactId>
<version>${java-mail.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -178,12 +184,6 @@ limitations under the License.
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -216,6 +216,12 @@ limitations under the License.
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${struts.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -368,6 +374,12 @@ limitations under the License.
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.9</version>
</dependency>

<dependency>
<groupId>xml-security</groupId>
Expand Down Expand Up @@ -427,12 +439,6 @@ limitations under the License.
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -473,12 +479,6 @@ limitations under the License.
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -500,6 +500,12 @@ limitations under the License.
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<classifier>no_aop</classifier>
<exclusions>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.util.StringTokenizer;
import java.util.TreeSet;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package org.apache.roller.weblogger.pojos.wrapper;

import java.sql.Timestamp;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.plugins.PluginManager;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.pojos.TagStat;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.document.Document;
Expand Down Expand Up @@ -240,7 +240,7 @@ public WeblogWrapper getWeblog() {
public String getTerm() {
String query =feedRequest.getTerm() ;
return (query == null)
? "" : StringEscapeUtils.escapeXml(Utilities.escapeHTML(query));
? "" : StringEscapeUtils.escapeXml11(Utilities.escapeHTML(query));
}

public int getHits() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.TreeMap;
import java.util.TreeSet;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.ScoreDoc;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down Expand Up @@ -253,7 +253,7 @@ public String unescapeHTML(String str) {
}

public String escapeXML(String str) {
return StringEscapeUtils.escapeXml(str);
return StringEscapeUtils.escapeXml11(str);
}

public String unescapeXML(String str) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class PlanetCache {
private long timeout = RollerConstants.FIFTEEN_MIN_IN_MS;

// reference to our singleton instance
private static PlanetCache singletonInstance = new PlanetCache();
private static final PlanetCache singletonInstance = new PlanetCache();

private PlanetCache() {

Expand Down Expand Up @@ -194,17 +194,17 @@ public String generateKey(PlanetRequest planetRequest) {

StringBuilder key = new StringBuilder();

key.append(CACHE_ID).append(":");
key.append(CACHE_ID).append(':');
key.append(planetRequest.getContext());
key.append("/");
key.append('/');
key.append(planetRequest.getType());

if(planetRequest.getFlavor() != null) {
key.append("/").append(planetRequest.getFlavor());
key.append('/').append(planetRequest.getFlavor());
}

// add language
key.append("/").append(planetRequest.getLanguage());
key.append('/').append(planetRequest.getLanguage());

if(planetRequest.getFlavor() != null) {
// add excerpts
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public final class SaltCache {
private Cache contentCache = null;

// reference to our singleton instance
private static SaltCache singletonInstance = new SaltCache();
private static final SaltCache singletonInstance = new SaltCache();

private SaltCache() {
private SaltCache() {

Map cacheProps = new HashMap();
cacheProps.put("id", CACHE_ID);
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class SiteWideCache implements CacheHandler {
private ExpiringCacheEntry lastUpdateTime = null;

// reference to our singleton instance
private static SiteWideCache singletonInstance = new SiteWideCache();
private static final SiteWideCache singletonInstance = new SiteWideCache();


private SiteWideCache() {
Expand Down Expand Up @@ -193,9 +193,9 @@ public Date getLastModified() {
*/
public String generateKey(WeblogPageRequest pageRequest) {

StringBuilder key = new StringBuilder();
StringBuilder key = new StringBuilder(128);

key.append(CACHE_ID).append(":");
key.append(CACHE_ID).append(':');
key.append("page/");
key.append(pageRequest.getWeblogHandle());

Expand All @@ -216,7 +216,7 @@ public String generateKey(WeblogPageRequest pageRequest) {
}

if(pageRequest.getWeblogDate() != null) {
key.append("/").append(pageRequest.getWeblogDate());
key.append('/').append(pageRequest.getWeblogDate());
}

if(pageRequest.getWeblogCategoryName() != null) {
Expand All @@ -228,7 +228,7 @@ public String generateKey(WeblogPageRequest pageRequest) {
// ignored
}

key.append("/").append(cat);
key.append('/').append(cat);
}

if("tags".equals(pageRequest.getContext())) {
Expand All @@ -242,7 +242,7 @@ public String generateKey(WeblogPageRequest pageRequest) {
}

if(pageRequest.getLocale() != null) {
key.append("/").append(pageRequest.getLocale());
key.append('/').append(pageRequest.getLocale());
}

// add page number when applicable
Expand Down Expand Up @@ -283,14 +283,14 @@ public String generateKey(WeblogPageRequest pageRequest) {
*/
public String generateKey(WeblogFeedRequest feedRequest) {

StringBuilder key = new StringBuilder();
StringBuilder key = new StringBuilder(128);

key.append(CACHE_ID).append(":");
key.append(CACHE_ID).append(':');
key.append("feed/");
key.append(feedRequest.getWeblogHandle());

key.append("/").append(feedRequest.getType());
key.append("/").append(feedRequest.getFormat());
key.append('/').append(feedRequest.getType());
key.append('/').append(feedRequest.getFormat());

if (feedRequest.getTerm() != null) {
key.append("/search/").append(feedRequest.getTerm());
Expand All @@ -304,11 +304,11 @@ public String generateKey(WeblogFeedRequest feedRequest) {
// should never happen, utf-8 is always supported
}

key.append("/").append(cat);
key.append('/').append(cat);
}

if(feedRequest.getLocale() != null) {
key.append("/").append(feedRequest.getLocale());
key.append('/').append(feedRequest.getLocale());
}

if(feedRequest.isExcerpts()) {
Expand Down Expand Up @@ -421,7 +421,7 @@ private String paramsToString(Map<String, String[]> map) {

for (Map.Entry<String, String[]> entry : map.entrySet()) {
if(entry.getValue() != null) {
string.append(",").append(entry.getKey()).append("=").append(entry.getValue()[0]);
string.append(',').append(entry.getKey()).append('=').append(entry.getValue()[0]);
}
}

Expand Down
Loading