Skip to content

Commit 7446a16

Browse files
committed
Stop managing jetty maven plugins
Their dependencies are too ugly, and we don't need them.
1 parent afed117 commit 7446a16

1 file changed

Lines changed: 18 additions & 31 deletions

File tree

pom.xml

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,8 +1009,14 @@
10091009
<jetty-jaspi.version>${jetty.version}</jetty-jaspi.version>
10101010
<jetty-jmx.version>${jetty.version}</jetty-jmx.version>
10111011
<jetty-jndi.version>${jetty.version}</jetty-jndi.version>
1012-
<jetty-jspc-maven-plugin.version>${jetty.version}</jetty-jspc-maven-plugin.version>
1013-
<jetty-maven-plugin.version>${jetty.version}</jetty-maven-plugin.version>
1012+
<!--
1013+
NB: We do not manage jetty-jspc-maven-plugin or jetty-maven-plugin.
1014+
Their dependencies include several artifacts conflicting with elsewhere:
1015+
* classworlds:classworlds vs. org.codehaus.plexus:plexus-classworlds
1016+
* javax.annotation:jsr250-api vs. javax.annotation:javax.annotation-api
1017+
* javax.websocket:javax.websocket-api vs. javax.websocket:javax.websocket-client-api
1018+
* org.mortbay.jasper:apache-el vs. javax.el:javax.el-api
1019+
-->
10141020
<jetty-nosql.version>${jetty.version}</jetty-nosql.version>
10151021
<jetty-plus.version>${jetty.version}</jetty-plus.version>
10161022
<jetty-proxy.version>${jetty.version}</jetty-proxy.version>
@@ -3546,35 +3552,6 @@
35463552
<artifactId>jetty-jndi</artifactId>
35473553
<version>${jetty-jndi.version}</version>
35483554
</dependency>
3549-
<dependency>
3550-
<groupId>org.eclipse.jetty</groupId>
3551-
<artifactId>jetty-jspc-maven-plugin</artifactId>
3552-
<version>${jetty-jspc-maven-plugin.version}</version>
3553-
<exclusions>
3554-
<exclusion>
3555-
<!-- Conflicts with javax.annotation:javax.annotation-api -->
3556-
<groupId>javax.annotation</groupId>
3557-
<artifactId>jsr250-api</artifactId>
3558-
</exclusion>
3559-
<exclusion>
3560-
<!-- Conflicts with org.codehaus.plexus:plexus-classworlds -->
3561-
<groupId>classworlds</groupId>
3562-
<artifactId>classworlds</artifactId>
3563-
</exclusion>
3564-
</exclusions>
3565-
</dependency>
3566-
<dependency>
3567-
<groupId>org.eclipse.jetty</groupId>
3568-
<artifactId>jetty-maven-plugin</artifactId>
3569-
<version>${jetty-maven-plugin.version}</version>
3570-
<exclusions>
3571-
<exclusion>
3572-
<!-- Conflicts with javax.websocket:javax.websocket-api -->
3573-
<groupId>javax.websocket</groupId>
3574-
<artifactId>javax.websocket-client-api</artifactId>
3575-
</exclusion>
3576-
</exclusions>
3577-
</dependency>
35783555
<dependency>
35793556
<groupId>org.eclipse.jetty</groupId>
35803557
<artifactId>jetty-nosql</artifactId>
@@ -3854,6 +3831,16 @@
38543831
<groupId>org.mapdb</groupId>
38553832
<artifactId>mapdb</artifactId>
38563833
<version>${mapdb.version}</version>
3834+
<exclusions>
3835+
<exclusion>
3836+
<!--
3837+
Conflicts with org.lz4:lz4-java.
3838+
You may need to add it to your deps.
3839+
-->
3840+
<groupId>net.jpountz.lz4</groupId>
3841+
<artifactId>lz4</artifactId>
3842+
</exclusion>
3843+
</exclusions>
38573844
</dependency>
38583845

38593846
<!-- MigLayout - http://www.miglayout.com/ -->

0 commit comments

Comments
 (0)