[cxf] branch dependabot/maven/jakarta.json-jakarta.json-api-2.1.2 created (now 7124410ee3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jakarta.json-jakarta.json-api-2.1.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at 7124410ee3 Bump jakarta.json:jakarta.json-api from 2.0.1 to 2.1.2 No new revisions were added by this update.
[cxf] branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.8.0 created (now 6135409d87)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/cxf.git at 6135409d87 Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 No new revisions were added by this update.
[cxf] 02/02: Recording .gitmergeinfo Changes
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 edfbe20ae742ffe637c5ac6aeca42a3af6babd77 Author: Andriy Redko AuthorDate: Tue Jul 25 21:02:43 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 1bddc760d6..22d37eb3a5 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -158,6 +158,7 @@ B 84cbe46182b39564924c05cc0a5ce797370841b3 B 8547220e759831cebc41b84b0181ddc481716022 B 8562cf3503ba4889e5bd66e3f049caa5ae023f69 B 85b9b53c632feb023b522afd49192e95ab232a15 +B 862c778f8bc80d924c665eb82c6d1306cc245db2 B 86c4b4960df71674490b3bc84fb3ffd72ba5bea5 B 86fb83b21a14bce8cb61fa10e776078162b9d842 B 8782609de7640644614573b0aa728cd229a67a75 @@ -535,6 +536,7 @@ M d21fa935e85a93a64545a20d3c814e6b1afdc1b6 M d4060c33ebd3fb74855a6521c130a049788f5083 M d4dd039adf8bc4d797c792b18b24b19d0c28a60d M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3 +M d72183fa21cb00b75bb643372e2256b1f46b72c0 M d849512da6499d00e3e84eb60733a0343a473b44 M d86920ce70dfe74836f18180dc5d47c8437f0250 M d891059f0de95a27e69179a0bfa0e80eb251bb3f
[cxf] 01/02: Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355)
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 755b705f9476241311bda544ff1166bf178af19a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 25 08:19:13 2023 -0400 Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) Bumps [com.googlecode.maven-download-plugin:download-maven-plugin](https://github.com/maven-download-plugin/maven-download-plugin) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/maven-download-plugin/maven-download-plugin/releases) - [Commits](https://github.com/maven-download-plugin/maven-download-plugin/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: com.googlecode.maven-download-plugin:download-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9b09266d4f73e7f50008e4f6e9b800f86f16977c) # Conflicts: # rt/transports/http/pom.xml (cherry picked from commit 57a236caa37e08b41dd3a3b8541ea1a97c53bb20) --- rt/transports/http/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index e0d70c3f29..c2bc7edce4 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -228,7 +228,7 @@ com.googlecode.maven-download-plugin download-maven-plugin -1.6.8 +1.7.1 download-public-suffix-list
[cxf] branch 3.5.x-fixes updated (333003fc7e -> edfbe20ae7)
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 333003fc7e Update Spring Security to 5.6.12 new 755b705f94 Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) new edfbe20ae7 Recording .gitmergeinfo Changes The 2 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 ++ rt/transports/http/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[cxf-xjc-utils] branch dependabot/maven/cxf-xjc-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 deleted (was 8724375)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/cxf-xjc-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git was 8724375 Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf-xjc-utils] branch main updated: Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin (#74)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git The following commit(s) were added to refs/heads/main by this push: new e53dbd8 Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin (#74) e53dbd8 is described below commit e53dbd844f8826f99d1de7fb5b9e26572bb91d8b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 25 13:43:27 2023 -0400 Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin (#74) Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.7.1 to 4.8.0. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.7.1...plexus-archiver-4.8.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-archiver dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cxf-xjc-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index 4f68dac..47d38b0 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -48,7 +48,7 @@ org.codehaus.plexus plexus-archiver -4.7.1 +4.8.0 org.apache.maven
[cxf] 03/03: Recording .gitmergeinfo Changes
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 862c778f8bc80d924c665eb82c6d1306cc245db2 Author: Andriy Redko AuthorDate: Tue Jul 25 13:22:56 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index fe90e6a2d9..e2e77c02e7 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -445,6 +445,7 @@ M 99dbd2a5924ae165fb46d12a6365f5c89bf65f0e M 9a36be5c61b1992247f7fdb416a4f0bb10f9c1d9 M 9a8e07ab159b2492d42fddadce1e5854ceee29e8 M 9a9d8da3eadb36ac32716988e28db544980c8e64 +M 9b09266d4f73e7f50008e4f6e9b800f86f16977c M 9b36a4bc996615e0ed02795c74167586a2bb11df M 9b6e4591d59d49e7a686841447db0a1d380befbe M 9b804a79de17ccd24f1999f673e1b4d4d25aaaec
[cxf] branch 3.6.x-fixes updated (25e02a7180 -> 862c778f8b)
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 25e02a7180 Update Spring Boot to 2.7.14 new 57a236caa3 Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) new d72183fa21 CXF-8845: Get rid of EasyMock in cxf-rt-bindings-corba (#1339) new 862c778f8b 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 | 1 + rt/bindings/corba/pom.xml | 5 +- .../cxf/binding/corba/CorbaBindingFactoryTest.java | 9 +- .../apache/cxf/binding/corba/CorbaConduitTest.java | 151 ++--- .../apache/cxf/binding/corba/CorbaMessageTest.java | 6 +- .../cxf/binding/corba/CorbaServerConduitTest.java | 129 -- .../corba/runtime/CorbaStreamReaderTest.java | 20 ++- rt/transports/http/pom.xml | 2 +- 8 files changed, 147 insertions(+), 176 deletions(-)
[cxf] 01/03: Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355)
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 57a236caa37e08b41dd3a3b8541ea1a97c53bb20 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 25 08:19:13 2023 -0400 Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) Bumps [com.googlecode.maven-download-plugin:download-maven-plugin](https://github.com/maven-download-plugin/maven-download-plugin) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/maven-download-plugin/maven-download-plugin/releases) - [Commits](https://github.com/maven-download-plugin/maven-download-plugin/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: com.googlecode.maven-download-plugin:download-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9b09266d4f73e7f50008e4f6e9b800f86f16977c) # Conflicts: # rt/transports/http/pom.xml --- rt/transports/http/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index 1cc5c3b019..ba616797ea 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -228,7 +228,7 @@ com.googlecode.maven-download-plugin download-maven-plugin -1.6.8 +1.7.1 download-public-suffix-list
[cxf] 02/03: CXF-8845: Get rid of EasyMock in cxf-rt-bindings-corba (#1339)
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 d72183fa21cb00b75bb643372e2256b1f46b72c0
Author: Andriy Redko
AuthorDate: Tue Jul 25 09:40:17 2023 -0400
CXF-8845: Get rid of EasyMock in cxf-rt-bindings-corba (#1339)
(cherry picked from commit 99555171b25e4d599372f645b18cf1537e58ae90)
---
rt/bindings/corba/pom.xml | 5 +-
.../cxf/binding/corba/CorbaBindingFactoryTest.java | 9 +-
.../apache/cxf/binding/corba/CorbaConduitTest.java | 151 ++---
.../apache/cxf/binding/corba/CorbaMessageTest.java | 6 +-
.../cxf/binding/corba/CorbaServerConduitTest.java | 129 --
.../corba/runtime/CorbaStreamReaderTest.java | 20 ++-
6 files changed, 145 insertions(+), 175 deletions(-)
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index 52c6aec3e9..5ff6d7b4cd 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -62,8 +62,9 @@
${project.version}
-org.easymock
-easymock
+org.mockito
+mockito-core
+${cxf.mockito.version}
test
diff --git
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 117bfd9785..2b5dca59e0 100644
---
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -40,8 +40,6 @@ import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +47,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-
+import static org.mockito.Mockito.mock;
public class CorbaBindingFactoryTest {
@@ -85,8 +83,7 @@ public class CorbaBindingFactoryTest {
@Test
public void testCreateBinding() throws Exception {
-IMocksControl control = EasyMock.createNiceControl();
-BindingInfo bindingInfo = control.createMock(BindingInfo.class);
+BindingInfo bindingInfo = mock(BindingInfo.class);
CorbaBinding binding =
(CorbaBinding)factory.createBinding(bindingInfo);
assertNotNull(binding);
@@ -110,7 +107,7 @@ public class CorbaBindingFactoryTest {
assertNotNull(conduit);
conduit = factory.getConduit(endpointInfo, null, bus);
assertNotNull(conduit);
-target = EasyMock.createMock(EndpointReferenceType.class);
+target = mock(EndpointReferenceType.class);
conduit = factory.getConduit(endpointInfo, target, bus);
assertNotNull(conduit);
}
diff --git
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 3fc47fc013..e950a7a92c 100644
---
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba;
import java.io.OutputStream;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.List;
@@ -55,19 +54,23 @@ import org.omg.CORBA.Request;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.nullable;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class CorbaConduitTest {
-private static IMocksControl control;
private static ORB orb;
private static Bus bus;
protected EndpointInfo endpointInfo;
@@ -79,8 +82,6 @@ public class CorbaConduitTest {
@Before
public void setUp() throws Exception {
-control = EasyMock.createNiceControl();
-
bus = BusFactory.getDefaultBus();
java.util.Properties props = System.getProperties();
@@ -168,31 +169,26 @@ public class CorbaConduitTest {
@Test
public void testClose(
[cxf-xjc-utils] branch dependabot/maven/cxf-xjc-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 created (now 8724375)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/cxf-xjc-plugin/org.codehaus.plexus-plexus-archiver-4.8.0 in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git at 8724375 Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin No new revisions were added by this update.
[cxf] branch main updated (9b09266d4f -> 99555171b2)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 9b09266d4f Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) add 99555171b2 CXF-8845: Get rid of EasyMock in cxf-rt-bindings-corba (#1339) No new revisions were added by this update. Summary of changes: rt/bindings/corba/pom.xml | 5 +- .../cxf/binding/corba/CorbaBindingFactoryTest.java | 9 +- .../apache/cxf/binding/corba/CorbaConduitTest.java | 151 ++--- .../apache/cxf/binding/corba/CorbaMessageTest.java | 6 +- .../cxf/binding/corba/CorbaServerConduitTest.java | 129 -- .../corba/runtime/CorbaStreamReaderTest.java | 20 ++- 6 files changed, 145 insertions(+), 175 deletions(-)
[cxf] branch dependabot/maven/com.googlecode.maven-download-plugin-download-maven-plugin-1.7.1 deleted (was e05d80dcce)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.googlecode.maven-download-plugin-download-maven-plugin-1.7.1 in repository https://gitbox.apache.org/repos/asf/cxf.git was e05d80dcce Bump com.googlecode.maven-download-plugin:download-maven-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch main updated (a2e3ce536b -> 9b09266d4f)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from a2e3ce536b Update Spring Boot to 3.0.9 add 9b09266d4f Bump com.googlecode.maven-download-plugin:download-maven-plugin (#1355) No new revisions were added by this update. Summary of changes: rt/transports/http/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
