Merge pull request #11212 from jetty/fix/12.0.x/remove-top-level-servlet-deps

Cleaning up top level dependencies
This commit is contained in:
Joakim Erdfelt 2024-01-02 13:23:26 -06:00 committed by GitHub
commit 2b9bb8cf9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 67 deletions

67
pom.xml
View File

@ -177,7 +177,6 @@
<cyclonedx.maven.plugin.version>2.7.10</cyclonedx.maven.plugin.version> <cyclonedx.maven.plugin.version>2.7.10</cyclonedx.maven.plugin.version>
<depends.maven.plugin.version>1.5.0</depends.maven.plugin.version> <depends.maven.plugin.version>1.5.0</depends.maven.plugin.version>
<disruptor.version>3.4.2</disruptor.version> <disruptor.version>3.4.2</disruptor.version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
<felix.version>7.0.5</felix.version> <felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version> <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version> <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
@ -198,28 +197,7 @@
<it.debug>false</it.debug> <it.debug>false</it.debug>
<jackson.version>2.16.1</jackson.version> <jackson.version>2.16.1</jackson.version>
<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version> <jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
<jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jakarta.el.api.version>4.0.0</jakarta.el.api.version>
<jakarta.enterprise.cdi.api.version>3.0.1</jakarta.enterprise.cdi.api.version>
<jakarta.inject.api.version>2.0.1</jakarta.inject.api.version>
<jakarta.interceptor.api.version>2.0.1</jakarta.interceptor.api.version>
<jakarta.mail.api.version>2.0.1</jakarta.mail.api.version>
<jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
<jakarta.servlet.jsp.api.version>3.1.1</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>2.0.0</jakarta.servlet.jsp.jstl.api.version>
<jakarta.servlet.jsp.jstl.impl.version>2.0.0</jakarta.servlet.jsp.jstl.impl.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.websocket.api.version>2.0.0</jakarta.websocket.api.version>
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>3.0.1</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>3.0.2</jakarta.xml.bind.impl.version>
<jakarta.xml.jaxws.impl.version>3.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
<javadoc.verbose>false</javadoc.verbose> <javadoc.verbose>false</javadoc.verbose>
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
<javax.cdi.api.version>2.0</javax.cdi.api.version>
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version> <jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
<jboss-threads.version>3.5.1.Final</jboss-threads.version> <jboss-threads.version>3.5.1.Final</jboss-threads.version>
<jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version> <jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version>
@ -323,8 +301,6 @@
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests> <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<swissbox.version>1.8.3</swissbox.version> <swissbox.version>1.8.3</swissbox.version>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<testcontainers.version>1.19.3</testcontainers.version> <testcontainers.version>1.19.3</testcontainers.version>
<tinybundles.version>3.0.0</tinybundles.version> <tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version> <versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
@ -592,11 +568,6 @@
<artifactId>conscrypt-openjdk-uber</artifactId> <artifactId>conscrypt-openjdk-uber</artifactId>
<version>${conscrypt.version}</version> <version>${conscrypt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
<artifactId>servlet</artifactId>
<version>${equinox-http-servlet-version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-client</artifactId> <artifactId>jetty-alpn-client</artifactId>
@ -865,32 +836,6 @@
<artifactId>jetty-memcached-sessions</artifactId> <artifactId>jetty-memcached-sessions</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-alpn</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.quic</groupId> <groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-client</artifactId> <artifactId>jetty-quic-client</artifactId>
@ -991,18 +936,6 @@
<groupId>org.eclipse.platform</groupId> <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
<version>${osgi-services-version}</version> <version>${osgi-services-version}</version>
<exclusions>
<exclusion>
<!-- we use the servlet jar from orbit -->
<groupId>jakarta.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<!-- cannot override core java classes with Java 9+ -->
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.platform</groupId> <groupId>org.eclipse.platform</groupId>