Skip to content

Commit a291786

Browse files
committed
pom.xml(commons-lang3): update to 3.7
Changelog: https://commons.apache.org/proper/commons-lang/release-notes/RELEASE-NOTES-3.7.txt No functional changes.
2 parents b2c420d + 1b20a16 commit a291786

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
<version>${commons.lang.version}</version>
3535
</dependency>
3636

37+
<!-- Required for StringSubstitutor -->
38+
<dependency>
39+
<groupId>org.apache.commons</groupId>
40+
<artifactId>commons-text</artifactId>
41+
<version>${commons.text.version}</version>
42+
</dependency>
43+
3744
<dependency>
3845
<groupId>org.hibernate</groupId>
3946
<artifactId>hibernate-validator</artifactId>
@@ -471,7 +478,8 @@
471478
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.5.15.RELEASE/spring-boot-dependencies/pom.xml) -->
472479
<commons-pool.version>1.5.4</commons-pool.version>
473480

474-
<commons.lang.version>3.4</commons.lang.version>
481+
<commons.lang.version>3.7</commons.lang.version>
482+
<commons.text.version>1.4</commons.text.version>
475483
<compiler.plugin.version>3.7.0</compiler.plugin.version>
476484
<cucumber.version>1.2.5</cucumber.version>
477485
<datagen.version>2.2.1</datagen.version>

src/main/java/ru/mystamps/web/service/MailServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import javax.mail.internet.MimeMessage;
2626

2727
import org.apache.commons.lang3.Validate;
28-
import org.apache.commons.lang3.text.StrSubstitutor;
2928
import org.apache.commons.lang3.time.DatePrinter;
3029
import org.apache.commons.lang3.time.FastDateFormat;
30+
import org.apache.commons.text.StringSubstitutor;
3131

3232
import org.slf4j.Logger;
3333
import org.slf4j.LoggerFactory;
@@ -167,7 +167,7 @@ private String getTextOfActivationMail(SendUsersActivationDto activation) {
167167
ctx.put("activation_url_with_key", activationUrl);
168168
ctx.put("expire_after_days", String.valueOf(CronService.PURGE_AFTER_DAYS));
169169

170-
StrSubstitutor substitutor = new StrSubstitutor(ctx);
170+
StringSubstitutor substitutor = new StringSubstitutor(ctx);
171171
return substitutor.replace(template);
172172
}
173173

@@ -183,7 +183,7 @@ private String getSubjectOfDailyStatisticsMail(AdminDailyReport report) {
183183
ctx.put("date", fromDate);
184184
put(ctx, "total_changes", report.countTotalChanges());
185185

186-
StrSubstitutor substitutor = new StrSubstitutor(ctx);
186+
StringSubstitutor substitutor = new StringSubstitutor(ctx);
187187
return substitutor.replace(template);
188188
}
189189

src/main/java/ru/mystamps/web/service/ReportServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.Locale;
2222
import java.util.Map;
2323

24-
import org.apache.commons.lang3.text.StrSubstitutor;
2524
import org.apache.commons.lang3.time.DatePrinter;
2625
import org.apache.commons.lang3.time.FastDateFormat;
26+
import org.apache.commons.text.StringSubstitutor;
2727

2828
import org.springframework.context.MessageSource;
2929

@@ -76,7 +76,7 @@ public String prepareDailyStatistics(AdminDailyReport report) {
7676
put(ctx, "invalid_csrf_cnt", report.getInvalidCsrfCounter());
7777
put(ctx, "bad_request_cnt", -1L); // TODO: #122
7878

79-
return new StrSubstitutor(ctx).replace(template);
79+
return new StringSubstitutor(ctx).replace(template);
8080
}
8181

8282
private static void put(Map<String, String> ctx, String key, long value) {

0 commit comments

Comments
 (0)