This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1f5f07e IGNITE-12540 Update versions of essential dependencies -
Fixes #7260.
1f5f07e is described below
commit 1f5f07e91ae131da7aba301ff301746db8fa3fc8
Author: Ilya Kasnacheev <[email protected]>
AuthorDate: Wed Jan 22 14:57:06 2020 +0300
IGNITE-12540 Update versions of essential dependencies - Fixes #7260.
Signed-off-by: Ilya Kasnacheev <[email protected]>
---
modules/cassandra/store/pom.xml | 2 +-
.../http/jetty/GridJettyRestProtocol.java | 39 ++++++++++++----------
parent/pom.xml | 18 +++++-----
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml
index 2696e43..053089e 100644
--- a/modules/cassandra/store/pom.xml
+++ b/modules/cassandra/store/pom.xml
@@ -35,7 +35,7 @@
<url>http://ignite.apache.org</url>
<properties>
- <commons-beanutils.version>1.9.2</commons-beanutils.version>
+ <commons-beanutils.version>1.9.4</commons-beanutils.version>
<cassandra-driver.version>3.2.0</cassandra-driver.version>
<cassandra-all.version>3.11.3</cassandra-all.version>
<netty.version>4.1.27.Final</netty.version>
diff --git
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index 2c9c137..76eeea2 100644
---
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import
org.apache.ignite.internal.processors.rest.protocols.GridRestProtocolAdapter;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.IgniteSpiException;
@@ -224,32 +225,34 @@ public class GridJettyRestProtocol extends
GridRestProtocolAdapter {
return false;
}
- catch (SocketException ignore) {
- if (log.isDebugEnabled())
- log.debug("Failed to bind HTTP server to configured port.");
+ catch (Exception e) {
+ boolean failedToBind = e instanceof SocketException;
- stopJetty();
+ if (e instanceof MultiException) {
+ if (log.isDebugEnabled())
+ log.debug("Caught multi exception: " + e);
- return false;
- }
- catch (MultiException e) {
- if (log.isDebugEnabled())
- log.debug("Caught multi exception: " + e);
+ failedToBind = true;
+
+ for (Object obj : ((MultiException)e).getThrowables())
+ if (!(obj instanceof SocketException))
+ failedToBind = false;
+ }
- for (Object obj : e.getThrowables())
- if (!(obj instanceof SocketException))
- throw new IgniteCheckedException("Failed to start Jetty
HTTP server.", e);
+ if (e instanceof IOException && X.hasCause(e,
SocketException.class))
+ failedToBind = true;
- if (log.isDebugEnabled())
- log.debug("Failed to bind HTTP server to configured port.");
+ if (failedToBind) {
+ if (log.isDebugEnabled())
+ log.debug("Failed to bind HTTP server to configured
port.");
- stopJetty();
+ stopJetty();
+ }
+ else
+ throw new IgniteCheckedException("Failed to start Jetty HTTP
server.", e);
return false;
}
- catch (Exception e) {
- throw new IgniteCheckedException("Failed to start Jetty HTTP
server.", e);
- }
}
/**
diff --git a/parent/pom.xml b/parent/pom.xml
index d95e1d2..12398d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<camel.version>2.22.0</camel.version>
<aws.encryption.sdk.version>1.3.2</aws.encryption.sdk.version>
<commons.beanutils.bundle.version>1.9.2_1</commons.beanutils.bundle.version>
- <commons.beanutils.version>1.9.3</commons.beanutils.version>
+ <commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.codec.version>1.11</commons.codec.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.lang.version>2.6</commons.lang.version>
@@ -76,7 +76,7 @@
<hamcrest.version>1.2</hamcrest.version>
<httpclient.version>4.5.1</httpclient.version>
<httpcore.version>4.4.3</httpcore.version>
- <jackson.version>2.9.6</jackson.version>
+ <jackson.version>2.9.10</jackson.version>
<jackson1.version>1.9.13</jackson1.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.14</jaxb.impl.version>
@@ -86,7 +86,7 @@
<javax.cache.version>1.0.0</javax.cache.version>
<jboss.rmi.version>1.0.6.Final</jboss.rmi.version>
<jetbrains.annotations.version>16.0.3</jetbrains.annotations.version>
- <jetty.version>9.4.11.v20180605</jetty.version>
+ <jetty.version>9.4.25.v20191220</jetty.version>
<jmh.version>1.13</jmh.version>
<jms.spec.version>1.1.1</jms.spec.version>
<jna.version>4.5.2</jna.version>
@@ -124,12 +124,12 @@
<snappy.version>1.1.7.2</snappy.version>
<spark.hadoop.version>2.6.5</spark.hadoop.version>
<spark.version>2.3.0</spark.version>
- <spring.data.version>1.13.14.RELEASE</spring.data.version> <!-- don't
forget to update spring version -->
- <spring.version>4.3.18.RELEASE</spring.version><!-- don't forget to
update spring-data version -->
- <spring.data-2.0.version>2.0.9.RELEASE</spring.data-2.0.version> <!--
don't forget to update spring-5.0 version -->
- <spring-5.0.version>5.0.8.RELEASE</spring-5.0.version><!-- don't
forget to update spring-data-2.0 version -->
- <spring.data-2.2.version>2.2.0.RELEASE</spring.data-2.2.version> <!--
don't forget to update spring-5.2 version -->
- <spring-5.2.version>5.2.0.RELEASE</spring-5.2.version><!-- don't
forget to update spring-data-2.2 version -->
+ <spring.data.version>1.13.23.RELEASE</spring.data.version> <!-- don't
forget to update spring version -->
+ <spring.version>4.3.26.RELEASE</spring.version><!-- don't forget to
update spring-data version -->
+ <spring.data-2.0.version>2.0.13.RELEASE</spring.data-2.0.version> <!--
don't forget to update spring-5.0 version -->
+ <spring-5.0.version>5.0.16.RELEASE</spring-5.0.version><!-- don't
forget to update spring-data-2.0 version -->
+ <spring.data-2.2.version>2.2.3.RELEASE</spring.data-2.2.version> <!--
don't forget to update spring-5.2 version -->
+ <spring-5.2.version>5.2.3.RELEASE</spring-5.2.version><!-- don't
forget to update spring-data-2.2 version -->
<spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
<storm.version>1.1.1</storm.version>
<tomcat.version>9.0.10</tomcat.version>
