Skip to content

Commit 79f3f39

Browse files
manusamanusa
committed
fix: karaf works again
Signed-off-by: Marc Nuri <[email protected]>
1 parent 4fda42a commit 79f3f39

File tree

8 files changed

+25
-44
lines changed

8 files changed

+25
-44
lines changed

‎.github/workflows/integration-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
uses: manusa/[email protected]
2020
with:
2121
oc version: ${{ matrix.openshift }}
22-
- name: Setup Java 21
22+
- name: Setup Java 17
2323
uses: actions/setup-java@v3
2424
with:
25-
java-version: 21
25+
java-version: 17
2626
distribution: temurin
2727
- name: Install and Run Integration Tests
2828
run: mvn -B clean verify

‎exec/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<groupId>io.fabric8</groupId>
2323
<artifactId>knative-client</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>commons-codec</groupId>
27-
<artifactId>commons-codec</artifactId>
28-
</dependency>
2925
<dependency>
3026
<groupId>org.apache.commons</groupId>
3127
<artifactId>commons-compress</artifactId>

‎karaf/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@
1515
<packaging>bundle</packaging>
1616

1717
<properties>
18-
<kubernetes-client.bundle.version>${kubernetes-client.version}</kubernetes-client.bundle.version>
19-
<jackson.bundle.version>2.13.0</jackson.bundle.version>
2018
<jsr305.bundle.version>3.0.2</jsr305.bundle.version>
21-
<snakeyaml.bundle.version>1.32</snakeyaml.bundle.version>
2219
<zjsonpatch.bundle.version>0.3.0</zjsonpatch.bundle.version>
2320
<generex.bundle.version>1.0.2_1</generex.bundle.version>
2421
<automaton.bundle.version>1.11-8_1</automaton.bundle.version>
2522
<conscrypt-openjdk.bundle.version>1.4.2_1</conscrypt-openjdk.bundle.version>
26-
<okhttp.bundle.version>3.12.1_1</okhttp.bundle.version>
27-
<okio.bundle.version>1.15.0_1</okio.bundle.version>
2823
</properties>
2924

3025
<dependencies>
26+
<dependency>
27+
<groupId>io.fabric8</groupId>
28+
<artifactId>kubernetes-httpclient-jdk</artifactId>
29+
</dependency>
3130
<dependency>
3231
<groupId>io.fabric8</groupId>
3332
<artifactId>openshift-client</artifactId>
@@ -115,11 +114,10 @@
115114
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.bundle.version}</bundle>
116115
<bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson.bundle.version}</bundle>
117116
<bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml.bundle.version}</bundle>
117+
<bundle dependency='true'>mvn:org.snakeyaml/snakeyaml-engine/${snakeyaml.version}</bundle>
118118
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/${generex.bundle.version}</bundle>
119119
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/${automaton.bundle.version}</bundle>
120120
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.conscrypt-openjdk/${conscrypt-openjdk.bundle.version}</bundle>
121-
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
122-
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
123121
<bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.0</bundle>
124122
<bundle dependency='true'>mvn:org.ow2.asm/asm/8.0.1</bundle>
125123
<bundle dependency='true'>mvn:org.ow2.asm/asm-analysis/8.0.1</bundle>
@@ -145,9 +143,10 @@
145143
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-node/${kubernetes-client.bundle.version}</bundle>
146144
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-metrics/${kubernetes-client.bundle.version}</bundle>
147145
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-policy/${kubernetes-client.bundle.version}</bundle>
146+
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-resource/${kubernetes-client.bundle.version}</bundle>
148147
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-scheduling/${kubernetes-client.bundle.version}</bundle>
149148
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model-storageclass/${kubernetes-client.bundle.version}</bundle>
150-
<bundle dependency='true'>mvn:io.fabric8/kubernetes-httpclient-okhttp/${kubernetes-client.bundle.version}/jar/bundle</bundle>
149+
<bundle dependency='true'>mvn:io.fabric8/kubernetes-httpclient-jdk/${kubernetes-client.bundle.version}/jar/bundle</bundle>
151150
<bundle dependency='true'>mvn:io.fabric8/kubernetes-client/${kubernetes-client.bundle.version}/jar/bundle</bundle>
152151
<bundle dependency='true'>mvn:io.fabric8/kubernetes-client-api/${kubernetes-client.bundle.version}/jar/bundle</bundle>
153152

