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 18:53:42 UTC
[cxf] branch 3.2.x-fixes updated (13d3232 -> 0d57fc0)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 13d3232 [CXF-7875] Fix links to swagger/wadl in Karaf
new a57ff34 Updating Tika
new cd8d00e Making the RESTLoggingTest more robust
new 3847bee Updating Jasypt bundle version
new caf3985 Updating Jackson
new b1c57d8 Updating Snakeyaml
new 86bcc36 Fixing failing comparison on JDK 11
new 6a2d39e Recording .gitmergeinfo Changes
new ffd2be5 Updating Hazelcast on 3.2.x
new 0d57fc0 Updating Spring
The 9 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:
.gitmergeinfo | 2 ++
parent/pom.xml | 12 ++++++------
.../org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java | 8 +++++++-
.../cxf/sts/token/provider/SAMLProviderLifetimeTest.java | 2 +-
4 files changed, 16 insertions(+), 8 deletions(-)
[cxf] 01/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a57ff34a02d2330fa1c683efc5bf9afa1e5260c1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 11 14:47:16 2018 +0300
Updating Tika
(cherry picked from commit c17257d4965e6a957a9c908247ff6041a1731b2b)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a5ace90..9367bff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -222,7 +222,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] 09/09: Updating Spring
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0d57fc02afd45712cace3cc1436c196c2679006b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:57:24 2018 +0100
Updating Spring
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7938a5a..7cc5c67 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.25</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.3.19.RELEASE</cxf.spring.version>
+ <cxf.spring.version>4.3.20.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>1.5.16.RELEASE</cxf.spring.boot.version>
<cxf.spring.security.version>4.2.8.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
[cxf] 06/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 86bcc366f8f49b00245bbb96cfc0d16900fa21d5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:55:34 2018 +0100
Fixing failing comparison on JDK 11
(cherry picked from commit 77f51b1a1b140ee83a4021982f5258ab1d8dd30d)
---
.../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] 05/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b1c57d8a064394962decad0a1839d08fe9a467bd
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:08:59 2018 +0100
Updating Snakeyaml
(cherry picked from commit 02682ebbd870ecae6a39562ee4752940633671cd)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a202f1b..689db81 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -150,7 +150,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>
[cxf] 04/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit caf3985ff6722a6e7725aa6445703da65ea6b794
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:24:51 2018 +0100
Updating Jackson
(cherry picked from commit 58cc0cd69c4274cb1bbff531107ff2db6f434d67)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3928194..a202f1b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -97,7 +97,7 @@
<cxf.httpcomponents.core.version>4.4.9</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] 08/09: Updating Hazelcast on 3.2.x
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ffd2be5bd58a90af292bd78fd05701845a9cdf78
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:57:08 2018 +0100
Updating Hazelcast on 3.2.x
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 689db81..7938a5a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,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.9.4</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] 07/09: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6a2d39e70b1945f0b4218d6d3bdd4cf3b0efe05e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 17:56:46 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 318cb8b..e6dfbeb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -45,6 +45,7 @@ B da5b01b32a59867b48e2b35a9281b3625f58d514
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
B e63ce74570117d17552c5cfe9823bc93237583f2
B e9261069513b1947e16bf485182c328c07160e1c
+B eb76ad6674586bef76a23332030a3dc310cfa235
B f652464526edb0cb7eac277ff64c9f2d02e2b920
B fc656dc1311963f5fc833856984b36b7ccd26042
B fe5603d060881cf801db69ade3f9790423d48094
@@ -56,6 +57,7 @@ M 3904a477e70fe6385777120bfe4820ff9a7713f3
M 3aaaad57c6bf541825c6ccfe427de2bae2c246d9
M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
M 504a1b7827bc76f3c5106b901b44e54513db17aa
+M 58cc0cd69c4274cb1bbff531107ff2db6f434d67
M 6b8b33acde5eb94ca84121591c68eb3e5e7b294f
M 86d7c657499b73bdbbd6ba9f1579e76ca0715357
M 886a055d49d844e445721e4752c7a6360cbe8b9a
[cxf] 02/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit cd8d00eddc6cdd73bf3ca74a71d4dc3047ebbf04
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:23:21 2018 +0100
Making the RESTLoggingTest more robust
(cherry picked from commit 47b7d6ea1e65e3b55910cc90326cd683a144b43a)
---
.../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] 03/09: 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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3847beed1906980eb0a6c3213f7d3c376cd19d56
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 15 15:24:37 2018 +0100
Updating Jasypt bundle version
(cherry picked from commit 2a5dbac08d414a0c2fa29ef1ac2f1d0ae669e352)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9367bff..3928194 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,7 +115,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>