Skip to content

Commit f3ac971

Browse files
committed
exclude vulnerable dependencies, replace with new ones
1 parent 237b1b0 commit f3ac971

File tree

7 files changed

+56
-2
lines changed

7 files changed

+56
-2
lines changed

.idea/libraries/commons_io.xml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/ibm_icu_icu4j.xml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

VERSION.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@
122122
`jakarta.xml.bind`. Global search/replace across the project will do it.
123123
* Add: `ResizableImageExtension` documentation that it does not play with the rest of the
124124
library renderers and is an unsupported extension.
125-
* Fix: update log4j1 to log4j2 to 2.20.0
125+
* Fix: update `log4j:log4j:1.2.17` to `org.apache.logging.log4j:log4j-xxx:2.20.0`
126+
* Fix: exclude `com.ibm.icu:icu4j:59.1` dependency, replace with `com.ibm.icu:icu4j:72.1`
127+
* Fix: exclude `commons-io:commons-io:1.3.1` dependency, replace with `commons-io:commons-io:2.11.0`
126128

127129
## 0.64.2
128130

flexmark-docx-converter/flexmark-docx-converter.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<orderEntry type="library" name="apache.logging.log4j.core" level="project" />
6464
<orderEntry type="library" name="apache.logging.log4j.api" level="project" />
6565
<orderEntry type="library" name="apache.logging.log4j.1.2.api" level="project" />
66+
<orderEntry type="library" name="commons.io" level="project" />
6667
<orderEntry type="library" name="apache.xmlgraphics.commons" level="project" />
6768
</component>
6869
</module>

flexmark-docx-converter/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,17 @@
100100
<groupId>org.apache.xmlgraphics</groupId>
101101
<artifactId>xmlgraphics-commons</artifactId>
102102
<version>2.7</version>
103+
<exclusions>
104+
<exclusion>
105+
<groupId>commons-io</groupId>
106+
<artifactId>commons-io</artifactId>
107+
</exclusion>
108+
</exclusions>
109+
</dependency>
110+
<dependency>
111+
<groupId>commons-io</groupId>
112+
<artifactId>commons-io</artifactId>
113+
<version>2.11.0</version>
103114
</dependency>
104115
<dependency>
105116
<groupId>org.docx4j</groupId>

flexmark-pdf-converter/flexmark-pdf-converter.iml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
3939
<orderEntry type="library" name="com.openhtmltopdf:openhtmltopdf-core" level="project" />
4040
<orderEntry type="library" name="com.openhtmltopdf:openhtmltopdf-pdfbox" level="project" />
41+
<orderEntry type="library" name="ibm.icu.icu4j" level="project" />
4142
<orderEntry type="library" name="com.openhtmltopdf:openhtmltopdf-rtl-support" level="project" />
4243
<orderEntry type="library" name="org.jetbrains:annotations" level="project" />
4344
<orderEntry type="library" name="org.jsoup:jsoup:1.15.4" level="project" />
4445
<orderEntry type="module" module-name="flexmark-core-test" scope="TEST" />
4546
</component>
46-
</module>
47+
</module>

flexmark-pdf-converter/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
<artifactId>jsoup</artifactId>
3636
<version>1.15.4</version>
3737
</dependency>
38+
<dependency>
39+
<groupId>com.ibm.icu</groupId>
40+
<artifactId>icu4j</artifactId>
41+
<version>72.1</version>
42+
</dependency>
3843
<dependency>
3944
<!-- ALWAYS required. -->
4045
<groupId>com.openhtmltopdf</groupId>
@@ -52,6 +57,12 @@
5257
<groupId>com.openhtmltopdf</groupId>
5358
<artifactId>openhtmltopdf-rtl-support</artifactId>
5459
<version>${openhtml.version}</version>
60+
<exclusions>
61+
<exclusion>
62+
<groupId>com.ibm.icu</groupId>
63+
<artifactId>icu4j</artifactId>
64+
</exclusion>
65+
</exclusions>
5566
</dependency>
5667
</dependencies>
5768
</project>

0 commit comments

Comments
 (0)