You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/03/12 15:38:08 UTC
[cxf] 01/03: Update to microprofile.rest.client 1.4.1
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2923c9f6f96bfee85132ba32b3364652d959f9ee
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Mar 11 10:14:56 2020 +0300
Update to microprofile.rest.client 1.4.1
(cherry picked from commit 7971b506283502c26aafb97c0f6e50633f126cdd)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
systests/microprofile/client/weld/pom.xml | 33 ++++++++++++++++++++++++++++---
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d5c3535..b469580 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,7 +161,7 @@
<cxf.lucene.version>4.9.1</cxf.lucene.version>
<cxf.maven.core.version>3.6.2</cxf.maven.core.version>
<cxf.microprofile.config.version>1.1</cxf.microprofile.config.version>
- <cxf.microprofile.rest.client.version>1.4.0</cxf.microprofile.rest.client.version>
+ <cxf.microprofile.rest.client.version>1.4.1</cxf.microprofile.rest.client.version>
<cxf.mina.version>2.0.21</cxf.mina.version>
<cxf.mockito.version>2.28.1</cxf.mockito.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml
index 8629300..39b2d47 100644
--- a/systests/microprofile/client/weld/pom.xml
+++ b/systests/microprofile/client/weld/pom.xml
@@ -92,10 +92,34 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>initialize</phase>
+ <configuration>
+ <portNames>
+ <portName>wiremock.server.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>uk.co.automatictester</groupId>
<artifactId>wiremock-maven-plugin</artifactId>
- <!-- Note, updating to 4.4.1 causes a weird Xalan error when building the distribution -->
- <version>4.4.0</version>
+ <version>6.0.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.tomakehurst</groupId>
+ <artifactId>wiremock</artifactId>
+ <version>2.26.3</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>generate-test-sources</phase>
@@ -104,7 +128,7 @@
</goals>
<configuration>
<dir>${project.build.outputDirectory}</dir>
- <params>${cxf.wiremock.params}</params>
+ <params>--port ${wiremock.server.port}</params>
</configuration>
</execution>
</executions>
@@ -118,6 +142,9 @@
<suiteXmlFiles>
<suiteXmlFile>testng.xml</suiteXmlFile>
</suiteXmlFiles>
+ <systemPropertyVariables>
+ <wiremock.server.port>${wiremock.server.port}</wiremock.server.port>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>