You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/15 16:55:54 UTC
[cxf] branch master updated (e9d4d65 -> 77f51b1)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e9d4d65 remove unwanted file
new c17257d Updating Tika
new 47b7d6e Making the RESTLoggingTest more robust
new 2a5dbac Updating Jasypt bundle version
new 58cc0cd Updating Jackson
new 02682eb Updating Snakeyaml
new eb76ad6 Updating Hazelcast
new 77f51b1 Fixing failing comparison on JDK 11
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 10 +++++-----
.../org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java | 8 +++++++-
.../cxf/sts/token/provider/SAMLProviderLifetimeTest.java | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
[cxf] 01/07: Updating Tika
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c17257d4965e6a957a9c908247ff6041a1731b2b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 11 14:47:16 2018 +0300
Updating Tika
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c51b88..11a2105 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -225,7 +225,7 @@
<cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
<cxf.olingo.version>2.0.9</cxf.olingo.version>
- <cxf.tika.version>1.18</cxf.tika.version>
+ <cxf.tika.version>1.19.1</cxf.tika.version>
<cxf.jexl.version>2.1.1</cxf.jexl.version>
<cxf.htrace.version>4.2.0-incubating</cxf.htrace.version>
<cxf.zest.version>2.1</cxf.zest.version>
[cxf] 06/07: Updating Hazelcast
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit eb76ad6674586bef76a23332030a3dc310cfa235
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:14:57 2018 +0100
Updating Hazelcast
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b3f375..b44acf4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.ehcache3.version>3.0.3</cxf.ehcache3.version>
<cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
<cxf.guava.version>20.0</cxf.guava.version>
- <cxf.hazelcast.version>3.9.2</cxf.hazelcast.version>
+ <cxf.hazelcast.version>3.10.6</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.3.3.Final</cxf.hibernate.em.version>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
[cxf] 02/07: Making the RESTLoggingTest more robust
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 47b7d6ea1e65e3b55910cc90326cd683a144b43a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:23:21 2018 +0100
Making the RESTLoggingTest more robust
---
.../java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index 7c635f9..a6d8019 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -73,6 +73,8 @@ public class RESTLoggingTest {
await().until(() -> events.size(), is(8));
server.stop();
server.destroy();
+
+ Assert.assertEquals(8, events.size());
// First call with binary logging false
assertContentLogged(events.get(0));
@@ -98,8 +100,12 @@ public class RESTLoggingTest {
WebClient client = createClient(SERVICE_URI, loggingFeature);
String result = client.get(String.class);
Assert.assertEquals("test1", result);
- server.destroy();
+
List<LogEvent> events = sender.getEvents();
+ await().until(() -> events.size(), is(4));
+ server.stop();
+ server.destroy();
+
Assert.assertEquals(4, events.size());
checkRequestOut(events.get(0));
checkRequestIn(events.get(1));
[cxf] 07/07: Fixing failing comparison on JDK 11
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 77f51b1a1b140ee83a4021982f5258ab1d8dd30d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:55:34 2018 +0100
Fixing failing comparison on JDK 11
---
.../org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
index 183bbfa..1c8964c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java
@@ -118,7 +118,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert {
TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters);
assertTrue(providerResponse != null);
assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
- assertEquals(providerResponse.getExpires(), expirationTime);
+ assertEquals(providerResponse.getExpires().toEpochMilli(), expirationTime.toEpochMilli());
}
[cxf] 03/07: Updating Jasypt bundle version
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2a5dbac08d414a0c2fa29ef1ac2f1d0ae669e352
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:24:37 2018 +0100
Updating Jasypt bundle version
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 11a2105..715e4e6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
<cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
<cxf.openjpa.version>2.4.2</cxf.openjpa.version>
<cxf.geronimo.transaction.version>3.1.4</cxf.geronimo.transaction.version>
- <cxf.jasypt.bundle.version>1.9.0_1</cxf.jasypt.bundle.version>
+ <cxf.jasypt.bundle.version>1.9.2_1</cxf.jasypt.bundle.version>
<cxf.javassist.version>3.21.0-GA</cxf.javassist.version>
<cxf.javax.ws.rs.version>2.1.1</cxf.javax.ws.rs.version>
<cxf.jaxb.version>2.2.11</cxf.jaxb.version>
[cxf] 04/07: Updating Jackson
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 58cc0cd69c4274cb1bbff531107ff2db6f434d67
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:24:51 2018 +0100
Updating Jackson
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 715e4e6..c03a3b0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -99,7 +99,7 @@
<cxf.httpcomponents.core.version>4.4.10</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
- <cxf.jackson.version>2.9.6</cxf.jackson.version>
+ <cxf.jackson.version>2.9.7</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.kerby.version>1.1.1</cxf.kerby.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
[cxf] 05/07: Updating Snakeyaml
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 02682ebbd870ecae6a39562ee4752940633671cd
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:08:59 2018 +0100
Updating Snakeyaml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c03a3b0..9b3f375 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -152,7 +152,7 @@
<cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
<cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
- <cxf.snakeyaml.version>1.18</cxf.snakeyaml.version>
+ <cxf.snakeyaml.version>1.23</cxf.snakeyaml.version>
<cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>