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

Merge branch 'jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Olivier Lamy 2024-06-13 11:24:58 +10:00
parent 5d4c778ee2 7df1d7ec28
commit 2911b04ca1
No known key found for this signature in database
GPG Key ID: 873A8E86B4372146
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,8 @@
<artifactId>maven-plugin-tools-api</artifactId>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

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

@ -24,6 +24,12 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>

26
pom.xml
View File

@ -200,11 +200,11 @@
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<asciidoctor.maven.plugin.version>2.2.6</asciidoctor.maven.plugin.version>
<asciidoctorj-diagram.version>2.3.0</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<asciidoctorj.version>2.5.13</asciidoctorj.version>
<asm.version>9.7</asm.version>
<awaitility.version>4.2.1</awaitility.version>
<bndlib.version>6.4.1</bndlib.version>
<build-helper.maven.plugin.version>3.5.0</build-helper.maven.plugin.version>
<build-helper.maven.plugin.version>3.6.0</build-helper.maven.plugin.version>
<build-support.version>1.5</build-support.version>
<buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
<checkstyle.version>10.16.0</checkstyle.version>
@ -294,13 +294,13 @@
<jsp.impl.version>10.0.27</jsp.impl.version>
<junit.version>5.10.2</junit.version>
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<license.maven.plugin.version>4.3</license.maven.plugin.version>
<license.maven.plugin.version>4.5</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.23.1</log4j2.version>
<logback.version>1.5.6</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.3.3</mariadb.version>
<maven-plugin.plugin.version>3.12.0</maven-plugin.plugin.version>
<maven-plugin.plugin.version>3.13.1</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
@ -310,22 +310,22 @@
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.2.0</maven.exec.plugin.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.3.0</maven.exec.plugin.version>
<maven.gpg.plugin.version>3.2.4</maven.gpg.plugin.version>
<maven.install.plugin.version>3.1.2</maven.install.plugin.version>
<maven.invoker.plugin.version>3.6.1</maven.invoker.plugin.version>
<maven.invoker.plugin.version>3.7.0</maven.invoker.plugin.version>
<maven.jar.plugin.version>3.4.1</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.12.0</maven.plugin-tools.version>
<maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.13.1</maven.plugin-tools.version>
<maven.release.plugin.version>3.0.1</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>
<maven.resolver.version>1.9.20</maven.resolver.version>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
<maven.shade.plugin.version>3.5.3</maven.shade.plugin.version>
<maven.shade.plugin.version>3.6.0</maven.shade.plugin.version>
<maven.source.plugin.version>3.3.1</maven.source.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<maven.version>3.9.0</maven.version>
<maven.version>3.9.6</maven.version>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
<mina.core.version>2.2.3</mina.core.version>
<!-- if changing this version please update default in MongoTestHelper you will get thanks from Eclipse IDE users -->
@ -343,12 +343,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version>
<spotbugs.maven.plugin.version>4.8.4.0</spotbugs.maven.plugin.version>
<spotbugs.maven.plugin.version>4.8.5.0</spotbugs.maven.plugin.version>
<springboot.version>2.1.1.RELEASE</springboot.version>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<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.7</testcontainers.version>
<testcontainers.version>1.19.8</testcontainers.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<weld.version>4.0.3.Final</weld.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>