‎mock-crd/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<groupId>io.fabric8</groupId>
1919
<artifactId>openshift-client</artifactId>
2020
</dependency>
21-
<dependency>
22-
<groupId>commons-codec</groupId>
23-
<artifactId>commons-codec</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>org.apache.commons</groupId>
2723
<artifactId>commons-compress</artifactId>

‎other/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<groupId>io.fabric8</groupId>
1919
<artifactId>openshift-client</artifactId>
2020
</dependency>
21-
<dependency>
22-
<groupId>commons-codec</groupId>
23-
<artifactId>commons-codec</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>org.apache.commons</groupId>
2723
<artifactId>commons-compress</artifactId>

‎pom.xml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
<apache.maven.maven-compiler-plugin.version>3.8.1</apache.maven.maven-compiler-plugin.version>
1717
<apache.maven.maven-assembly-plugin.version>3.1.1</apache.maven.maven-assembly-plugin.version>
1818
<apache.maven.maven-surefire-plugin.version>3.0.0-M5</apache.maven.maven-surefire-plugin.version>
19-
<apache.commons.commons-lang3.version>3.9</apache.commons.commons-lang3.version>
20-
<apache.commons.commons-codec.version>1.13</apache.commons.commons-codec.version>
21-
<apache.commons.commons-compress.version>1.21</apache.commons.commons-compress.version>
19+
<apache.commons.commons-compress.version>1.27.1</apache.commons.commons-compress.version>
20+
<jackson.bundle.version>2.17.1</jackson.bundle.version>
2221
<kubernetes-client.version>6.13.4</kubernetes-client.version>
23-
<karaf.version>4.4.1</karaf.version>
22+
<kubernetes-client.bundle.version>${kubernetes-client.version}</kubernetes-client.bundle.version>
23+
<karaf.version>4.4.6</karaf.version>
24+
<slf4j.version>1.7.36</slf4j.version>
25+
<snakeyaml.version>2.8</snakeyaml.version>
26+
<snakeyaml.bundle.version>2.2</snakeyaml.bundle.version>
2427
<junit.version>5.5.1</junit.version>
2528
<hamcrest.version>2.0.0.0</hamcrest.version>
2629
<assertj.version>3.17.0</assertj.version>
@@ -50,21 +53,16 @@
5053
<artifactId>knative-client</artifactId>
5154
<version>${kubernetes-client.version}</version>
5255
</dependency>
53-
<dependency>
54-
<groupId>org.apache.commons</groupId>
55-
<artifactId>commons-lang3</artifactId>
56-
<version>${apache.commons.commons-lang3.version}</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>commons-codec</groupId>
60-
<artifactId>commons-codec</artifactId>
61-
<version>${apache.commons.commons-codec.version}</version>
62-
</dependency>
6356
<dependency>
6457
<groupId>org.apache.commons</groupId>
6558
<artifactId>commons-compress</artifactId>
6659
<version>${apache.commons.commons-compress.version}</version>
6760
</dependency>
61+
<dependency>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-simple</artifactId>
64+
<version>${slf4j.version}</version>
65+
</dependency>
6866
<dependency>
6967
<groupId>org.junit.jupiter</groupId>
7068
<artifactId>junit-jupiter</artifactId>

‎run/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
<dependencies>
1717
<dependency>
18-
<groupId>io.fabric8</groupId>
19-
<artifactId>openshift-client</artifactId>
18+
<groupId>org.slf4j</groupId>
19+
<artifactId>slf4j-simple</artifactId>
2020
</dependency>
2121
<dependency>
22-
<groupId>commons-codec</groupId>
23-
<artifactId>commons-codec</artifactId>
22+
<groupId>io.fabric8</groupId>
23+
<artifactId>openshift-client</artifactId>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.apache.commons</groupId>

‎upload/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<groupId>io.fabric8</groupId>
1919
<artifactId>openshift-client</artifactId>
2020
</dependency>
21-
<dependency>
22-
<groupId>commons-codec</groupId>
23-
<artifactId>commons-codec</artifactId>
24-
</dependency>
2521
<dependency>
2622
<groupId>org.apache.commons</groupId>
2723
<artifactId>commons-compress</artifactId>

0 commit comments

Comments
 (0)