commit 337800def761af49af3dc01f54519e3ff1bd7272 from: Chaz Kettleson date: Mon Apr 21 15:43:35 2025 UTC build: centralize karaf feature versions commit - 7845f77cd1ad5d7574cb221d25eac0c0d8585f6a commit + 337800def761af49af3dc01f54519e3ff1bd7272 blob - cc4f8c7b7a14d50c8acad9cdf919d9dfe4ea165d blob + 95b64ec7c94b32f54ec53925c35be7d6181f07d1 --- gradle/karaf.gradle +++ gradle/karaf.gradle @@ -42,11 +42,11 @@ dependencies { karaf { features { xsdVersion = '1.6.0' - repository 'mvn:org.keycloak/keycloak-osgi-features/18.0.2/xml/features' - repository 'mvn:io.hawt/hawtio-karaf/2.17.7/xml/features' - repository 'mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.features/2.0.2/xml' - repository 'mvn:org.apache.camel.karaf/apache-camel/4.8.1/xml/features' - repository 'mvn:org.apache.cxf.karaf/apache-cxf/3.6.5/xml/features' + repository "mvn:${libs.apache.karaf.feature.keycloak.get().toString().replace(':', '/')}/xml/features" + repository "mvn:${libs.apache.karaf.feature.hawtio.get().toString().replace(':', '/')}/xml/features" + repository "mvn:${libs.apache.karaf.feature.aries.get().toString().replace(':', '/')}/xml" + repository "mvn:${libs.apache.karaf.feature.camel.get().toString().replace(':', "/")}/xml/features" + repository "mvn:${libs.apache.karaf.feature.cxf.get().toString().replace(':', "/")}/xml/features" feature { name = project.name description = project.description blob - a140f61cc681ac51b052eed6a3aa2f941f1f98c7 blob + d32ba6518d6addedf8e50399ab3aa45c64293dc2 --- gradle/libs.versions.toml +++ gradle/libs.versions.toml @@ -15,7 +15,7 @@ [versions] auto-service = '1.1.1' -apache-aries-jaxrs-shiro = '2.0.2' +apache-aries-jaxrs = '2.0.2' apache-felix-configadmin = '1.9.26' apache-felix-eventadmin = '1.6.4' apache-felix-fileinstall = '3.7.4' @@ -26,6 +26,7 @@ apache-felix-gogo-runtime = '1.1.4' apache-felix-metatype = '1.2.4' apache-felix-scr = '2.2.12' apache-karaf = '4.4.7' +camel = '4.10.3' checkstyle = '10.21.4' commons-io = '2.18.0' cxf = '3.6.6' @@ -64,9 +65,10 @@ javax-ws-rs-api = '2.1.1' jfiglet = '0.0.9' jsr305 = '3.0.2' junit-jupiter = '5.11.4' -okhttp3 = '4.12.0' +keycloak = '18.0.2' lombok = '1.18.36' maven-exec = '4.0.0' +okhttp3 = '4.12.0' osgi-annotation = '2.0.0' osgi-cmpn = '7.0.0' osgi-core = '8.0.0' @@ -87,7 +89,7 @@ swagger-ui = '4.1.2' [libraries] autoservice = { module = 'com.google.auto.service:auto-service', version.ref = 'auto-service' } autoservice-annotations = { module = 'com.google.auto.service:auto-service-annotations', version.ref = 'auto-service' } -apache-aries-jaxrs-shiro-authc = { module = 'org.apache.aries.jax.rs:org.apache.aries.jax.rs.shiro.authc', version.ref = 'apache-aries-jaxrs-shiro' } +apache-aries-jaxrs-shiro-authc = { module = 'org.apache.aries.jax.rs:org.apache.aries.jax.rs.shiro.authc', version.ref = 'apache-aries-jaxrs' } apache-felix-configadmin = { module = 'org.apache.felix:org.apache.felix.configadmin', version.ref = 'apache-felix-configadmin' } apache-felix-eventadmin = { module = 'org.apache.felix:org.apache.felix.eventadmin', version.ref = 'apache-felix-eventadmin' } apache-felix-fileinstall = { module = 'org.apache.felix:org.apache.felix.fileinstall', version.ref = 'apache-felix-fileinstall' } @@ -98,6 +100,11 @@ apache-felix-gogo-runtime = { module = 'org.apache.fel apache-felix-metatype = { module = 'org.apache.felix:org.apache.felix.metatype', version.ref = 'apache-felix-metatype' } apache-felix-scr = { module = 'org.apache.felix:org.apache.felix.scr', version.ref = 'apache-felix-scr' } apache-karaf = { module = 'org.apache.karaf:apache-karaf', version.ref = 'apache-karaf' } +apache-karaf-feature-aries = { module = 'org.apache.aries.jax.rs:org.apache.aries.jax.rs.features', version.ref = 'apache-aries-jaxrs' } +apache-karaf-feature-camel = { module = 'org.apache.camel.karaf:apache-camel', version.ref = 'camel' } +apache-karaf-feature-cxf = { module = 'org.apache.cxf.karaf:apache-cxf', version.ref = 'cxf' } +apache-karaf-feature-keycloak = { module = 'org.keycloak:keycloak-osgi-features', version.ref = 'keycloak' } +apache-karaf-feature-hawtio = { module = 'io.hawt:hawtio-karaf', version.ref = 'hawtio' } apache-karaf-jaas-config = { module = 'org.apache.karaf.jaas:org.apache.karaf.jaas.config', version.ref = 'apache-karaf' } apache-karaf-shell-core = { module = 'org.apache.karaf.shell:org.apache.karaf.shell.core', version.ref = 'apache-karaf' } apache-karaf-webconsole-console = { module = 'org.apache.karaf.webconsole:org.apache.karaf.webconsole.console', version.ref = 'apache-karaf' } @@ -162,7 +169,3 @@ spotbugs = { module = 'com.github.spotbugs:spotbugs', swagger-annotations = { module = 'io.swagger.core.v3:swagger-annotations', version.ref = 'swagger' } swagger-models = { module = 'io.swagger.core.v3:swagger-models', version.ref = 'swagger' } swagger-ui = { module = 'org.webjars:swagger-ui', version.ref = 'swagger-ui' } - -[bundles] - -[plugins]