This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit f22df8d3befa8744572eba1e61e9959efff36a86 Author: Alex Heneveld <a...@cloudsoft.io> AuthorDate: Fri Jan 5 10:35:01 2024 +0000 use slightly older version of fabric8 kubernetes which uses slf4j 1.x tried to update slf4j to 2.x but it isn't completely straightforward; instead updated to latest 1.x --- karaf/features/src/main/feature/feature.xml | 1 + pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 26e6bba9eb..1a8a25d66e 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -48,6 +48,7 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> <!-- complementary to above, but split packages; excluded by karaf.features.xml as not needed, confuses things --> <bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/${jakarta.xml.bind-api.version}</bundle> <!-- preferred over servicemix jaxb (identical) --> + <!-- <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle> seems to give compile errors if we include this --> <bundle>mvn:org.slf4j/jul-to-slf4j/${slf4j.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> diff --git a/pom.xml b/pom.xml index 4b8ade52c1..145b682e60 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ <!-- Dependency Versions --> <jclouds.version>2.4.0</jclouds.version> <!-- JCLOUDS_VERSION --> <logback.version>1.2.9</logback.version> - <slf4j.version>1.7.25</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception --> + <slf4j.version>1.7.36</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception; 2.x is released 2023 but does not provide org.slf4j.spi.SLF4JServiceProvider which is used --> <!-- Must match jclouds' version. From jclouds 2.4.0 it is 27 by default but might use any. --> <guava.version>27.1-jre</guava.version> <!-- @@ -185,7 +185,7 @@ <maxmind-db.version>1.2.1</maxmind-db.version> <winrm4j.version>0.12.3</winrm4j.version> <!-- WINRM4J_VERSION --> <felix-osgi-compendium.version>1.4.0</felix-osgi-compendium.version> - <kubernetes-client.version>6.9.2</kubernetes-client.version> + <kubernetes-client.version>6.8.1</kubernetes-client.version> <!-- 6.9 switches to slf4j v2 which has compatibility issues --> <!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version --> <karaf.version>4.3.8</karaf.version>