You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/01/11 14:47:03 UTC
[cxf] branch 3.6.x-fixes updated (ff70972e2e -> 5c08fbd9c0)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from ff70972e2e Bump cxf.openwebbeans.version from 2.0.26 to 2.0.27 (#1062)
new e9fda922e7 Update EasyMock to 5.1.0
new 18ed52c0aa Update EasyMock to 5.1.0 (#1057)
new 5c08fbd9c0 Recording .gitmergeinfo Changes
The 3 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 | 3 +++
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
parent/pom.xml | 2 +-
.../cxf/transport/https/HttpsURLConnectionFactoryTest.java | 10 +++++-----
4 files changed, 10 insertions(+), 7 deletions(-)
[cxf] 01/03: Update EasyMock to 5.1.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e9fda922e79bb2c71a3ce9c705ecadfc07f1a23a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jan 8 15:05:14 2023 -0500
Update EasyMock to 5.1.0
(cherry picked from commit 2d5d085df8621805ff33640f7aa43b47d098622d)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a1c1b6de35..2c589ab9b1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
<cxf.asm.version>9.4</cxf.asm.version>
<cxf.osgi.asm.version>[3.0,10)</cxf.osgi.asm.version>
- <cxf.easymock.version>5.0.1</cxf.easymock.version>
+ <cxf.easymock.version>5.1.0</cxf.easymock.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
<cxf.bundle.activation.policy>lazy</cxf.bundle.activation.policy>
[cxf] 02/03: Update EasyMock to 5.1.0 (#1057)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 18ed52c0aaddb702d2bd0761f9bcee084677ff70
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 07:30:55 2023 -0500
Update EasyMock to 5.1.0 (#1057)
(cherry picked from commit 2c9be58586580ce1c2e9642a1fb44fa92d109c8a)
# Conflicts:
# parent/pom.xml
---
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
.../cxf/transport/https/HttpsURLConnectionFactoryTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index f48c8a91c6..f2976f0d87 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -67,7 +67,7 @@ public class ConnectionFactoryImplTest {
assertTrue("Instance of Referenceable", cf instanceof Referenceable);
assertNull("No ref set", cf.getReference());
- Reference ref = EasyMock.createMock(Reference.class);
+ Reference ref = new Reference("some.class");
cf.setReference(ref);
assertEquals("Got back what was set", ref, cf.getReference());
}
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
index ebed529b06..fa19f6c275 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
@@ -26,9 +26,9 @@ import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Mockito;
public class HttpsURLConnectionFactoryTest {
@@ -44,7 +44,7 @@ public class HttpsURLConnectionFactoryTest {
TLSClientParameters tlsClientParams = new TLSClientParameters();
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -66,7 +66,7 @@ public class HttpsURLConnectionFactoryTest {
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
tlsClientParams.setCertAlias("someAlias");
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -88,7 +88,7 @@ public class HttpsURLConnectionFactoryTest {
TLSClientParameters tlsClientParams = new TLSClientParameters();
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -111,7 +111,7 @@ public class HttpsURLConnectionFactoryTest {
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
tlsClientParams.setCertAlias("someAlias");
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5c08fbd9c0494cd8b355590477278adb45c389c0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 09:42:57 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 785bc8a9ed..5906654863 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -57,6 +57,7 @@ M 08f9a8e455896e005c508ab376a55d8edc2cc168
M 0973afd32b7a5990481eef2324a35cea02a71024
M 0bfc8552e73a54cf5fe52633be18e81edf1a375d
M 0e863bb147452ad3819c4ca8456ca8afc46d6b16
+M 0fcbc5360a2a2ad6738874c46db48d63ff846a9a
M 106c310b39a5b611cd8b8c2de4b4070e1d52b498
M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
M 115ae80d516ff6bce8bf12e073cbc0cfc6ed03da
@@ -91,6 +92,8 @@ M 286e8a0a1ea27a5e1994344d68135df2554ff4c4
M 2ad9d0b2eef17c0d57d3cb96f3b2cecd1e704869
M 2afed183de17550a2a57d266ca4ad666ed1edbf0
M 2c0b7979141a9536b178bf81106709182856d30a
+M 2c9be58586580ce1c2e9642a1fb44fa92d109c8a
+M 2d5d085df8621805ff33640f7aa43b47d098622d
M 2db882176d45017b2fc53046bdabdd2da53b886f
M 2f1e5a9b49893711f96644a7cf9745ff8559517a
M 2f5044e10a4487bd9abc6340bdc438df23cd8f1e