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

Fix conflicting dependencies #767

Merged
merged 3 commits into from
Oct 15, 2023
Merged

Fix conflicting dependencies #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39f8157
Upgrade Jackson and remove unnecessary transitive override
kusalk Oct 15, 2023
403c3c4
Unify HtmlUnit versions
kusalk Oct 15, 2023
a750917
Upgrade ASM and exclude conflicting artifact
kusalk Oct 15, 2023
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
1 change: 0 additions & 1 deletion apps/rest-showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.39.0</version>
<scope>test</scope>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion apps/showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.61.0</version>
<scope>test</scope>
</dependency>

Expand Down
9 changes: 0 additions & 9 deletions plugins/portlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,6 @@
<scope>test</scope>
</dependency>

<dependency>
<!-- Requires ASM 3.3.1 for testing, as jmock-cglib apparently overrides a method made final in later ASM versions
(and apparently jmock-cglib still requires ASM, despite no visible tree dependency). -->
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
Expand Down
23 changes: 13 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
<maven.compiler.target>1.8</maven.compiler.target>

<!-- dependency versions in alphanumeric order -->
<asm.version>9.5</asm.version>
<jackson.version>2.15.2</jackson.version>
<asm.version>9.6</asm.version>
<jackson.version>2.15.3</jackson.version>
<log4j2.version>2.20.0</log4j2.version>
<ognl.version>3.3.4</ognl.version>
<slf4j.version>2.0.7</slf4j.version>
Expand Down Expand Up @@ -765,6 +765,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -968,6 +972,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.70.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
Expand Down Expand Up @@ -1102,14 +1113,6 @@
<version>${jackson.version}</version>
</dependency>

<!-- FIXME: Workaround for jackson-dataformat-xml issue #340 of forgetting to update stax2-api -->
<!-- https://github.com/FasterXML/jackson-dataformat-xml/issues/340 -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2.1</version>
</dependency>

<dependency>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall</artifactId>
Expand Down