This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new 3c6421d CAMEL-16694: camel - Update dependencies in 3.4.x
3c6421d is described below
commit 3c6421d22e73ab3c5d3109c6ea35553e22b1fcc7
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jun 7 15:46:19 2021 +0200
CAMEL-16694: camel - Update dependencies in 3.4.x
---
camel-dependencies/pom.xml | 20 ++--
.../http/vertx/KeyManagerFactoryOptions.java | 58 ++++++++++
.../http/vertx/TrustManagerFactoryOptions.java | 57 +++++++++
.../component/platform/http/vertx/VertxHelper.java | 128 +++++++++++++++++++++
.../http/vertx/VertxPlatformHttpServer.java | 2 +-
.../http/vertx/VertxPlatformHttpServerSupport.java | 99 +---------------
parent/pom.xml | 18 +--
7 files changed, 269 insertions(+), 113 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index db2f3d8..a060058 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -34,7 +34,7 @@
<properties>
<abdera-version>1.1.3</abdera-version>
<activemq-artemis-version>2.13.0</activemq-artemis-version>
- <activemq-version>5.15.14</activemq-version>
+ <activemq-version>5.15.15</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.12.1</ahc-version>
<android-annotations-version>4.1.1.4</android-annotations-version>
@@ -152,8 +152,8 @@
<corda-version>4.4</corda-version>
<couchbase-client-version>1.4.13</couchbase-client-version>
<curator-version>4.3.0</curator-version>
- <cxf-codegen-plugin-version>3.3.5</cxf-codegen-plugin-version>
- <cxf-version>3.3.6</cxf-version>
+ <cxf-codegen-plugin-version>3.3.10</cxf-codegen-plugin-version>
+ <cxf-version>3.3.10</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
@@ -197,7 +197,7 @@
<flatpack-version>4.0.4</flatpack-version>
<flink-version>1.10.1</flink-version>
<fop-version>2.3</fop-version>
- <freemarker-version>2.3.30</freemarker-version>
+ <freemarker-version>2.3.31</freemarker-version>
<ftpserver-version>1.1.1</ftpserver-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
<geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
@@ -290,7 +290,7 @@
<jackson-spark-version>2.10.4</jackson-spark-version>
<jackson-version>1.9.12</jackson-version>
<jackson2-databind-version>2.10.5.1</jackson2-databind-version>
- <jackson2-version>2.10.5</jackson2-version>
+ <jackson2-version>2.10.5.1</jackson2-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
@@ -335,7 +335,7 @@
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jetty-version>${jetty9-version}</jetty-version>
- <jetty9-version>9.4.39.v20210325</jetty9-version>
+ <jetty9-version>9.4.41.v20210516</jetty9-version>
<jgit-version>5.7.0.202003110725-r</jgit-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
@@ -347,7 +347,7 @@
<jmh-version>1.23</jmh-version>
<jnats-version>2.6.8</jnats-version>
<jodatime2-bundle-version>2.10.5</jodatime2-bundle-version>
- <johnzon-version>1.2.10</johnzon-version>
+ <johnzon-version>1.2.13</johnzon-version>
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jool-version>0.9.12</jool-version>
@@ -419,7 +419,7 @@
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
<metrics-version>4.1.11</metrics-version>
- <micrometer-version>1.5.13</micrometer-version>
+ <micrometer-version>1.5.14</micrometer-version>
<microprofile-config-version>1.4</microprofile-config-version>
<microprofile-fault-tolerance-version>2.1</microprofile-fault-tolerance-version>
<microprofile-health-version>2.2</microprofile-health-version>
@@ -444,7 +444,7 @@
<nessus-ipfs-version>1.0.0.Beta4</nessus-ipfs-version>
<nessus-weka-version>1.0.1</nessus-weka-version>
<netty-reactive-streams-version>2.0.3</netty-reactive-streams-version>
- <netty-version>4.1.63.Final</netty-version>
+ <netty-version>4.1.64.Final</netty-version>
<netty3-version>3.10.6.Final</netty3-version>
<netty40-version>4.0.56.Final</netty40-version>
<networknt-json-schema-validator-version>1.0.40</networknt-json-schema-validator-version>
@@ -556,7 +556,7 @@
<vavr-version>0.10.2</vavr-version>
<velocity-tools-version>2.0</velocity-tools-version>
<velocity-version>2.1</velocity-version>
- <vertx-version>3.9.1</vertx-version>
+ <vertx-version>3.9.7</vertx-version>
<vysper-version>0.7</vysper-version>
<web3j-quorum-version>0.8.0</web3j-quorum-version>
<web3j-version>3.6.0</web3j-version>
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/KeyManagerFactoryOptions.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/KeyManagerFactoryOptions.java
new file mode 100644
index 0000000..46a0535
--- /dev/null
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/KeyManagerFactoryOptions.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.platform.http.vertx;
+
+import java.util.function.Function;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.X509KeyManager;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.net.KeyCertOptions;
+
+public class KeyManagerFactoryOptions implements KeyCertOptions {
+ private final KeyManagerFactory keyManagerFactory;
+
+ public KeyManagerFactoryOptions(KeyManagerFactory keyManagerFactory) {
+ this.keyManagerFactory = keyManagerFactory;
+ }
+
+ private KeyManagerFactoryOptions(KeyManagerFactoryOptions other) {
+ this.keyManagerFactory = other.keyManagerFactory;
+ }
+
+ @Override
+ public KeyCertOptions clone() {
+ return clone();
+ }
+
+ @Override
+ public KeyCertOptions copy() {
+ return new KeyManagerFactoryOptions(this);
+ }
+
+ @Override
+ public KeyManagerFactory getKeyManagerFactory(Vertx vertx) {
+ return keyManagerFactory;
+ }
+
+ @Override
+ public Function<String, X509KeyManager> keyManagerMapper(Vertx vertx) {
+ return keyManagerFactory.getKeyManagers()[0] instanceof X509KeyManager
+ ? serverName -> (X509KeyManager)
keyManagerFactory.getKeyManagers()[0] : null;
+ }
+}
\ No newline at end of file
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/TrustManagerFactoryOptions.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/TrustManagerFactoryOptions.java
new file mode 100644
index 0000000..6a6c8d6
--- /dev/null
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/TrustManagerFactoryOptions.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.platform.http.vertx;
+
+import java.util.function.Function;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.net.TrustOptions;
+
+public class TrustManagerFactoryOptions implements TrustOptions {
+ private final TrustManagerFactory trustManagerFactory;
+
+ public TrustManagerFactoryOptions(TrustManagerFactory trustManagerFactory)
{
+ this.trustManagerFactory = trustManagerFactory;
+ }
+
+ private TrustManagerFactoryOptions(TrustManagerFactoryOptions other) {
+ trustManagerFactory = other.trustManagerFactory;
+ }
+
+ @Override
+ public TrustOptions copy() {
+ return new TrustManagerFactoryOptions(this);
+ }
+
+ @Override
+ public TrustOptions clone() {
+ return clone();
+ }
+
+ @Override
+ public TrustManagerFactory getTrustManagerFactory(Vertx vertx) {
+ return trustManagerFactory;
+ }
+
+ @Override
+ public Function<String, TrustManager[]> trustManagerMapper(Vertx vertx) {
+ return serverName -> trustManagerFactory.getTrustManagers();
+ }
+}
\ No newline at end of file
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxHelper.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxHelper.java
new file mode 100644
index 0000000..5ac8489
--- /dev/null
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxHelper.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.platform.http.vertx;
+
+import io.vertx.core.net.TCPSSLOptions;
+import org.apache.camel.CamelContext;
+import org.apache.camel.support.jsse.KeyManagersParameters;
+import org.apache.camel.support.jsse.SSLContextParameters;
+import org.apache.camel.support.jsse.TrustManagersParameters;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+import java.security.KeyStore;
+
+public final class VertxHelper {
+
+ private VertxHelper() {
+ }
+
+ /**
+ * Configures key store and trust store options for the given
TCPSSLOptions from the configuration specified on
+ * SSLContextParameters
+ *
+ * @param camelContext the CamelContext
+ * @param sslContextParameters the SSL configuration to use for the
KeyManagerFactory & TrustManagerFactory
+ * @param tcpsslOptions the TCPSSLOptions instance to configure
+ */
+ public static void setupSSLOptions(
+ CamelContext camelContext, SSLContextParameters
sslContextParameters, TCPSSLOptions tcpsslOptions)
+ throws Exception {
+
+ if (camelContext == null) {
+ throw new IllegalArgumentException("camelContext cannot be null");
+ }
+
+ if (sslContextParameters == null) {
+ throw new IllegalArgumentException("sslContextParameters cannot be
null");
+ }
+
+ if (tcpsslOptions == null) {
+ throw new IllegalArgumentException("tcpsslOptions cannot be null");
+ }
+
+ tcpsslOptions.setSsl(true);
+
+ KeyManagerFactory keyManagerFactory =
createKeyManagerFactory(camelContext, sslContextParameters);
+ tcpsslOptions.setKeyCertOptions(new
KeyManagerFactoryOptions(keyManagerFactory));
+
+ TrustManagerFactory trustManagerFactory =
createTrustManagerFactory(camelContext, sslContextParameters);
+ tcpsslOptions.setTrustOptions(new
TrustManagerFactoryOptions(trustManagerFactory));
+ }
+
+ private static KeyManagerFactory createKeyManagerFactory(
+ CamelContext camelContext, SSLContextParameters
sslContextParameters)
+ throws Exception {
+ final KeyManagersParameters keyManagers =
sslContextParameters.getKeyManagers();
+ if (keyManagers == null) {
+ return null;
+ }
+
+ String kmfAlgorithm =
camelContext.resolvePropertyPlaceholders(keyManagers.getAlgorithm());
+ if (kmfAlgorithm == null) {
+ kmfAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
+ }
+
+ KeyManagerFactory kmf;
+ if (keyManagers.getProvider() == null) {
+ kmf = KeyManagerFactory.getInstance(kmfAlgorithm);
+ } else {
+ kmf = KeyManagerFactory.getInstance(kmfAlgorithm,
+
camelContext.resolvePropertyPlaceholders(keyManagers.getProvider()));
+ }
+
+ char[] kmfPassword = null;
+ if (keyManagers.getKeyPassword() != null) {
+ kmfPassword =
camelContext.resolvePropertyPlaceholders(keyManagers.getKeyPassword()).toCharArray();
+ }
+
+ KeyStore ks = keyManagers.getKeyStore() == null ? null :
keyManagers.getKeyStore().createKeyStore();
+
+ kmf.init(ks, kmfPassword);
+ return kmf;
+ }
+
+
+ private static TrustManagerFactory createTrustManagerFactory(
+ CamelContext camelContext, SSLContextParameters
sslContextParameters)
+ throws Exception {
+ final TrustManagersParameters trustManagers =
sslContextParameters.getTrustManagers();
+ if (trustManagers == null) {
+ return null;
+ }
+
+ TrustManagerFactory tmf = null;
+
+ if (trustManagers.getKeyStore() != null) {
+ String tmfAlgorithm =
camelContext.resolvePropertyPlaceholders(trustManagers.getAlgorithm());
+ if (tmfAlgorithm == null) {
+ tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
+ }
+
+ if (trustManagers.getProvider() == null) {
+ tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
+ } else {
+ tmf = TrustManagerFactory.getInstance(tmfAlgorithm,
+
camelContext.resolvePropertyPlaceholders(trustManagers.getProvider()));
+ }
+
+ KeyStore ks = trustManagers.getKeyStore() == null ? null :
trustManagers.getKeyStore().createKeyStore();
+ tmf.init(ks);
+ }
+ return tmf;
+ }
+}
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
index 21d8f6d..c2e9b1d 100644
---
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
@@ -153,7 +153,7 @@ public class VertxPlatformHttpServer extends ServiceSupport
implements CamelCont
);
}
- protected void startServer() {
+ protected void startServer() throws Exception {
HttpServerOptions options = new HttpServerOptions();
configureSSL(options, configuration, context);
diff --git
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
index 9806a56..5668a44 100644
---
a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
+++
b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
@@ -16,33 +16,22 @@
*/
package org.apache.camel.component.platform.http.vertx;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-
import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
import io.vertx.core.http.HttpHeaders;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpServerResponse;
-import io.vertx.core.net.KeyCertOptions;
-import io.vertx.core.net.TrustOptions;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.BodyHandler;
import org.apache.camel.CamelContext;
-import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.util.ObjectHelper;
public final class VertxPlatformHttpServerSupport {
@@ -157,94 +146,18 @@ public final class VertxPlatformHttpServerSupport {
//
// *****************************
- static HttpServerOptions configureSSL(HttpServerOptions options,
VertxPlatformHttpServerConfiguration configuration, CamelContext camelContext) {
+ static HttpServerOptions configureSSL(
+ HttpServerOptions options, VertxPlatformHttpServerConfiguration
configuration, CamelContext camelContext)
+ throws Exception {
final SSLContextParameters sslParameters =
configuration.getSslContextParameters() != null
- ? configuration.getSslContextParameters()
- : configuration.isUseGlobalSslContextParameters() ?
camelContext.getSSLContextParameters() : null;
+ ? configuration.getSslContextParameters()
+ : configuration.isUseGlobalSslContextParameters() ?
camelContext.getSSLContextParameters() : null;
if (sslParameters != null) {
- options.setSsl(true);
- options.setKeyCertOptions(new KeyCertOptions() {
- @Override
- public KeyManagerFactory getKeyManagerFactory(Vertx vertx)
throws Exception {
- return createKeyManagerFactory(camelContext,
sslParameters);
- }
-
- @Override
- public KeyCertOptions clone() {
- return this;
- }
- });
-
- options.setTrustOptions(new TrustOptions() {
- @Override
- public TrustOptions clone() {
- return this;
- }
-
- @Override
- public TrustManagerFactory getTrustManagerFactory(Vertx vertx)
throws Exception {
- return createTrustManagerFactory(camelContext,
sslParameters);
- }
- });
+ VertxHelper.setupSSLOptions(camelContext, sslParameters, options);
}
return options;
}
- private static KeyManagerFactory createKeyManagerFactory(CamelContext
camelContext, SSLContextParameters sslContextParameters) throws
GeneralSecurityException, IOException {
- final KeyManagersParameters keyManagers =
sslContextParameters.getKeyManagers();
- if (keyManagers == null) {
- return null;
- }
-
- String kmfAlgorithm =
camelContext.resolvePropertyPlaceholders(keyManagers.getAlgorithm());
- if (kmfAlgorithm == null) {
- kmfAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
- }
-
- KeyManagerFactory kmf;
- if (keyManagers.getProvider() == null) {
- kmf = KeyManagerFactory.getInstance(kmfAlgorithm);
- } else {
- kmf = KeyManagerFactory.getInstance(kmfAlgorithm,
camelContext.resolvePropertyPlaceholders(keyManagers.getProvider()));
- }
-
- char[] kmfPassword = null;
- if (keyManagers.getKeyPassword() != null) {
- kmfPassword =
camelContext.resolvePropertyPlaceholders(keyManagers.getKeyPassword()).toCharArray();
- }
-
- KeyStore ks = keyManagers.getKeyStore() == null ? null :
keyManagers.getKeyStore().createKeyStore();
-
- kmf.init(ks, kmfPassword);
- return kmf;
- }
-
- private static TrustManagerFactory createTrustManagerFactory(CamelContext
camelContext, SSLContextParameters sslContextParameters) throws
GeneralSecurityException, IOException {
- final TrustManagersParameters trustManagers =
sslContextParameters.getTrustManagers();
- if (trustManagers == null) {
- return null;
- }
-
- TrustManagerFactory tmf = null;
-
- if (trustManagers.getKeyStore() != null) {
- String tmfAlgorithm =
camelContext.resolvePropertyPlaceholders(trustManagers.getAlgorithm());
- if (tmfAlgorithm == null) {
- tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
- }
-
- if (trustManagers.getProvider() == null) {
- tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
- } else {
- tmf = TrustManagerFactory.getInstance(tmfAlgorithm,
camelContext.resolvePropertyPlaceholders(trustManagers.getProvider()));
- }
-
- KeyStore ks = trustManagers.getKeyStore() == null ? null :
trustManagers.getKeyStore().createKeyStore();
- tmf.init(ks);
- }
-
- return tmf;
- }
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 2750de9..9f8b0be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,7 +42,7 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.14</activemq-version>
+ <activemq-version>5.15.15</activemq-version>
<activemq-artemis-version>2.13.0</activemq-artemis-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.12.1</ahc-version>
@@ -135,9 +135,9 @@
<corda-version>4.4</corda-version>
<couchbase-client-version>1.4.13</couchbase-client-version>
<curator-version>4.3.0</curator-version>
- <cxf-version>3.3.6</cxf-version>
+ <cxf-version>3.3.10</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
- <cxf-codegen-plugin-version>3.3.5</cxf-codegen-plugin-version>
+ <cxf-codegen-plugin-version>3.3.10</cxf-codegen-plugin-version>
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
<deltaspike-version>1.9.4</deltaspike-version>
@@ -181,7 +181,7 @@
<flink-version>1.10.1</flink-version>
<fop-version>2.3</fop-version>
<ftpserver-version>1.1.1</ftpserver-version>
- <freemarker-version>2.3.30</freemarker-version>
+ <freemarker-version>2.3.31</freemarker-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
<geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
<geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
@@ -314,7 +314,7 @@
<jcr-version>2.0</jcr-version>
<jedis-client-version>3.1.0</jedis-client-version>
<jersey-version>2.28</jersey-version>
- <jetty9-version>9.4.39.v20210325</jetty9-version>
+ <jetty9-version>9.4.41.v20210516</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -335,7 +335,7 @@
<jolt-version>0.1.1</jolt-version>
<jool-version>0.9.12</jool-version>
<jooq-version>3.13.6</jooq-version>
- <johnzon-version>1.2.10</johnzon-version>
+ <johnzon-version>1.2.13</johnzon-version>
<jose4j-version>0.6.4</jose4j-version>
<jsendnsca-version>2.1.1</jsendnsca-version>
<jslt-version>0.1.9</jslt-version>
@@ -404,7 +404,7 @@
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
<metrics-version>4.1.11</metrics-version>
- <micrometer-version>1.5.13</micrometer-version>
+ <micrometer-version>1.5.14</micrometer-version>
<microprofile-config-version>1.4</microprofile-config-version>
<microprofile-metrics-version>2.3</microprofile-metrics-version>
<microprofile-health-version>2.2</microprofile-health-version>
@@ -430,7 +430,7 @@
<nsq-client-version>1.0.0.RC4</nsq-client-version>
<neoscada-version>0.4.0</neoscada-version>
<netty3-version>3.10.6.Final</netty3-version>
- <netty-version>4.1.63.Final</netty-version>
+ <netty-version>4.1.64.Final</netty-version>
<netty-reactive-streams-version>2.0.3</netty-reactive-streams-version>
<netty40-version>4.0.56.Final</netty40-version>
<networknt-json-schema-validator-version>1.0.40</networknt-json-schema-validator-version>
@@ -543,7 +543,7 @@
<vavr-version>0.10.2</vavr-version>
<velocity-tools-version>2.0</velocity-tools-version>
<velocity-version>2.1</velocity-version>
- <vertx-version>3.9.1</vertx-version>
+ <vertx-version>3.9.7</vertx-version>
<vysper-version>0.7</vysper-version>
<web3j-version>3.6.0</web3j-version>
<web3j-quorum-version>0.8.0</web3j-quorum-version>
