diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml index 2ec3d795665..55a1e47d6c7 100644 --- a/osgi/karaf/commands/pom.xml +++ b/osgi/karaf/commands/pom.xml @@ -76,6 +76,7 @@ !org.apache.cxf.karaf.commands, org.apache.karaf.shell*;version="[4,5)", + org.apache.cxf*;version="[4.1.5,4.1.6)", * <_nouses>true diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index ccc1b4b22e1..66ce7dad621 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -22,7 +22,7 @@ mvn:jakarta.servlet/jakarta.servlet-api/6.1.0 - mvn:org.ops4j.pax.web/pax-web-compatibility-servlet/11.0.1 + mvn:org.ops4j.pax.web/pax-web-compatibility-servlet/11.1.0 @@ -30,7 +30,7 @@ mvn:jakarta.activation/jakarta.activation-api/${cxf.jakarta.activation.version} mvn:jakarta.annotation/jakarta.annotation-api/${cxf.jakarta.annotation-api.version} mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.2 - mvn:org.ops4j.pax.web/pax-web-compatibility-jaxb3/11.0.1 + mvn:org.ops4j.pax.web/pax-web-compatibility-jaxb3/11.1.0 mvn:jakarta.xml.ws/jakarta.xml.ws-api/${cxf.jakarta.wsapi.version} mvn:jakarta.ws.rs/jakarta.ws.rs-api/${cxf.jakarta.ws.rs.version} mvn:jakarta.xml.soap/jakarta.xml.soap-api/${cxf.jakarta.soapapi.version} @@ -120,6 +120,8 @@ mvn:org.apache.neethi/neethi/${cxf.neethi.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version} mvn:org.apache.wss4j/wss4j-bindings/${cxf.jakarta.wss4j.version} + + mvn:org.apache.wss4j/wss4j-ws-security-common/${cxf.jakarta.wss4j.version} mvn:org.apache.wss4j/wss4j-bindings/${cxf.jakarta.wss4j.version} mvn:org.apache.wss4j/wss4j-ws-security-dom/${cxf.jakarta.wss4j.version} @@ -610,9 +612,9 @@ mvn:jakarta.management.j2ee/jakarta.management.j2ee-api/1.1.4 - wrap:mvn:org.apache.activemq/artemis-core-client/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-core-client&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=!org.apache.activemq.artemis.core*,org.apache.activemq.artemis.core.config.impl;version=${cxf.activemq.artemis.version},org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} - wrap:mvn:org.apache.activemq/artemis-jms-client/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-jms-client&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} - wrap:mvn:org.apache.activemq/artemis-server/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-server&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=!org.apache.activemq.artemis.spi.core.*,org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} + wrap:mvn:org.apache.artemis/artemis-core-client/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-core-client&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=!org.apache.activemq.artemis.core*,org.apache.activemq.artemis.core.config.impl;version=${cxf.activemq.artemis.version},org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} + wrap:mvn:org.apache.artemis/artemis-jms-client/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-jms-client&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} + wrap:mvn:org.apache.artemis/artemis-server/${cxf.activemq.artemis.version}$Bundle-SymbolicName=artemis-server&Bundle-Version=${cxf.activemq.artemis.version}&Export-Package=!org.apache.activemq.artemis.spi.core.*,org.apache.activemq.artemis*;version=${cxf.activemq.artemis.version} mvn:jakarta.jws/jakarta.jws-api/3.0.0 mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version} @@ -654,7 +656,7 @@ mvn:jakarta.el/jakarta.el-api/6.0.1 - mvn:org.ops4j.pax.web/pax-web-compatibility-el/11.0.1 + mvn:org.ops4j.pax.web/pax-web-compatibility-el/11.1.0 diff --git a/parent/pom.xml b/parent/pom.xml index 5ea05918fb2..342eb09fd41 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -101,12 +101,12 @@ 4.0.1 4.8.25 1.5.1 - 1.17.1 + 1.21.0 2.16.1 2.2.1 - 3.18.0 + 3.20.0 1.2 - 1.13.1 + 1.15.0 10.16.1.1 2.2.0 3.2.6 @@ -119,7 +119,7 @@ 1.0.15 4.0.2 2.0.1 - 33.3.0-jre + 33.5.0-jre 1.0.2 3.0 5.5.0 @@ -189,8 +189,8 @@ 2022.7 3.2.1 [4,5) - 4.1.131.Final - 2.0.69.Final + 4.2.12.Final + 2.0.75.Final 2.0.13 3.2.2 1.59.0 @@ -708,6 +708,7 @@ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) ${cxf.osgi.import}, + org.apache.cxf.*;version="${cxf.tesb.version-range}", * diff --git a/pom.xml b/pom.xml index 09c4035c5fe..9e6bba6e439 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,7 @@ 4.1.5.1 - 4.1.0.5.20260401 - [4.1,4.2) + [4.1.5,4.1.6) [4,5) 4.1.5.1 4.1.5.1 @@ -61,7 +60,7 @@ 2.11.1 4.4.6 4.4.6.20260417 - 5.1.4_1.tesb1 + 5.1.4_1.tesb2 8.0.0 11.1.0.20260420 1.9.21.1_1 @@ -70,7 +69,7 @@ 5.29.3 2.0.2 2.12.2.tesb2_1 - 4.0.4 + 3.0.5 [0,2) diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index 285dff5b4c8..b72bd4ab75c 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -39,7 +39,7 @@ jakarta.servlet*;version="${cxf.osgi.jakarta.servlet.version}", !org.apache.cxf.sts.*, - org.apache.cxf.*, + org.apache.cxf.*;version="${cxf.tesb.version-range}", org.springframework.ldap*;resolution:=optional, org.ehcache*;resolution:=optional;version="${cxf.ehcache.osgi.version}", org.opensaml*;version="${cxf.opensaml.osgi.version}", diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index 791178ffd2a..a1197de09b3 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -38,5 +38,7 @@ xkms-client xkms-war xkms-x509-repo-ldap + xkms-features + xkms-osgi diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml index dede480a24e..4f30894cf39 100644 --- a/tools/validator/pom.xml +++ b/tools/validator/pom.xml @@ -85,4 +85,58 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + versions + validate + + cleanVersions + + + + ${project.version} + + + + + + NONE + + ${cxf.osgi.symbolic.name} + ${cxf.bundle.activation.policy} + The Apache Software Foundation + org.apache + ${cxf.osgi.version.clean} + The Apache Software Foundation + ${cxf.osgi.version.clean} + http://cxf.apache.org + ${cxf.fragment.host} + <_failok>true + <_nouses>true + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + ${cxf.osgi.export} + + ${cxf.osgi.import}, + * + + + ${cxf.osgi.dynamic.import} + + + ${cxf.export.service} + + ${cxf.bundle.activator} + ${cxf.module.name} + + true + + + +