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 2021/04/02 16:55:55 UTC

[cxf] branch 3.3.x-fixes updated (1049922 -> 4477d9dd)

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 1049922  Update to Netty 4.1.63 (Regression fix)
     new 3014cf3  Fixing the enforcer issues (banned dependencies)
     new 26fb3b0  Fixing the enforcer issues (banned dependencies) for distribution/javadoc
     new 4477d9dd 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 +
 distribution/javadoc/pom.xml    | 10 ++++++++++
 rt/rs/extensions/search/pom.xml | 12 +++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

[cxf] 01/03: Fixing the enforcer issues (banned dependencies)

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 3014cf392450329eea1bf1dd012258651da5b455
Author: reta <dr...@gmail.com>
AuthorDate: Mon Mar 29 20:37:22 2021 -0400

    Fixing the enforcer issues (banned dependencies)
    
    (cherry picked from commit 061104df8a9435ea618b1cba9f78b76793a7db57)
---
 rt/rs/extensions/search/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index ff2136e..ee61d01 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -83,6 +83,16 @@
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
            <groupId>org.apache.hbase</groupId>
@@ -103,7 +113,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>                
+                    <artifactId>poi-ooxml</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>

[cxf] 03/03: 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 4477d9dd1ecfadc13495f5c7fad42f9043a26d17
Author: reta <dr...@gmail.com>
AuthorDate: Fri Apr 2 12:55:11 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7741a7e..ba899ad 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -639,6 +639,7 @@ M 02de4c435f4de72fc93291bebd953dc11d53c02d
 M 0320ad320ba88a123a5296a8060d3ac1794009f6
 M 043794e29cc5ec5435787e266d7dad6ff762018e
 M 04fe61b2a9931d23eaad336192fe2c3dc429c2aa
+M 061104df8a9435ea618b1cba9f78b76793a7db57
 M 067f1afd5e29c0b6601a6df0e44862f52e548476
 M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
 M 0b69090f97e262d8c107d82781dcba49fa15626d

[cxf] 02/03: Fixing the enforcer issues (banned dependencies) for distribution/javadoc

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 26fb3b066912cbedcb4df538a5924d454f792c21
Author: reta <dr...@gmail.com>
AuthorDate: Tue Mar 30 20:12:26 2021 -0400

    Fixing the enforcer issues (banned dependencies) for distribution/javadoc
    
    (cherry picked from commit cd3dcb4fd06b47bd206e364c6a0d74fd22c10450)
    (cherry picked from commit 42283211f278628244234c4589cee85b9ae24e78)
---
 distribution/javadoc/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 7579f4f..7c32e30a 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -377,6 +377,16 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>