Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Quarkus to 3.2.1.Final and remove workarounds for fixed issues #839

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Bump Quarkus to 3.2.1.Final and remove workarounds for fixed issues #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
871b0e7
Bump Quarkus to 3.2.1.Final
michalvavrik Jul 20, 2023
2dcde73
Revert "Fix calls to methods broken by fabric8 update"
michalvavrik Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ jobs:
check-latest: true
cache: 'maven'
- name: Build with Maven
# TODO: remove 'quarkus.bootstrap.effective-model-builder' property when issue get fixed: https://github.com/quarkusio/quarkus/issues/34787
run: |
mvn -V -B -s .github/mvn-settings.xml verify -Pframework,examples -Dvalidate-format -DskipTests -DskipITs -Dquarkus.bootstrap.effective-model-builder
mvn -V -B -s .github/mvn-settings.xml verify -Pframework,examples -Dvalidate-format -DskipTests -DskipITs
quarkus-main-build:
name: Quarkus main build
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>3.2.0.Final</quarkus.platform.version>
<quarkus.platform.version>3.2.1.Final</quarkus.platform.version>
<exclude.tests.with.tags>quarkus-cli</exclude.tests.with.tags>
<include.tests>**/*IT.java</include.tests>
<exclude.openshift.tests>**/OpenShift*IT.java</exclude.openshift.tests>
Expand Down
27 changes: 3 additions & 24 deletions quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
Expand Down Expand Up @@ -58,7 +55,6 @@
import io.fabric8.kubernetes.client.dsl.ContainerResource;
import io.fabric8.kubernetes.client.dsl.NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable;
import io.fabric8.kubernetes.client.dsl.PodResource;
import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.openshift.api.model.DeploymentConfig;
import io.fabric8.openshift.api.model.ImageStream;
Expand Down Expand Up @@ -962,26 +958,9 @@ private boolean doCreateProject(String projectName) {
}

private List<HasMetadata> loadYaml(String template) {
NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> metadata = loadUsingDarkArtsOfReflection(
client, new ByteArrayInputStream(template.getBytes()));
return metadata.items();
}

/*
* todo replace the only call of this method with client.load(new ByteArrayInputStream(...)
* when https://github.com/quarkusio/quarkus/pull/33767 got released (probably 3.2.0)
* verification: mvn clean install -Pframework \
* && mvn clean verify -Popenshift,examples -pl examples/https/ -Dquarkus.platform.version=999-SNAPSHOT
*/
private NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> loadUsingDarkArtsOfReflection(
OpenShiftClientImpl client, ByteArrayInputStream stream) {
try {
Method method = KubernetesClientImpl.class.getDeclaredMethod("load", InputStream.class);
Object metadata = method.invoke(client, stream);
return (NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata>) metadata;
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load = client
.load(new ByteArrayInputStream(template.getBytes()));
return load.items();
}

private String generateRandomProjectName() {
Expand Down