[cxf] branch 3.3.x-fixes updated (f0c9a7c -> 55d5b1a)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.3.x-fixes updated (f0c9a7c -> 55d5b1a)

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from f0c9a7c  3.3.6 release notes
     new 75553f8  cxf-systests-microprofile-weld: rollback wiremock-maven-plugin version
     new 55d5b1a  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 ++
 systests/microprofile/client/weld/pom.xml | 10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: cxf-systests-microprofile-weld: rollback wiremock-maven-plugin version

coheigea
Administrator
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 75553f8ba7a83b4391044ff7db8d2f5e05bcbc2a
Author: Alexey Markevich <[hidden email]>
AuthorDate: Wed Mar 25 10:59:29 2020 +0300

    cxf-systests-microprofile-weld: rollback wiremock-maven-plugin version
   
    (cherry picked from commit dd976dd8731b31b63deb2e60f33db3c77ff1bd09)
---
 systests/microprofile/client/weld/pom.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml
index 39b2d47..a95757c 100644
--- a/systests/microprofile/client/weld/pom.xml
+++ b/systests/microprofile/client/weld/pom.xml
@@ -112,14 +112,8 @@
             <plugin>
                 <groupId>uk.co.automatictester</groupId>
                 <artifactId>wiremock-maven-plugin</artifactId>
-                <version>6.0.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.github.tomakehurst</groupId>
-                        <artifactId>wiremock</artifactId>
-                        <version>2.26.3</version>
-                    </dependency>
-                </dependencies>
+                <!-- Note, updating to 4.4.1 causes a weird Xalan error when building the distribution -->
+                <version>4.4.0</version>
                 <executions>
                     <execution>
                         <phase>generate-test-sources</phase>

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Recording .gitmergeinfo Changes

coheigea
Administrator
In reply to this post by coheigea
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 55d5b1abf6dff2056289a0433de828c49f25afcc
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Mar 25 10:00:52 2020 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7381b2e..7e5c477 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -23,6 +23,7 @@ B 180fbbbd5571840b5f7a09ab7c0ce59605edd346
 B 1bd346333d234ca3601274550d5438c41f4c38f4
 B 1c55f929bd90a5a50530b5eaf22216c93ce3f2f9
 B 1c7ddfd6992a69db48b04e57bb04749bff9954b0
+B 1cf4fed546904a4a2560f53a2a2391d834b4026c
 B 1e01eef91b69706c55874d8df5e14a555d11c91a
 B 1e3eb7b3edf841d00a284d891b3cee76b64f4b89
 B 1ea897a6e322a434c04ede380517b9b1057b5a5d
@@ -109,6 +110,7 @@ B 9be0ff566caa784807bd89e7c6996a4405ac59d7
 B 9c48667915c34d2e8960d9f11be5b6b7d824ff24
 B 9d97e0d5b7f4e0ed3ebf531b389b38f6f3c111ed
 B 9fd3ec99d73449779915279cd8bdabe484c29fda
+B a207359e74b2f664dbd78855e7e49e0efe3972b8
 B a276fd2cfd6e78326cda060779d9d8568e796313
 B a44960c899ed754f2192fcc62b4320b6bbb4b184
 B a50d2d81dd7d620061ac21b6df7943ad5c6c92cc