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/07/23 19:06:40 UTC
[cxf] branch 3.6.x-fixes updated (8abf18f930 -> 687100fad7)
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 8abf18f930 Updating WSS4J to 2.4.2 (#1349)
new 1166144105 Bump swagger-ui from 5.1.0 to 5.1.3 (#1345)
new ac5210e61d Bump cxf.netty.version from 4.1.94.Final to 4.1.95.Final (#1351)
new a99701a039 CXF-8866: Get rid of EasyMock in cxf-rt-rs-service-description (#1338)
new 687100fad7 Recording .gitmergeinfo Changes
The 4 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 +++
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 4 ++--
rt/rs/description/pom.xml | 5 +++--
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 26 +++++-----------------
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 26 +++++-----------------
6 files changed, 22 insertions(+), 46 deletions(-)
[cxf] 01/04: Bump swagger-ui from 5.1.0 to 5.1.3 (#1345)
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 1166144105280eb921f917636091979693618a74
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jul 19 13:26:56 2023 -0400
Bump swagger-ui from 5.1.0 to 5.1.3 (#1345)
Bumps [swagger-ui](https://github.com/webjars/swagger-ui) from 5.1.0 to 5.1.3.
- [Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-5.1.0...swagger-ui-5.1.3)
---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 7ae196bbff8a16ea9d9d52999c853e4ea40f4fa8)
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 30d06589d5..2a74b050c5 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
<cxf.jetty10.version>10.0.15</cxf.jetty10.version>
<cxf.netty.version>4.1.94.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>5.1.0</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.1.3</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>9.0.78</cxf.tomcat.version>
<cxf.lucene.version>9.7.0</cxf.lucene.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 39be7b696b..3c4dfba85b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -209,7 +209,7 @@
<cxf.spring.security.version>5.8.4</cxf.spring.security.version>
<cxf.spring.version>5.3.29</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>5.1.0</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.1.3</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.15</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.11</cxf.swagger2.version>
<cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>
[cxf] 03/04: CXF-8866: Get rid of EasyMock in cxf-rt-rs-service-description (#1338)
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 a99701a0395b820df183884d814c70ca3092fa92
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jul 23 14:46:30 2023 -0400
CXF-8866: Get rid of EasyMock in cxf-rt-rs-service-description (#1338)
(cherry picked from commit c2793cbd0ec9b11e82d75646bec95fa7e2dd193e)
---
rt/rs/description/pom.xml | 5 +++--
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 26 +++++-----------------
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 26 +++++-----------------
3 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml
index facab5cf30..844535c77e 100644
--- a/rt/rs/description/pom.xml
+++ b/rt/rs/description/pom.xml
@@ -74,8 +74,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index 2ea3e37898..e1754847b2 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -48,24 +48,14 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class WadlGeneratorJsonTest {
-
- private IMocksControl control;
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- control.makeThreadSafe(true);
- }
-
@Test
public void testWadlInJsonFormat() throws Exception {
ClassResourceInfo cri =
@@ -115,25 +105,21 @@ public class WadlGeneratorJsonTest {
Exchange e = new ExchangeImpl();
e.put(Service.class, new JAXRSServiceImpl(Collections.singletonList(cri)));
m.setExchange(e);
- control.reset();
- ServletDestination d = control.createMock(ServletDestination.class);
+ ServletDestination d = mock(ServletDestination.class);
EndpointInfo epr = new EndpointInfo();
epr.setAddress(baseAddress);
- d.getEndpointInfo();
- EasyMock.expectLastCall().andReturn(epr).anyTimes();
+ when(d.getEndpointInfo()).thenReturn(epr);
Endpoint endpoint = new EndpointImpl(null, null, epr);
e.put(Endpoint.class, endpoint);
e.setDestination(d);
- BindingInfo bi = control.createMock(BindingInfo.class);
+ BindingInfo bi = mock(BindingInfo.class);
epr.setBinding(bi);
- bi.getProperties();
- EasyMock.expectLastCall().andReturn(Collections.emptyMap()).anyTimes();
+ when(bi.getProperties()).thenReturn(Collections.emptyMap());
m.put(Message.REQUEST_URI, pathInfo);
m.put(Message.QUERY_STRING, query);
m.put(Message.HTTP_REQUEST_METHOD, "GET");
- control.replay();
return m;
}
}
\ No newline at end of file
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 610ef03770..b8b777d6a7 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -59,9 +59,6 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.servlet.ServletDestination;
import org.apache.ws.commons.schema.constants.Constants;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -69,17 +66,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class WadlGeneratorTest {
-
- private IMocksControl control;
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- control.makeThreadSafe(true);
- }
-
@Test
public void testNoWadl() {
WadlGenerator wg = new WadlGenerator();
@@ -838,25 +828,21 @@ public class WadlGeneratorTest {
Exchange e = new ExchangeImpl();
e.put(Service.class, new JAXRSServiceImpl(cris));
m.setExchange(e);
- control.reset();
- ServletDestination d = control.createMock(ServletDestination.class);
+ ServletDestination d = mock(ServletDestination.class);
EndpointInfo epr = new EndpointInfo();
epr.setAddress(baseAddress);
- d.getEndpointInfo();
- EasyMock.expectLastCall().andReturn(epr).anyTimes();
+ when(d.getEndpointInfo()).thenReturn(epr);
Endpoint endpoint = new EndpointImpl(null, null, epr);
e.put(Endpoint.class, endpoint);
endpoint.put(ServerProviderFactory.class.getName(), ServerProviderFactory.getInstance());
e.setDestination(d);
- BindingInfo bi = control.createMock(BindingInfo.class);
+ BindingInfo bi = mock(BindingInfo.class);
epr.setBinding(bi);
- bi.getProperties();
- EasyMock.expectLastCall().andReturn(Collections.emptyMap()).anyTimes();
+ when(bi.getProperties()).thenReturn(Collections.emptyMap());
m.put(Message.REQUEST_URI, pathInfo);
m.put(Message.QUERY_STRING, query);
m.put(Message.HTTP_REQUEST_METHOD, "GET");
- control.replay();
return m;
}
[cxf] 02/04: Bump cxf.netty.version from 4.1.94.Final to 4.1.95.Final (#1351)
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 ac5210e61d5a8d40c2ee9a3512f3e2ce3adc7e4a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Jul 21 10:34:11 2023 -0400
Bump cxf.netty.version from 4.1.94.Final to 4.1.95.Final (#1351)
Bumps `cxf.netty.version` from 4.1.94.Final to 4.1.95.Final.
Updates `io.netty:netty-codec-http` from 4.1.94.Final to 4.1.95.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.94.Final...netty-4.1.95.Final)
Updates `io.netty:netty-codec-http2` from 4.1.94.Final to 4.1.95.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.94.Final...netty-4.1.95.Final)
Updates `io.netty:netty-codec-socks` from 4.1.94.Final to 4.1.95.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.94.Final...netty-4.1.95.Final)
Updates `io.netty:netty-handler-proxy` from 4.1.94.Final to 4.1.95.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.94.Final...netty-4.1.95.Final)
---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: io.netty:netty-codec-http2
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: io.netty:netty-codec-socks
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit d9d4fc9fd03ba9646daa7521cd873ec6d5b2906d)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 2a74b050c5..ba6ef3eff5 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<spring.boot.version>2.7.13</spring.boot.version>
<spring.cloud.eureka.version>3.1.4</spring.cloud.eureka.version>
<cxf.jetty10.version>10.0.15</cxf.jetty10.version>
- <cxf.netty.version>4.1.94.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.95.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.1.3</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3c4dfba85b..4f1538731a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,7 +178,7 @@
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.94.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.95.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
[cxf] 04/04: 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 687100fad7c18746da6130c2b04b734b97f7cf52
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jul 23 15:00:52 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 12a60d4349..8f0719ec70 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -389,6 +389,7 @@ M 7636d19f235706912276294ba404f6c64df048ca
M 76e0fdb027da9f1756902f574de59b087a88da4d
M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
M 79da13fc29d7c94da41b7f4510eaceeb725885ab
+M 7ae196bbff8a16ea9d9d52999c853e4ea40f4fa8
M 7aefb697f7b391170bb48faecf2638e6f72ab9b1
M 7c9a063fc4e300e9787e19f42b86a9b7fdeda82a
M 7dc87bce5436a7aee3899c2bc67629cc56fc4623
@@ -487,6 +488,7 @@ M b1a512265c4a646912ec057eff24eb269e7bfe26
M b1c647659ad5df3c21e83b670fb7ea0ff3dbe889
M b207c718e84bed8120bb114f1d79f575094c3a14
M b2ee30f1728dba63ebf27b2bbae2836d633ccb42
+M b3d51944942ce2a63ea7f6f05980ab9164d2a79e
M b49846c8c4275fe7758449e45e473c1a1ab3bdd6
M b4f5181ac1fddaf0276b4564e4cf6e9f6140bbd0
M b546325057f0baac221d0f2a535ef1ee8c0956f7
@@ -557,6 +559,7 @@ M d849512da6499d00e3e84eb60733a0343a473b44
M d906a253018c37b36621973a0f4c8b4322cbac64
M d9506070f73019bf4430e8c36287928c7efbf731
M d9bb99deb7dc23de7986ef7b95c54aaec90316be
+M d9d4fc9fd03ba9646daa7521cd873ec6d5b2906d
M da7fb369ac1be1b5b59c9c121383cd4ac2ebb91d
M db80012a672d2049318a11e4443ab8ed4cf7c885
M dc5e818f5a8387e7009bc4471b5a032428cfb3cc