Skip to content

Commit 3dfe668

Browse files
committed
commons-lang3 and checker-qual are provided by pmd-dist
pmd-dist uses now the same versions, so we don't need to shade them anymore.
1 parent ef81063 commit 3dfe668

File tree

1 file changed

+48
-18
lines changed

1 file changed

+48
-18
lines changed

pom.xml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,21 @@
579579
<artifactId>kotest-assertions-core-jvm</artifactId>
580580
<version>${kotest.version}</version>
581581
</dependency>
582+
583+
<!-- dependencies provided by pmd-dist -->
584+
<dependency>
585+
<groupId>org.checkerframework</groupId>
586+
<artifactId>checker-qual</artifactId>
587+
<version>2.11.1</version>
588+
<scope>provided</scope>
589+
</dependency>
590+
<dependency>
591+
<groupId>org.apache.commons</groupId>
592+
<artifactId>commons-lang3</artifactId>
593+
<version>3.14.0</version>
594+
<scope>provided</scope>
595+
</dependency>
596+
582597
</dependencies>
583598
</dependencyManagement>
584599

@@ -629,12 +644,6 @@
629644
<version>0.9.2</version>
630645
</dependency>
631646

632-
<dependency>
633-
<groupId>org.checkerframework</groupId>
634-
<artifactId>checker-qual</artifactId>
635-
<version>2.11.1</version>
636-
</dependency>
637-
638647
<!-- We need two incompatible versions of controlsfx, one for Java 8, and one for Java 9+ -->
639648
<!-- Ideally ControlsFX would release a MR jar but that doesn't seem to be in their priorities: -->
640649
<!-- https://github.com/controlsfx/controlsfx/issues/1014 -->
@@ -662,11 +671,13 @@
662671
<version>1.0</version>
663672
</dependency>
664673

665-
<!-- Those are shaded to avoid duplication -->
674+
<dependency>
675+
<groupId>org.checkerframework</groupId>
676+
<artifactId>checker-qual</artifactId>
677+
</dependency>
666678
<dependency>
667679
<groupId>org.apache.commons</groupId>
668680
<artifactId>commons-lang3</artifactId>
669-
<version>3.14.0</version>
670681
</dependency>
671682

672683
<!-- Icon packs -->
@@ -835,14 +846,6 @@
835846
<!-- We can't just use an artifactSet/excludes to exclude pmd dependencies -->
836847
<!-- because it would include their transitive dependencies -->
837848

838-
<relocations>
839-
<!-- Relocate apache dependencies because they're included in the binary dist-->
840-
<relocation>
841-
<pattern>org.apache.commons</pattern>
842-
<shadedPattern>org.shaded.apache.commons</shadedPattern>
843-
</relocation>
844-
</relocations>
845-
846849
<!-- Merge resource provider files like Ikonli icon resolvers -->
847850
<transformers>
848851
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
@@ -934,6 +937,18 @@
934937
</plugins>
935938
</build>
936939
<dependencies>
940+
<!-- normally provided by pmd-dist, but not when create a fat-jar -->
941+
<dependency>
942+
<groupId>org.checkerframework</groupId>
943+
<artifactId>checker-qual</artifactId>
944+
<scope>compile</scope>
945+
</dependency>
946+
<dependency>
947+
<groupId>org.apache.commons</groupId>
948+
<artifactId>commons-lang3</artifactId>
949+
<scope>compile</scope>
950+
</dependency>
951+
<!-- pmd dependencies -->
937952
<dependency>
938953
<groupId>net.sourceforge.pmd</groupId>
939954
<artifactId>pmd-core</artifactId>
@@ -972,7 +987,9 @@
972987
</profile>
973988

974989
<profile>
975-
<!-- This is a runnable profile that includes all pmd modules -->
990+
<!-- This is a runnable profile that includes all pmd modules (scope runtime)
991+
as well as the dependencies, that are normally provided
992+
-->
976993
<id>running</id>
977994
<build>
978995
<plugins>
@@ -994,11 +1011,24 @@
9941011
</plugin>
9951012
</plugins>
9961013
</build>
1014+
<dependencies>
1015+
<!-- normally provided by pmd-dist, but not when running directly -->
1016+
<dependency>
1017+
<groupId>org.checkerframework</groupId>
1018+
<artifactId>checker-qual</artifactId>
1019+
<scope>compile</scope>
1020+
</dependency>
1021+
<dependency>
1022+
<groupId>org.apache.commons</groupId>
1023+
<artifactId>commons-lang3</artifactId>
1024+
<scope>compile</scope>
1025+
</dependency>
1026+
</dependencies>
9971027
</profile>
9981028

9991029
<profile>
10001030
<!-- This profile adds openjfx dependencies to the classpath -->
1001-
<!-- Eg use -Prun,with-javafx -->
1031+
<!-- Eg use -Prunning,with-javafx -->
10021032
<id>with-javafx</id>
10031033
<properties>
10041034
<openjfx.scope>compile</openjfx.scope>

0 commit comments

Comments
 (0)