Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #9631 - update remaining pom.xml files 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-05-05 16:36:55 +10:00
parent 33f1320a71
commit 89c42c89e7
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javadoc/pom.xml
View File

@ -120,7 +120,7 @@
jetty-servlet-api, jetty-servlet-api,
jetty-javax-websocket-api, jetty-javax-websocket-api,
javax.mail.glassfish, javax.mail.glassfish,
javax.security.auth.message, jakarta.security.auth.message,
plexus-utils, plexus-utils,
plexus-interpolation plexus-interpolation
</excludeArtifactIds> </excludeArtifactIds>

14
jetty-home/pom.xml
View File

@ -445,8 +445,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds> <includeGroupIds>jakarta.security.auth.message</includeGroupIds>
<includeArtifactIds>javax.security.auth.message</includeArtifactIds> <includeArtifactIds>jakarta.security.auth.message-api</includeArtifactIds>
<includeTypes>jar</includeTypes> <includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jaspi</outputDirectory> <outputDirectory>${assembly-directory}/lib/jaspi</outputDirectory>
</configuration> </configuration>
@ -458,8 +458,8 @@
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds> <includeGroupIds>jakarta.security.auth.message</includeGroupIds>
<includeArtifactIds>javax.security.auth.message</includeArtifactIds> <includeArtifactIds>jakarta.security.auth.message-api</includeArtifactIds>
<includeTypes>jar</includeTypes> <includeTypes>jar</includeTypes>
<classifier>sources</classifier> <classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/jaspi</outputDirectory> <outputDirectory>${source-assembly-directory}/lib/jaspi</outputDirectory>
@ -475,7 +475,7 @@
<includeGroupIds> <includeGroupIds>
org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.demos org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.demos
</includeGroupIds> </includeGroupIds>
<excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds> <excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,jakarta.security.auth.message,javax.activation</excludeArtifactIds>
<classifier>config</classifier> <classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes> <excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
@ -627,8 +627,8 @@
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>jakarta.security.auth.message</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>jakarta.security.auth.message-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>

9
jetty-jaspi/pom.xml
View File

@ -32,6 +32,10 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>jakarta.security.auth.message</groupId>
<artifactId>jakarta.security.auth.message-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId> <artifactId>jetty-security</artifactId>
@ -50,11 +54,6 @@
<artifactId>jetty-test-helper</artifactId> <artifactId>jetty-test-helper</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.security.auth.message</groupId>
<artifactId>jakarta.security.auth.message-api</artifactId>
<version>1.1.3</version>
</dependency>
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>

4
jetty-maven-plugin/pom.xml
View File

@ -355,8 +355,8 @@
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>jakarta.security.auth.message</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>jakarta.security.auth.message-api</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>

8
pom.xml
View File

@ -75,7 +75,7 @@
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version> <javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
<javax.cdi.api.version>2.0</javax.cdi.api.version> <javax.cdi.api.version>2.0</javax.cdi.api.version>
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version> <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<javax.security.auth.message.version>1.0.0.v201108011116</javax.security.auth.message.version> <jakarta.security.auth.message.version>1.1.3</jakarta.security.auth.message.version>
<javax.servlet.jsp.jstl.impl.version>1.2.5</javax.servlet.jsp.jstl.impl.version> <javax.servlet.jsp.jstl.impl.version>1.2.5</javax.servlet.jsp.jstl.impl.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>
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version> <jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
@ -1794,9 +1794,9 @@
<version>${javax.mail.glassfish.version}</version> <version>${javax.mail.glassfish.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>jakarta.security.auth.message</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>jakarta.security.auth.message-api</artifactId>
<version>${javax.security.auth.message.version}</version> <version>${jakarta.security.auth.message.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>