Skip to content

Commit 3cd8b51

Browse files
java8 pom cleanup javassist
Cleaning up javassist exclusion from powermock. Project updates to java8 allow the default powermock dependency to run, and reduces the project maintenance in the pom.
1 parent 27b86e0 commit 3cd8b51

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

pom.xml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,7 @@
334334
<artifactId>powermock-api-mockito2</artifactId>
335335
<version>${version.powermock}</version>
336336
<scope>test</scope>
337-
<exclusions>
338-
<exclusion>
339-
<!-- A subdependency: org.powermock:powermock-core:2.0.0, results in the import of: org.javassist:javassist:3.24.0-GA
340-
which was compiled for Java 8 by accident. org.javassist:javassist:3.25.0-GA was released for Java 7.
341-
So we exclude it here, and import the version we need below. -->
342-
<groupId>org.javassist</groupId>
343-
<artifactId>javassist</artifactId>
344-
</exclusion>
337+
<exclusions>
345338
<exclusion>
346339
<groupId>org.mockito</groupId>
347340
<artifactId>mockito-core</artifactId>
@@ -350,14 +343,6 @@
350343
</dependency>
351344
<!-- The following imported solely so we can exclude its dependency on: org.objenesis:objenesis, which conflicts with
352345
another import by a dependency of powermock-api-mockito2. -->
353-
<dependency>
354-
<!-- This version is compatible with Java 7, the previous version was not (by accident). -->
355-
<!-- Versions 3.26.0-GA and later require Java 8. -->
356-
<groupId>org.javassist</groupId>
357-
<artifactId>javassist</artifactId>
358-
<version>3.28.0-GA</version>
359-
<scope>test</scope>
360-
</dependency>
361346
<dependency>
362347
<groupId>org.mockito</groupId>
363348
<artifactId>mockito-core</artifactId>
@@ -373,11 +358,6 @@
373358
<version>${version.powermock}</version>
374359
<scope>test</scope>
375360
<exclusions>
376-
<exclusion>
377-
<!-- We exclude this here, because we import the version we need above, and this imports a newer version. -->
378-
<groupId>org.javassist</groupId>
379-
<artifactId>javassist</artifactId>
380-
</exclusion>
381361
<exclusion>
382362
<groupId>net.bytebuddy</groupId>
383363
<artifactId>byte-buddy</artifactId>

0 commit comments

Comments
 (0)