Skip to content

Commit 44ff37d

Browse files
metacosmmanusa
authored andcommitted
fix: add missing model jars
1 parent eb89bef commit 44ff37d

File tree

3 files changed

+21
-31
lines changed

3 files changed

+21
-31
lines changed

extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/graal/MiscellaneousSubstitutions.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList;
1616
import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition;
1717
import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList;
18-
import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config;
19-
import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList;
2018
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost;
2119
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList;
2220
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation;
2321
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList;
2422
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate;
2523
import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList;
26-
import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter;
27-
import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList;
28-
import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI;
29-
import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList;
24+
import io.fabric8.openshift.api.model.operator.imageregistry.v1.Config;
25+
import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigList;
26+
import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter;
27+
import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList;
28+
import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI;
29+
import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList;
3030

3131
/**
3232
* Allows the exclusion of the openshift-model-miscellaneous model without breaking the --link-at-build-time check.

integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml

+10-24
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,21 @@
4949
<groupId>io.fabric8</groupId>
5050
<artifactId>kubernetes-model-core</artifactId>
5151
<scope>test</scope>
52-
<exclusions>
53-
<exclusion>
54-
<groupId>javax.annotation</groupId>
55-
<artifactId>javax.annotation-api</artifactId>
56-
</exclusion>
57-
<exclusion>
58-
<groupId>javax.xml.bind</groupId>
59-
<artifactId>jaxb-api</artifactId>
60-
</exclusion>
61-
<exclusion>
62-
<groupId>jakarta.xml.bind</groupId>
63-
<artifactId>jakarta.xml.bind-api</artifactId>
64-
</exclusion>
65-
</exclusions>
52+
</dependency>
53+
<dependency>
54+
<groupId>io.fabric8</groupId>
55+
<artifactId>kubernetes-model-apps</artifactId>
56+
<scope>test</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>io.fabric8</groupId>
60+
<artifactId>openshift-model</artifactId>
61+
<scope>test</scope>
6662
</dependency>
6763
<dependency>
6864
<groupId>io.fabric8</groupId>
6965
<artifactId>knative-model</artifactId>
7066
<scope>test</scope>
71-
<exclusions>
72-
<exclusion>
73-
<groupId>javax.annotation</groupId>
74-
<artifactId>javax.annotation-api</artifactId>
75-
</exclusion>
76-
<exclusion>
77-
<groupId>javax.xml.bind</groupId>
78-
<artifactId>jaxb-api</artifactId>
79-
</exclusion>
80-
</exclusions>
8167
</dependency>
8268
<dependency>
8369
<groupId>com.fasterxml.jackson.dataformat</groupId>

integration-tests/kubernetes/quarkus-standard-way/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>io.fabric8</groupId>
54-
<artifactId>kubernetes-model-core</artifactId>
54+
<artifactId>openshift-model</artifactId>
5555
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>io.fabric8</groupId>
59+
<artifactId>kubernetes-model-core</artifactId>
5660
<exclusions>
5761
<exclusion>
5862
<groupId>javax.annotation</groupId>

0 commit comments

Comments
 (0)