From 004da47cb53df77e92f411d5e19740510bf22e42 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Mon, 4 Sep 2023 13:05:28 +1000
Subject: [PATCH] Merge 11.0.x back to 12.0.x (#10472)

* Bump org.infinispan.protostream:protostream

Bumps [org.infinispan.protostream:protostream](https://github.com/infinispan/protostream) from 4.6.2.Final to 4.6.4.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.6.2.Final...4.6.4.Final)

---
updated-dependencies:
- dependency-name: org.infinispan.protostream:protostream
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* Bump apache.directory.api.version from 2.1.3 to 2.1.4

Bumps `apache.directory.api.version` from 2.1.3 to 2.1.4.

Updates `org.apache.directory.api:api-ldap-schema-data` from 2.1.3 to 2.1.4

Updates `org.apache.directory.api:api-ldap-model` from 2.1.3 to 2.1.4

Updates `org.apache.directory.api:api-util` from 2.1.3 to 2.1.4
- [Commits](https://github.com/apache/directory-ldap-api/compare/2.1.3...2.1.4)

Updates `org.apache.directory.api:api-asn1-api` from 2.1.3 to 2.1.4

---
updated-dependencies:
- dependency-name: org.apache.directory.api:api-ldap-schema-data
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-ldap-model
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-asn1-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump org.wildfly.security:wildfly-elytron

Bumps [org.wildfly.security:wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron) from 2.2.1.Final to 2.2.2.Final.
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.2.1.Final...2.2.2.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump pax.url.version from 2.6.2 to 2.6.14

Bumps `pax.url.version` from 2.6.2 to 2.6.14.

Updates `org.ops4j.pax.url:pax-url-aether` from 2.6.2 to 2.6.14
- [Commits](https://github.com/ops4j/org.ops4j.pax.url/compare/url-2.6.2...url-2.6.14)

Updates `org.ops4j.pax.url:pax-url-wrap` from 2.6.2 to 2.6.14
- [Commits](https://github.com/ops4j/org.ops4j.pax.url/compare/url-2.6.2...url-2.6.14)

---
updated-dependencies:
- dependency-name: org.ops4j.pax.url:pax-url-aether
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.ops4j.pax.url:pax-url-wrap
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* exclude banned dependencies

Signed-off-by: Olivier Lamy <olamy@apache.org>

* Bump org.infinispan.protostream:protostream (#10469)

Bumps [org.infinispan.protostream:protostream](https://github.com/infinispan/protostream) from 4.6.4.Final to 4.6.5.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.6.4.Final...4.6.5.Final)

---
updated-dependencies:
- dependency-name: org.infinispan.protostream:protostream
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix version number

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml | 12 ++++++++++++
 pom.xml                                              |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml
index 12eb4fc9a64..179f83b2261 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml
@@ -12,6 +12,12 @@
     <bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
     <jetty-orbit-url>https://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
     <assembly-directory>target/distribution</assembly-directory>
+    <pax.exam.version>4.13.1</pax.exam.version>
+    <pax.url.version>2.6.14</pax.url.version>
+    <swissbox.version>1.8.3</swissbox.version>
+    <tinybundles.version>3.0.0</tinybundles.version>
+    <spifly.version>1.3.6</spifly.version>
+    <injection.bundle.version>1.2</injection.bundle.version>
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
@@ -77,6 +83,12 @@
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-aether</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
diff --git a/pom.xml b/pom.xml
index e6404b86691..b6ace70e2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
     <guice.version>7.0.0</guice.version>
     <hamcrest.version>2.2</hamcrest.version>
     <hazelcast.version>5.3.1</hazelcast.version>
-    <infinispan.protostream.version>4.6.2.Final</infinispan.protostream.version>
+    <infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
     <infinispan.version>11.0.17.Final</infinispan.version>
     <jackson.version>2.15.2</jackson.version>
     <jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
@@ -147,7 +147,7 @@
     <taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
     <testcontainers.version>1.18.3</testcontainers.version>
     <wildfly.common.version>1.6.0.Final</wildfly.common.version>
-    <wildfly.elytron.version>1.20.4.Final</wildfly.elytron.version>
+    <wildfly.elytron.version>2.2.2.Final</wildfly.elytron.version>
     <xmemcached.version>2.4.7</xmemcached.version>
 
     <!-- some maven plugins versions -->