This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit fa812772eb8e952a89b4135483a92a825bcaf066 Author: Andriy Redko <[email protected]> AuthorDate: Fri May 31 19:10:52 2024 -0400 Clean up Apache CXF BOM (removing non-existing artifacts) (cherry picked from commit e91a5107dd9ec8046f17c6570d799d16985476c0) --- bom/pom.xml | 53 +++-------------------------------------------------- parent/pom.xml | 6 ++++++ 2 files changed, 9 insertions(+), 50 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 070676408e..49f9160970 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -89,11 +89,6 @@ <artifactId>cxf-rt-bindings-corba</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-object</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> @@ -114,16 +109,6 @@ <artifactId>cxf-rt-databinding-jaxb</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jibx</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-sdo</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-clustering</artifactId> @@ -259,11 +244,6 @@ <artifactId>cxf-rt-rs-security-oauth2-saml</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-security-xml</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-security-saml</artifactId> @@ -271,17 +251,17 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-security-sso-oidc</artifactId> + <artifactId>cxf-rt-rs-security-sso-oidc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-security-sso-saml</artifactId> + <artifactId>cxf-rt-rs-security-sso-saml</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-security-xml</artifactId> + <artifactId>cxf-rt-rs-security-xml</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -404,11 +384,6 @@ <artifactId>cxf-rt-ws-security</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security-oauth2</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-security</artifactId> @@ -499,8 +474,6 @@ <artifactId>cxf-jaxws-wsdlfirst</artifactId> <version>${project.version}</version> </dependency> - - <dependency> <groupId>org.apache.cxf.benchmark</groupId> <artifactId>cxf-benchmark-base</artifactId> @@ -511,16 +484,6 @@ <artifactId>cxf-benchmark-soapdoclit</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf.karaf</groupId> - <artifactId>apache-cxf</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.karaf</groupId> - <artifactId>cxf-karaf-commands</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf.services.sts</groupId> <artifactId>cxf-services-sts-core</artifactId> @@ -561,16 +524,6 @@ <artifactId>cxf-services-xkms-common</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf.services.xkms</groupId> - <artifactId>cxf-services-xkms-features</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf.services.xkms</groupId> - <artifactId>cxf-services-xkms-osgi</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf.services.xkms</groupId> <artifactId>cxf-services-xkms-service</artifactId> diff --git a/parent/pom.xml b/parent/pom.xml index 1583e490c4..5de3179fcb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1999,6 +1999,12 @@ <artifactId>ehcache</artifactId> <version>${cxf.ehcache3.version}</version> <classifier>jakarta</classifier> + <exclusions> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </dependencyManagement>
