Skip to content

Commit

Permalink
[pom] update poms
Browse files Browse the repository at this point in the history
  • Loading branch information
@dizzzz
dizzzz committed Nov 22, 2024
1 parent f95fa2b commit bb73d54
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 42 deletions.
38 changes: 19 additions & 19 deletions exist-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,19 +430,19 @@
<version>${aspectj.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>${jetty.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<!-- conflicts with antlr 2.7.7 -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty</groupId>-->
<!-- <artifactId>jetty-jaas</artifactId>-->
<!-- <version>${jetty.version}</version>-->
<!-- <scope>runtime</scope>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- &lt;!&ndash; conflicts with antlr 2.7.7 &ndash;&gt;-->
<!-- <groupId>org.apache.servicemix.bundles</groupId>-->
<!-- <artifactId>org.apache.servicemix.bundles.antlr</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
Expand Down Expand Up @@ -628,16 +628,16 @@
removed. Unfortunately, at this time, it is required for
Monex's Remote Console to function.
-->
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
6 changes: 3 additions & 3 deletions exist-distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,13 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<artifactId>jetty-websocket-jetty-server</artifactId>
<scope>runtime</scope>
</dependency>
<!-- server-side dependency for jakarta.websocket support -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jakarta-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<scope>runtime</scope>
</dependency>

Expand Down
40 changes: 20 additions & 20 deletions exist-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<jaxb.api.version>4.0.2</jaxb.api.version>
<jaxb.impl.version>4.0.2</jaxb.impl.version>
<eclipse.angus-activation.version>2.0.2</eclipse.angus-activation.version>
<jetty.version>11.0.24</jetty.version>
<jetty.version>12.0.15</jetty.version>
<log4j.version>2.24.1</log4j.version>
<lucene.version>4.10.4</lucene.version>
<milton.version>1.8.1.3</milton.version>
Expand Down Expand Up @@ -318,15 +318,15 @@
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
</exclusion>
</exclusions>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.eclipse.jetty.toolchain</groupId>-->
<!-- <artifactId>jetty-jakarta-servlet-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand All @@ -339,13 +339,13 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jndi</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand All @@ -360,8 +360,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand All @@ -370,13 +370,13 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<artifactId>jetty-websocket-jetty-server</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
Expand All @@ -387,8 +387,8 @@
</dependency>
<!-- server-side dependency for jakarta.websocket support -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jakarta-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand Down

0 comments on commit bb73d54

Please sign in to comment.