From d571436d00ed451d231937efa094d66e7c9e474a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:40:54 +1000
Subject: [PATCH] Bump maven.version from 3.8.2 to 3.8.3 (#6954)

* Bump maven.version from 3.8.2 to 3.8.3

Bumps `maven.version` from 3.8.2 to 3.8.3.

Updates `maven-artifact` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)

Updates `maven-core` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)

Updates `maven-plugin-api` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)

Updates `maven-resolver-provider` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)

Updates `maven-settings` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-resolver-provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-settings
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix upgrade

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 jetty-jspc-maven-plugin/pom.xml | 6 ++++++
 jetty-maven-plugin/pom.xml      | 6 ++++++
 pom.xml                         | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 2237907aab7..3c9209ea6a2 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -75,6 +75,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 817b27a2000..ca9517f727f 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -128,6 +128,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index e8db940687f..73a3fb1411f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
     <logback.version>1.3.0-alpha10</logback.version>
     <mariadb.version>2.7.4</mariadb.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
-    <maven.version>3.8.2</maven.version>
+    <maven.version>3.8.3</maven.version>
     <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
     <mongodb.version>3.2.2</mongodb.version>