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

6070 Update Apache Commons Lang3 #7801

Merged
merged 10 commits into from
May 21, 2021
Merged

6070 Update Apache Commons Lang3 #7801

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da37d7c
refactor(deps): switch from Apache Commons Lang (v2) to Lang3 (v3). #…
poikilotherm Apr 14, 2021
eb59a11
refactor(deps): make main Java classes use Apache Commons Lang3 #6070
poikilotherm Apr 14, 2021
9b33f88
refactor(deps): move test Java classed from Apache Commons Lang (v2) …
poikilotherm Apr 14, 2021
eca8b8f
fix(deps): move to Apache Commons Text for escapeHtml() and escapeXml…
poikilotherm Apr 14, 2021
68d2eed
Fix for test failure (caused by lang3 isNumeric())
landreev May 14, 2021
5564b4e
Merge branch 'develop' into 6070-commons-lang3
poikilotherm May 17, 2021
f41342e
fix(deps): migrating a leftover string escape from commons.lang v2. #…
poikilotherm May 17, 2021
8455980
Went back to using lang3.StringUtils.isNumeric()
landreev May 17, 2021
c36f8ed
chore(deps): make CheckStyle reject Apache Commons Lang v2 imports.
poikilotherm May 18, 2021
4a13f15
Merge branch 'develop' into 6070-commons-lang3
poikilotherm May 21, 2021
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
Prev Previous commit
Next Next commit
fix(deps): migrating a leftover string escape from commons.lang v2. #… 
…6070
  • Loading branch information
@poikilotherm
poikilotherm committed May 17, 2021
commit f41342e07a067a78e4ab62693ea1553d52fbd99f
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public static String getMetadataFromDvObject(String identifier, Map<String, Stri
metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
if (dvObject.isInstanceofDataset()) {
//While getDescriptionPlainText strips < and > from HTML, it leaves '&' (at least so we need to xml escape as well
String description = StringEscapeUtils.escapeXml(dataset.getLatestVersion().getDescriptionPlainText());
String description = StringEscapeUtils.escapeXml10(dataset.getLatestVersion().getDescriptionPlainText());
if (description.isEmpty() || description.equals(DatasetField.NA_VALUE)) {
description = AbstractGlobalIdServiceBean.UNAVAILABLE;
}
Expand Down