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 19:57:50 UTC
[cxf] branch 3.5.x-fixes updated (9c7470006f -> 3176a94564)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 9c7470006f Bump dependency-check-maven from 6.5.3 to 7.4.4 (#1064)
new ac99c8980d Update EasyMock to 5.1.0
new 8e3239d358 Update EasyMock to 5.1.0 (#1057)
new 3176a94564 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 | 4 ++++
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
parent/pom.xml | 2 +-
.../cxf/transport/https/HttpsURLConnectionFactoryTest.java | 10 +++++-----
4 files changed, 11 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ac99c8980d820a220254b8c2d74626cb389cc97e
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
(cherry picked from commit e9fda922e79bb2c71a3ce9c705ecadfc07f1a23a)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a0c6469e2a..7cedfec148 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] 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3176a94564529b8c233672e507c73dfbfca6ca00
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 14:52:11 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index dfbb0aa5aa..24a3214b3c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,6 +20,7 @@ B 2ba0d3038c9542ad59ec671bc17a6c0bac749f11
B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6
B 31034cadab36e45a3348fd4b8f2726b01714abe1
B 33e606c55927f34f3a2414bd1386931745357f38
+B 3428dd1423198b22d7662dcc8d9553a58835c130
B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
B 3795fbc8740c882d8f276b6e9cbaf0cab107edef
B 399a35267366297a4e2b9e7e8c53972edfa24591
@@ -33,6 +34,7 @@ B 5aa91d092fd31039e7f2aeed8f6dee0e06321ce7
B 5ab347d6a7189d5c8536d06a50cbaf13632ed756
B 5b85f10bd469ced686ef5284e725cf57a683edcc
B 5bfcf58aeb8bd4825fd84d4ea10a5d2c4072798f
+B 5c08fbd9c0494cd8b355590477278adb45c389c0
B 5d6eedf32fd49a7f9cedc916084ad44dbec74846
B 62c0b2858d0cbd437e436b37c32cf686f424c909
B 6374b6439d18c521d232de0b28e43b5eb5e45f23
@@ -212,8 +214,10 @@ M d86920ce70dfe74836f18180dc5d47c8437f0250
M db6fcc8871fd8469907f3bfadfa6f1824e52a966
M e272423b0ab885aa886901850360c04d11eb5ba2
M e6fd52bd53f8b16082d5532a7276b5165463a8a5
+M f25e81b813d776475641eb1a0875cb3bc9f45e51
M f339bcce2cea60cbb31fc296109e47bf66f61b39
M f55be99cd50d9d1fe527bbeb55135174b7fab79b
M fb569f0c4936f7ac7b5197ce823ef9a725453376
+M fb7dc28145a243e5e269536e1dc2ee9cea70f17c
M fd261453cf08ac22d2c5be3c2fe4100438c740a5
M ff640769c1e6efc175b864ade495eb8ca5dc2c7e
[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8e3239d358b6565c382dcba2bf5bbd8ff6b3547d
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
(cherry picked from commit 18ed52c0aaddb702d2bd0761f9bcee084677ff70)
---
.../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);