|
579 | 579 | <artifactId>kotest-assertions-core-jvm</artifactId> |
580 | 580 | <version>${kotest.version}</version> |
581 | 581 | </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 | + |
582 | 597 | </dependencies> |
583 | 598 | </dependencyManagement> |
584 | 599 |
|
|
629 | 644 | <version>0.9.2</version> |
630 | 645 | </dependency> |
631 | 646 |
|
632 | | - <dependency> |
633 | | - <groupId>org.checkerframework</groupId> |
634 | | - <artifactId>checker-qual</artifactId> |
635 | | - <version>2.11.1</version> |
636 | | - </dependency> |
637 | | - |
638 | 647 | <!-- We need two incompatible versions of controlsfx, one for Java 8, and one for Java 9+ --> |
639 | 648 | <!-- Ideally ControlsFX would release a MR jar but that doesn't seem to be in their priorities: --> |
640 | 649 | <!-- https://github.com/controlsfx/controlsfx/issues/1014 --> |
|
662 | 671 | <version>1.0</version> |
663 | 672 | </dependency> |
664 | 673 |
|
665 | | - <!-- Those are shaded to avoid duplication --> |
| 674 | + <dependency> |
| 675 | + <groupId>org.checkerframework</groupId> |
| 676 | + <artifactId>checker-qual</artifactId> |
| 677 | + </dependency> |
666 | 678 | <dependency> |
667 | 679 | <groupId>org.apache.commons</groupId> |
668 | 680 | <artifactId>commons-lang3</artifactId> |
669 | | - <version>3.14.0</version> |
670 | 681 | </dependency> |
671 | 682 |
|
672 | 683 | <!-- Icon packs --> |
|
835 | 846 | <!-- We can't just use an artifactSet/excludes to exclude pmd dependencies --> |
836 | 847 | <!-- because it would include their transitive dependencies --> |
837 | 848 |
|
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 | | - |
846 | 849 | <!-- Merge resource provider files like Ikonli icon resolvers --> |
847 | 850 | <transformers> |
848 | 851 | <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> |
|
934 | 937 | </plugins> |
935 | 938 | </build> |
936 | 939 | <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 --> |
937 | 952 | <dependency> |
938 | 953 | <groupId>net.sourceforge.pmd</groupId> |
939 | 954 | <artifactId>pmd-core</artifactId> |
|
972 | 987 | </profile> |
973 | 988 |
|
974 | 989 | <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 | + --> |
976 | 993 | <id>running</id> |
977 | 994 | <build> |
978 | 995 | <plugins> |
|
994 | 1011 | </plugin> |
995 | 1012 | </plugins> |
996 | 1013 | </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> |
997 | 1027 | </profile> |
998 | 1028 |
|
999 | 1029 | <profile> |
1000 | 1030 | <!-- This profile adds openjfx dependencies to the classpath --> |
1001 | | - <!-- Eg use -Prun,with-javafx --> |
| 1031 | + <!-- Eg use -Prunning,with-javafx --> |
1002 | 1032 | <id>with-javafx</id> |
1003 | 1033 | <properties> |
1004 | 1034 | <openjfx.scope>compile</openjfx.scope> |
|
0 commit comments