Skip to content

Commit 3cb43cc

Browse files
committed
Address some Maven-related conflicts
1 parent 0481ea2 commit 3cb43cc

1 file changed

Lines changed: 33 additions & 0 deletions

File tree

pom.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,12 @@
784784
<groovy-xml.version>${groovy.version}</groovy-xml.version>
785785
<groovy-yaml.version>${groovy.version}</groovy-yaml.version>
786786

787+
<!-- Apache Maven - https://maven.apache.org/ -->
788+
<maven-artifact-transfer.version>0.12.0</maven-artifact-transfer.version>
789+
<maven-common-artifact-filters.version>3.1.0</maven-common-artifact-filters.version>
790+
<maven-core.version>3.6.3</maven-core.version>
791+
<maven-plugin-tools-api.version>3.6.0</maven-plugin-tools-api.version>
792+
787793
<!-- Apache POI - https://poi.apache.org/ -->
788794
<poi.version>3.17</poi.version>
789795

@@ -2781,6 +2787,28 @@
27812787
<version>${groovy-yaml.version}</version>
27822788
</dependency>
27832789

2790+
<!-- Apache Maven - https://maven.apache.org/ -->
2791+
<dependency>
2792+
<groupId>org.apache.maven.shared</groupId>
2793+
<artifactId>maven-artifact-transfer</artifactId>
2794+
<version>${maven-artifact-transfer.version}</version>
2795+
</dependency>
2796+
<dependency>
2797+
<groupId>org.apache.maven.shared</groupId>
2798+
<artifactId>maven-common-artifact-filters</artifactId>
2799+
<version>${maven-common-artifact-filters.version}</version>
2800+
</dependency>
2801+
<dependency>
2802+
<groupId>org.apache.maven</groupId>
2803+
<artifactId>maven-core</artifactId>
2804+
<version>${maven-core.version}</version>
2805+
</dependency>
2806+
<dependency>
2807+
<groupId>org.apache.maven.plugin-tools</groupId>
2808+
<artifactId>maven-plugin-tools-api</artifactId>
2809+
<version>${maven-plugin-tools-api.version}</version>
2810+
</dependency>
2811+
27842812
<!-- Apache POI - https://poi.apache.org/ -->
27852813
<dependency>
27862814
<groupId>org.apache.poi</groupId>
@@ -3413,6 +3441,11 @@
34133441
<groupId>javax.annotation</groupId>
34143442
<artifactId>jsr250-api</artifactId>
34153443
</exclusion>
3444+
<exclusion>
3445+
<!-- Conflicts with org.codehaus.plexus:plexus-classworlds -->
3446+
<groupId>classworlds</groupId>
3447+
<artifactId>classworlds</artifactId>
3448+
</exclusion>
34163449
</exclusions>
34173450
</dependency>
34183451
<dependency>

0 commit comments

Comments
 (0)