[cxf-fediz] 01/01: Merge pull request #186 from apache/dependabot/maven/spring.security.version-5.6.12
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit b3ec9130bb76cedfd06f21573be9795b8a2d7bcc Merge: dcc97c3d 491d3034 Author: Colm O hEigeartaigh AuthorDate: Tue Aug 1 07:27:48 2023 +0100 Merge pull request #186 from apache/dependabot/maven/spring.security.version-5.6.12 Bump spring.security.version from 5.6.10 to 5.6.12 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf-fediz] branch dependabot/maven/spring.security.version-5.6.12 deleted (was 491d3034)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/spring.security.version-5.6.12 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git was 491d3034 Bump spring.security.version from 5.6.10 to 5.6.12 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-fediz] branch main updated (e7fc9596 -> dcc97c3d)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from e7fc9596 Merge pull request #187 from apache/coheigea/errorprone add db7610cc Bump org.codehaus.mojo:properties-maven-plugin from 1.1.0 to 1.2.0 new dcc97c3d Merge pull request #188 from apache/dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf-fediz] branch main updated (dcc97c3d -> b3ec9130)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from dcc97c3d Merge pull request #188 from apache/dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0 add 491d3034 Bump spring.security.version from 5.6.10 to 5.6.12 new b3ec9130 Merge pull request #186 from apache/dependabot/maven/spring.security.version-5.6.12 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf-fediz] branch dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0 deleted (was db7610cc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git was db7610cc Bump org.codehaus.mojo:properties-maven-plugin from 1.1.0 to 1.2.0 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-fediz] 01/01: Merge pull request #188 from apache/dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit dcc97c3d91449fd90f1674e1dec5580ded1f725d Merge: e7fc9596 db7610cc Author: Colm O hEigeartaigh AuthorDate: Tue Aug 1 07:27:35 2023 +0100 Merge pull request #188 from apache/dependabot/maven/org.codehaus.mojo-properties-maven-plugin-1.2.0 Bump org.codehaus.mojo:properties-maven-plugin from 1.1.0 to 1.2.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch dependabot/maven/org.webjars-swagger-ui-5.2.0 created (now 6f16669825)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.webjars-swagger-ui-5.2.0 in repository https://gitbox.apache.org/repos/asf/cxf.git at 6f16669825 Bump org.webjars:swagger-ui from 5.1.3 to 5.2.0 No new revisions were added by this update.
[cxf] branch 3.6.x-fixes updated (00b6fe804d -> 35f84e49c8)
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 00b6fe804d Fix checkstyle violations new 03e554cf37 Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364) new 3d40d621a8 CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353) new 35f84e49c8 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 + parent/pom.xml | 2 +- rt/transports/websocket/pom.xml | 5 +++-- .../websocket/jetty/JettyWebSocketDestinationTest.java | 16 ++-- 4 files changed, 7 insertions(+), 17 deletions(-)
[cxf] 02/03: CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
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 3d40d621a8212c92e4a38355f8bfe19fec2b8e85
Author: Andriy Redko
AuthorDate: Mon Jul 31 15:24:28 2023 -0400
CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
(cherry picked from commit 18772ccd06e30586122665f1f1179cb3e7361eb3)
---
rt/transports/websocket/pom.xml | 5 +++--
.../websocket/jetty/JettyWebSocketDestinationTest.java | 16 ++--
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 58238b89ab..c7870c9e48 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -203,8 +203,9 @@
test
-org.easymock
-easymock
+org.mockito
+mockito-subclass
+${cxf.mockito.version}
test
diff --git
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index adb54adb5c..1e8afb00ca 100644
---
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -32,14 +32,11 @@ import
org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.websocket.jetty10.Jetty10WebSocketDestination;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
+import static org.mockito.Mockito.mock;
/**
*
*/
@@ -47,13 +44,6 @@ public class JettyWebSocketDestinationTest {
private static final String ENDPOINT_ADDRESS =
"ws://localhost:9001/websocket/nada";
private static final QName ENDPOINT_NAME = new
QName("urn:websocket:probe", "nada");
-private IMocksControl control;
-
-@Before
-public void setUp() {
-control = EasyMock.createNiceControl();
-}
-
@Test
public void testRegisteration() throws Exception {
Bus bus = new ExtensionManagerBus();
@@ -61,9 +51,7 @@ public class JettyWebSocketDestinationTest {
EndpointInfo endpoint = new EndpointInfo();
endpoint.setAddress(ENDPOINT_ADDRESS);
endpoint.setName(ENDPOINT_NAME);
-JettyHTTPServerEngine engine =
EasyMock.createMock(JettyHTTPServerEngine.class);
-
-control.replay();
+JettyHTTPServerEngine engine = mock(JettyHTTPServerEngine.class);
TestJettyWebSocketDestination dest = new
TestJettyWebSocketDestination(bus, registry, endpoint, null, engine);
[cxf] 01/03: Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364)
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 03e554cf370fc4543a1a611c525e787527e8a02f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 31 06:43:56 2023 -0400 Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364) Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.1 to 10.12.2. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.1...checkstyle-10.12.2) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle 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 08b1c6a95618345d3f0f5b788c8f17f7e739c315) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 25528d6b58..2f968c175e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -394,7 +394,7 @@ com.puppycrawl.tools checkstyle -10.12.1 +10.12.2
[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 35f84e49c8a39dbbe14e972c9ecb24c2066d07c8 Author: Andriy Redko AuthorDate: Mon Jul 31 17:25:44 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 77c8a29182..d38f0279b9 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -214,6 +214,7 @@ M 1654e0d45ac3ccaaa7eb53cc9ede8331424cf2fc M 167214335d2bb10e22210faef36603ba7ee4047d M 179f339622232adee54e9eb6a604ef1048c6d267 M 18599e4dc283e4de4d49933e13ff17fd09c61365 +M 18772ccd06e30586122665f1f1179cb3e7361eb3 M 188776f6723abb01b4c771e7370a09b844437e8d M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306 M 1931627bce92559e1bc0cf585163b4c9c921fcf7
[cxf] branch main updated: CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
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.git
The following commit(s) were added to refs/heads/main by this push:
new 18772ccd06 CXF-8863: Get rid of EasyMock in
cxf-rt-transports-websocket (#1353)
18772ccd06 is described below
commit 18772ccd06e30586122665f1f1179cb3e7361eb3
Author: Andriy Redko
AuthorDate: Mon Jul 31 15:24:28 2023 -0400
CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
---
rt/transports/websocket/pom.xml | 5 +++--
.../websocket/jetty/JettyWebSocketDestinationTest.java | 16 ++--
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 866605e155..1b8e8b138f 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -183,8 +183,9 @@
test
-org.easymock
-easymock
+org.mockito
+mockito-subclass
+${cxf.mockito.version}
test
diff --git
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index 16a3e9fea0..fb1326dab3 100644
---
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -32,14 +32,11 @@ import
org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.websocket.jetty11.Jetty11WebSocketDestination;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
+import static org.mockito.Mockito.mock;
/**
*
*/
@@ -47,13 +44,6 @@ public class JettyWebSocketDestinationTest {
private static final String ENDPOINT_ADDRESS =
"ws://localhost:9001/websocket/nada";
private static final QName ENDPOINT_NAME = new
QName("urn:websocket:probe", "nada");
-private IMocksControl control;
-
-@Before
-public void setUp() {
-control = EasyMock.createNiceControl();
-}
-
@Test
public void testRegisteration() throws Exception {
Bus bus = new ExtensionManagerBus();
@@ -61,9 +51,7 @@ public class JettyWebSocketDestinationTest {
EndpointInfo endpoint = new EndpointInfo();
endpoint.setAddress(ENDPOINT_ADDRESS);
endpoint.setName(ENDPOINT_NAME);
-JettyHTTPServerEngine engine =
EasyMock.createMock(JettyHTTPServerEngine.class);
-
-control.replay();
+JettyHTTPServerEngine engine = mock(JettyHTTPServerEngine.class);
TestJettyWebSocketDestination dest = new
TestJettyWebSocketDestination(bus, registry, endpoint, null, engine);
[cxf] branch dependabot/maven/com.puppycrawl.tools-checkstyle-10.12.2 deleted (was 62b438d531)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.puppycrawl.tools-checkstyle-10.12.2 in repository https://gitbox.apache.org/repos/asf/cxf.git was 62b438d531 Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 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: Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364)
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.git The following commit(s) were added to refs/heads/main by this push: new 08b1c6a956 Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364) 08b1c6a956 is described below commit 08b1c6a95618345d3f0f5b788c8f17f7e739c315 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 31 06:43:56 2023 -0400 Bump com.puppycrawl.tools:checkstyle from 10.12.1 to 10.12.2 (#1364) Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.1 to 10.12.2. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.1...checkstyle-10.12.2) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle 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> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9dd682fb5c..3e70ce8b40 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -391,7 +391,7 @@ com.puppycrawl.tools checkstyle -10.12.1 +10.12.2
