diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index cd146b7ead9..18fa3bd1e7c 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -77,7 +77,6 @@ com.sun.activation javax.activation - 1.2.0 org.apache.servicemix.specs diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc index e6494e366bf..a9f60b87e52 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc @@ -302,8 +302,8 @@ setupDefaults() { if [ "x${JAVA_DEBUG_PORT}" = "x" ]; then JAVA_DEBUG_PORT="${DEFAULT_JAVA_DEBUG_PORT}" fi - DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${JAVA_DEBUG_PORT}" - DEFAULT_JAVA_DEBUGS_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:${JAVA_DEBUG_PORT}" + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT}" + DEFAULT_JAVA_DEBUGS_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=${JAVA_DEBUG_PORT}" if [ "x${JAVA_OPTS}" = "x" ]; then JAVA_OPTS="${DEFAULT_JAVA_OPTS}" diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index 1b3257f579f..ede9abb9e47 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -197,10 +197,20 @@ + + jakarta.interceptor + jakarta.interceptor-api + org.hibernate hibernate-osgi ${hibernate.version} + + + javax.interceptor + javax.interceptor-api + + diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 90215795900..a841d698746 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -30,11 +30,11 @@ mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features - mvn:javax.interceptor/javax.interceptor-api/1.2.2 + mvn:jakarta.interceptor/jakarta.interceptor-api/${jakarta.interceptor.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${servicemix-javax-inject.version} - mvn:jakarta.el/jakarta.el-api/3.0.3 - mvn:javax.enterprise/cdi-api/1.2 - mvn:javax.transaction/javax.transaction-api/1.2 + mvn:jakarta.el/jakarta.el-api/${jakarta.el.version} + mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/${jakarta.enterprise.cdi.version} + mvn:javax.transaction/javax.transaction-api/${javax.transaction.version} pax-transx-tm-api @@ -189,7 +189,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version} mvn:org.hibernate.common/hibernate-commons-annotations/${hibernate.common.version} mvn:org.hibernate/hibernate-core/${hibernate.version} - mvn:javax.interceptor/javax.interceptor-api/${javax.interceptor.version} + mvn:jakarta.interceptor/jakarta.interceptor-api/${jakarta.interceptor.version} mvn:org.hibernate/hibernate-osgi/${hibernate.version} osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml index b7592e15193..6276c99fdc3 100644 --- a/assemblies/features/framework/src/main/feature/feature.xml +++ b/assemblies/features/framework/src/main/feature/feature.xml @@ -33,8 +33,8 @@ mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version} mvn:org.fusesource.jansi/jansi/${jansi.version} - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} @@ -60,8 +60,8 @@ mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version} mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version} - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} diff --git a/assemblies/features/specs/src/main/feature/feature.xml b/assemblies/features/specs/src/main/feature/feature.xml index 2dd39d631ee..5dd0d868911 100644 --- a/assemblies/features/specs/src/main/feature/feature.xml +++ b/assemblies/features/specs/src/main/feature/feature.xml @@ -40,7 +40,7 @@ - mvn:com.sun.activation/jakarta.activation/${spec.activation.version} + mvn:com.sun.activation/javax.activation/${spec.activation.version} @@ -111,8 +111,8 @@ - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index e56a8ed9cf0..3860e67facc 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -2372,7 +2372,7 @@ encrypt = admin, manager, viewer jaas mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security57.version} mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${project.version} diff --git a/bom/pom.xml b/bom/pom.xml index 0aeaf3bf5ec..9d0228c67e9 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -292,6 +292,12 @@ org.apache.karaf.features org.apache.karaf.features.core ${project.version} + + + com.sun.activation + jakarta.activation + + org.apache.karaf.features @@ -575,6 +581,12 @@ com.sun.mail javax.mail ${javax.mail.version} + + + javax.activation + activation + + @@ -837,6 +849,16 @@ org.apache.maven maven-plugin-api ${maven.version} + + + javax.annotation + jsr250-api + + + javax.annotation + javax.annotation-api + + org.apache.maven @@ -847,6 +869,16 @@ org.apache.maven maven-core ${maven.version} + + + javax.annotation + javax.annotation-api + + + javax.inject + javax.inject + + org.apache.maven @@ -1169,16 +1201,16 @@ javax.servlet-api ${servlet.spec.version} - - javax.interceptor - javax.interceptor-api - ${javax.interceptor.version} - javax.validation validation-api ${javax.validation.version} + + javax.persistence + javax.persistence-api + ${javax.persistence.version} + org.easymock easymock @@ -1666,9 +1698,14 @@ ${jakarta.activation.version} - javax.annotation - javax.annotation-api - ${javax.annotation.version} + com.sun.activation + javax.activation + ${spec.activation.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.version} jakarta.annotation @@ -1680,6 +1717,27 @@ jsr305 ${jsr305.annotation.version} + + jakarta.el + jakarta.el-api + ${jakarta.el.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.version} + + + jakarta.transaction + jakarta.transaction-api + + + jakarta.xml.soap jakarta.xml.soap-api @@ -1695,15 +1753,31 @@ jakarta.xml.ws-api ${jakarta.jaxws.version} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + jakarta.xml.bind jakarta.xml.bind-api ${jakarta.jaxb.version} + + javax.transaction + javax.transaction-api + ${javax.transaction.version} + org.glassfish.jaxb jaxb-runtime ${glassfish.jaxb.version} + + + com.sun.activation + jakarta.activation + + org.glassfish.jaxb @@ -1801,6 +1875,16 @@ ${jboss.logging.version} + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-aop + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-aspects + ${spring53.version} + org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-beans @@ -1808,7 +1892,12 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-expression + org.apache.servicemix.bundles.spring-context + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-context-indexer ${spring53.version} @@ -1818,17 +1907,17 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-aop + org.apache.servicemix.bundles.spring-core ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-context + org.apache.servicemix.bundles.spring-expression ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-core + org.apache.servicemix.bundles.spring-instrument ${spring53.version} @@ -1838,12 +1927,12 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-tx + org.apache.servicemix.bundles.spring-jms ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-jms + org.apache.servicemix.bundles.spring-messaging ${spring53.version} @@ -1851,6 +1940,148 @@ org.apache.servicemix.bundles.spring-orm ${spring53.version} + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-oxm + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-r2dbc + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-test + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-tx + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-web + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-webflux + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-webmvc + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-websocket + ${spring53.version} + + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-acl + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-aspects + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-cas + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-config + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-core + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-crypto + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-data + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-ldap + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-messaging + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-client + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-core + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-jose + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-resource-server + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-openid + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-remoting + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-rsocket + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-saml2-service-provider + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-taglibs + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-test + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-web + ${spring.security57.version} + + org.apache.servicemix.bundles org.apache.servicemix.bundles.aopalliance diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml index 53836b8eb35..b89bbee948d 100644 --- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml @@ -49,11 +49,31 @@ org.apache.camel camel-core ${camel.version} + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + org.apache.camel camel-core-osgi ${camel.version} + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + org.osgi diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml index af37332976b..103396ccd11 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml @@ -51,7 +51,6 @@ jakarta.enterprise jakarta.enterprise.cdi-api - 2.0.2 diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml index e29d1aae7b6..6bd5bd29348 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml @@ -51,7 +51,6 @@ jakarta.enterprise jakarta.enterprise.cdi-api - 2.0.2 diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml index a015f15991d..b3eb12c2d79 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml @@ -46,12 +46,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml index 25861158929..680292aa992 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml @@ -46,12 +46,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml index 32e0937448f..4088bc905c3 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml @@ -46,12 +46,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml index b3343b04838..7f3777098b0 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml @@ -58,12 +58,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api org.osgi diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml index 4ea8cd588dc..e1deddcb59b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml @@ -58,12 +58,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api org.osgi diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml index df10b37db93..54ff4b4cdad 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml @@ -58,12 +58,10 @@ javax.transaction javax.transaction-api - 1.2 - javax.interceptor - javax.interceptor-api - 1.2.2 + jakarta.interceptor + jakarta.interceptor-api org.osgi diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index cbb99beaeb3..e98f47905a8 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -34,9 +34,8 @@ - javax.ws.rs - javax.ws.rs-api - 2.1 + jakarta.ws.rs + jakarta.ws.rs-api org.apache.karaf.examples diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index 77914ca0ef6..ed959ed36a6 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -39,9 +39,8 @@ - javax.ws.rs - javax.ws.rs-api - 2.1 + jakarta.ws.rs + jakarta.ws.rs-api org.apache.karaf.examples @@ -49,10 +48,20 @@ ${project.version} - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - + jakarta.annotation + jakarta.annotation-api + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + + + javax.annotation + javax.annotation-api + + + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index b5ff6184aad..de17aba08b2 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -46,9 +46,8 @@ - javax.ws.rs - javax.ws.rs-api - 2.1 + jakarta.ws.rs + jakarta.ws.rs-api com.fasterxml.jackson.jaxrs diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 0bc9b678062..e7969e85970 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -55,10 +55,20 @@ org.osgi.service.component.annotations provided + + jakarta.annotation + jakarta.annotation-api + org.apache.cxf cxf-rt-frontend-jaxrs ${cxf.version} + + + javax.annotation + javax.annotation-api + + org.apache.karaf.examples diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index 08b0a06305a..5122bbe1310 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -40,9 +40,8 @@ provided - javax.ws.rs - javax.ws.rs-api - 2.1 + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java index 247774cdc96..4a8018a6c4a 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java @@ -153,7 +153,6 @@ public void installFeatureConfigs(Feature feature) throws IOException, InvalidSy properties.put(CONFIG_KEY, cid.pid); cfg.update(cfgProps); if (storage != null && configCfgStore) { -// ???????????????????? properties.put(FILEINSTALL_FILE_NAME, cfgFile.getAbsoluteFile().toURI().toString()); cfgProps.put(FILEINSTALL_FILE_NAME, cfgFile.getAbsoluteFile().toURI().toString()); } @@ -342,6 +341,7 @@ protected void updateStorage(ConfigId cid, TypedProperties props, boolean append if (storage != null && configCfgStore) { File cfgFile = getConfigFile(cid, jsonFormat); if (!cfgFile.exists()) { + cfgFile.getAbsoluteFile().mkdirs(); File tmpCfgFile = File.createTempFile(cfgFile.getName(), ".tmp", cfgFile.getParentFile()); if (jsonFormat) { Configurations.buildWriter().build(new FileWriter(tmpCfgFile)).writeConfiguration(convertToDict(props)); diff --git a/maven/core/pom.xml b/maven/core/pom.xml index 9cdb3491b4d..b5f7dec2e71 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -71,10 +71,26 @@ org.apache.maven maven-settings-builder + + + javax.inject + javax.inject + + org.apache.maven maven-core + + + javax.annotation + javax.annotation-api + + + javax.inject + javax.inject + + org.apache.felix diff --git a/pom.xml b/pom.xml index 61ee0aaac76..4fa5c4549a2 100644 --- a/pom.xml +++ b/pom.xml @@ -174,14 +174,15 @@ 5.11.0.redhat-630516 1.0.6.fuse-redhat-00006 1.9.5_1 - 0.3.11.1-fuse-redhat-00006 1.7.0.6-fuse-redhat-00006 2.7.7.5-fuse-redhat-00002 9.4 - 1.3.2 1.3.5.redhat-00003 - 3.0.2 - 1.2.2 + 3.0.3.redhat-00002 + 2.0.2.redhat-00004 + 1.0.0.redhat-00002 + 1.2.5.redhat-00002 + 3.0.2.redhat-00008 3.1.6 1.11.12.redhat-00002 1.72 @@ -194,11 +195,13 @@ 5.12.1 1.2.2.redhat-00001 2.3.3.redhat-00001 - 2.3.3 - 2.1.0 - 1.4.2 + 2.3.3.redhat-00001 + 2.1.6.redhat-00001 + 2.1.0.redhat-00001 + 1.4.2.redhat-00001 + 1.2 2.3.3.redhat-00001 - 2.3.3.redhat-00001 + 2.3.7 1.9.4.redhat-00002 1.15.0.redhat-00001 1.22 @@ -211,7 +214,7 @@ 1.2.0.redhat-3 1.6.0.redhat-10 2.9.0 - 2.11.1 + 2.11.1.redhat-00001 2.11.0.redhat-00001 2.1.3.2-fuse-redhat-00002 @@ -348,7 +351,7 @@ 1.0.0 1.1.0 1.2.0 - 1.2.0 + 1.3.0 1.1.4 4.13.5 @@ -365,12 +368,12 @@ 2.0 3.4.2 - 1.7.32.redhat-00001 - 2.19.0 + 1.7.36.redhat-00002 + 2.19.0.redhat-00001 2.9.0 - 1.2.2 - 1.3.5 + 1.2.0.redhat-00001 + 1.3.5.redhat-00003 2.3.2_3 2.1 2.3 @@ -392,7 +395,7 @@ 2.12.2.1-fuse-redhat-00003 2.7.2.3-fuse-redhat-00006 2.7.2.1-fuse-redhat-00006 - 1.6.1.redhat-1 + 1.6.2.redhat-00001 2.2.0.redhat-1 2.0.1.Final-redhat-1 @@ -746,6 +749,12 @@ org.apache.karaf.features org.apache.karaf.features.core ${project.version} + + + com.sun.activation + jakarta.activation + + org.apache.karaf.features @@ -1029,6 +1038,12 @@ com.sun.mail javax.mail ${javax.mail.version} + + + javax.activation + activation + + @@ -1301,6 +1316,16 @@ org.apache.maven maven-core ${maven.version} + + + javax.annotation + javax.annotation-api + + + javax.inject + javax.inject + + org.apache.maven @@ -1623,16 +1648,16 @@ javax.servlet-api ${servlet.spec.version} - - javax.interceptor - javax.interceptor-api - ${javax.interceptor.version} - javax.validation validation-api ${javax.validation.version} + + javax.persistence + javax.persistence-api + ${javax.persistence.version} + org.easymock easymock @@ -2120,9 +2145,9 @@ ${jakarta.activation.version} - javax.annotation - javax.annotation-api - ${javax.annotation.version} + com.sun.activation + javax.activation + ${spec.activation.version} jakarta.annotation @@ -2134,6 +2159,27 @@ jsr305 ${jsr305.annotation.version} + + jakarta.el + jakarta.el-api + ${jakarta.el.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.version} + + + jakarta.transaction + jakarta.transaction-api + + + jakarta.xml.soap jakarta.xml.soap-api @@ -2149,15 +2195,31 @@ jakarta.xml.ws-api ${jakarta.jaxws.version} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + jakarta.xml.bind jakarta.xml.bind-api ${jakarta.jaxb.version} + + javax.transaction + javax.transaction-api + ${javax.transaction.version} + org.glassfish.jaxb jaxb-runtime ${glassfish.jaxb.version} + + + com.sun.activation + jakarta.activation + + org.glassfish.jaxb @@ -2167,7 +2229,7 @@ com.sun.istack istack-commons-runtime - 3.0.10.redhat-00001 + 3.0.12.redhat-00001 @@ -2255,6 +2317,16 @@ ${jboss.logging.version} + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-aop + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-aspects + ${spring53.version} + org.apache.servicemix.bundles org.apache.servicemix.bundles.spring-beans @@ -2262,7 +2334,12 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-expression + org.apache.servicemix.bundles.spring-context + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-context-indexer ${spring53.version} @@ -2272,17 +2349,17 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-aop + org.apache.servicemix.bundles.spring-core ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-context + org.apache.servicemix.bundles.spring-expression ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-core + org.apache.servicemix.bundles.spring-instrument ${spring53.version} @@ -2292,12 +2369,12 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-tx + org.apache.servicemix.bundles.spring-jms ${spring53.version} org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-jms + org.apache.servicemix.bundles.spring-messaging ${spring53.version} @@ -2305,6 +2382,148 @@ org.apache.servicemix.bundles.spring-orm ${spring53.version} + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-oxm + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-r2dbc + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-test + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-tx + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-web + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-webflux + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-webmvc + ${spring53.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-websocket + ${spring53.version} + + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-acl + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-aspects + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-cas + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-config + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-core + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-crypto + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-data + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-ldap + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-messaging + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-client + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-core + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-jose + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-oauth2-resource-server + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-openid + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-remoting + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-rsocket + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-saml2-service-provider + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-taglibs + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-test + ${spring.security57.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.spring-security-web + ${spring.security57.version} + + org.apache.servicemix.bundles org.apache.servicemix.bundles.aopalliance diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 85fe0aed70a..5814a771f2a 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -55,6 +55,10 @@ + + jakarta.inject + jakarta.inject-api + jakarta.annotation jakarta.annotation-api @@ -65,7 +69,7 @@ javax.annotation - jsr250-api + javax.annotation-api @@ -88,8 +92,8 @@ maven-core - org.apache.maven - maven-resolver-provider + javax.inject + javax.inject @@ -134,6 +138,12 @@ org.apache.maven.shared maven-filtering 3.3.0 + + + javax.inject + javax.inject + + org.codehaus.plexus diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index 1a0cf4220de..24f4680f217 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -55,9 +55,19 @@ commons-compress ${commons-compress.version} + + jakarta.annotation + jakarta.annotation-api + org.apache.maven maven-plugin-api + + + javax.annotation + javax.annotation-api + + org.apache.maven.plugin-tools @@ -86,6 +96,10 @@ org.apache.maven maven-resolver-provider + + javax.inject + javax.inject + diff --git a/util/pom.xml b/util/pom.xml index 8640511a438..78f0d909d8a 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -69,10 +69,20 @@ org.apache.karaf.jaas.boot + + jakarta.activation + jakarta.activation-api + com.sun.mail javax.mail test + + + javax.activation + activation + +