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 2019/11/10 18:34:57 UTC
[cxf] branch 3.3.x-fixes updated (4bc53dd -> 310aa9a)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 4bc53dd Fixing pom.xml version (from cherrypick)
new ac1be21 Fixing banned dependencies (jaxb-api)
new 310aa9a 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 | 1 +
systests/spring-boot/pom.xml | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
[cxf] 01/02: Fixing banned dependencies (jaxb-api)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ac1be213e67767f01af5b7077d882ee6f52e5895
Author: reta <dr...@gmail.com>
AuthorDate: Sun Nov 10 13:25:34 2019 -0500
Fixing banned dependencies (jaxb-api)
(cherry picked from commit d5b612c220bab496c3dab1731e56b3fea36c1b07)
# Conflicts:
# systests/spring-boot/pom.xml
---
systests/spring-boot/pom.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml
index e12a979..e1147a1 100644
--- a/systests/spring-boot/pom.xml
+++ b/systests/spring-boot/pom.xml
@@ -72,7 +72,7 @@
</plugin>
</plugins>
</build>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -82,7 +82,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -124,6 +124,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<version>${cxf.spring.boot.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
[cxf] 02/02: 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 310aa9a2c0589c12ba3baa1556da193054e505c6
Author: reta <dr...@gmail.com>
AuthorDate: Sun Nov 10 13:34:01 2019 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index bfa0d76..eaff17f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -45,6 +45,7 @@ M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M aabf37788e571426e70250e7a62c7f4502e4d6e9
M c1b729ea9f0c43e6560099dbc427751fe33ee088
+M d5b612c220bab496c3dab1731e56b3fea36c1b07
M d875ceee917237f5c344df989947aff025d45d4f
M e1b81269089d6e7cb53e949a9fde629d37bce421
M f3e2a52faec1210b1a45eaa36e3812ca03a4969d