Skip to content

Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.18.0 in /modules/dataverse-parent #11632

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

Merged
ofahimIQSS merged 6 commits into from
Aug 8, 2025
Merged

Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.18.0 in /modules/dataverse-parent #11632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6223bd9
Bump org.apache.commons:commons-lang3 in /modules/dataverse-parent
dependabot[bot] Jul 12, 2025
48f5064
update keys with ascii letter
qqmyers Jul 23, 2025
c9acc2e
release note
qqmyers Jul 23, 2025
9a5748d
Merge remote-tracking branch 'IQSS/develop' into dependabot/maven/mod…
qqmyers Jul 23, 2025
9f6b77c
fix citation.tsv to match citation.properties
stevenwinship Aug 7, 2025
9634fc9
fix citation.tsv to match citation.properties
stevenwinship Aug 7, 2025
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
4 changes: 4 additions & 0 deletions doc/release-notes/11632-commons-lang3-update.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Due to changes in how the commons-lang3 library handles a non-ascii chararacter, two keys in the citation.properties and citation.tsv files have changed to include i instead of ɨ. Translations will need to address this.

controlledvocabulary.language.magɨ_(madang_province) => controlledvocabulary.language.magi_(madang_province)
controlledvocabulary.language.magɨyi => controlledvocabulary.language.magiyi
2 changes: 1 addition & 1 deletion modules/dataverse-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<slf4j.version>1.7.35</slf4j.version>
<commons.io.version>2.19.0</commons.io.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.lang3.version>3.18.0</commons.lang3.version>
<commons.compress.version>1.26.0</commons.compress.version>
<apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
<apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
Expand Down
4 changes: 2 additions & 2 deletions scripts/api/data/metadatablocks/citation.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4085,8 +4085,8 @@
language Magoma gmx 3943 gmx
language Magori zgr 3944 zgr
language Maguindanaon mdh 3945 mdh
language Magɨ (Madang Province) gkd 3946 gkd
language Magɨyi gmg 3947 gmg
language Magi (Madang Province) gkd 3946 gkd
language Magiyi gmg 3947 gmg
language Mahali mjx 3948 mjx
language Mahasu Pahari bfz 3949 bfz
language Mahican mjy 3950 mjy
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/propertyFiles/citation.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4250,8 +4250,8 @@ controlledvocabulary.language.magdalena_penasco_mixtec=Magdalena Peñasco Mixtec
controlledvocabulary.language.magoma=Magoma
controlledvocabulary.language.magori=Magori
controlledvocabulary.language.maguindanaon=Maguindanaon
controlledvocabulary.language.magɨ_(madang_province)=Magɨ (Madang Province)
controlledvocabulary.language.magɨyi=Magɨyi
controlledvocabulary.language.magi_(madang_province)=Magɨ (Madang Province)
controlledvocabulary.language.magiyi=Magɨyi
Copy link
Copy Markdown
Contributor

@stevenwinship stevenwinship Aug 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue Phil saw

In citation.tsv the old values are still present:

language	Magɨ (Madang Province)	gkd	3946	gkd
language	Magɨyi	gmg	3947	gmg

For me MetadataBlockTest is failing:

Missing key:magɨ_(madang_province) controlledvocabulary.language.magɨ_(madang_province)
Missing key:magɨyi controlledvocabulary.language.magɨyi
Unused key:controlledvocabulary.language.magi_(madang_province)
Unused key:controlledvocabulary.language.magiyi
Missing count:2
Unused Count:2

org.opentest4j.AssertionFailedError:
Expected :0
Actual :2

Copy link
Copy Markdown
Contributor

@stevenwinship stevenwinship Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the change to citation.tsv as well to fix the failure

controlledvocabulary.language.mahali=Mahali
controlledvocabulary.language.mahasu_pahari=Mahasu Pahari
controlledvocabulary.language.mahican=Mahican
Expand Down
⚡