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.

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

chore: update to Quarkus 3.4.0 #676

Merged
merged 3 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>

<artifactId>quarkus-operator-sdk-annotations</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-operator-sdk-bom</artifactId>
<name>Quarkus - Operator SDK - BOM</name>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bundle-generator/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-bundle-generator-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>

<name>Quarkus - Operator SDK - Bundle Generator - Deployment</name>
Expand Down
2 changes: 1 addition & 1 deletion bundle-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundle-generator/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-bundle-generator-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>

<name>Quarkus - Operator SDK - Bundle Generator - Runtime</name>
Expand Down
2 changes: 1 addition & 1 deletion common-deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-core-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-operator-sdk-deployment</artifactId>
<name>Quarkus - Operator SDK - Core - Deployment</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ public KubernetesDependentResourceConfig configFrom(
return new QuarkusKubernetesDependentResourceConfig(original.namespaces(),
original.labelSelector(),
original.wereNamespacesConfigured(),
original.getResourceDiscriminator(), original.onAddFilter(),
original.createResourceOnlyIfNotExistingWithSSA(), original.getResourceDiscriminator(),
(Boolean) original.useSSA().orElse(null),
original.onAddFilter(),
original.onUpdateFilter(), original.onDeleteFilter(), original.genericFilter());
}
};
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-core-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-operator-sdk</artifactId>
<name>Quarkus - Operator SDK - Core - Runtime</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ public class QuarkusKubernetesDependentResourceConfig<R extends HasMetadata> ext
@RecordableConstructor
public QuarkusKubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector,
boolean configuredNS,
boolean createResourceOnlyIfNotExistingWithSSA,
ResourceDiscriminator<R, ?> resourceDiscriminator,
Boolean useSSA,
OnAddFilter<R> onAddFilter,
OnUpdateFilter<R> onUpdateFilter,
OnDeleteFilter<R> onDeleteFilter,
GenericFilter<R> genericFilter) {
super(namespaces, labelSelector, configuredNS, resourceDiscriminator, onAddFilter, onUpdateFilter, onDeleteFilter,
genericFilter);
super(namespaces, labelSelector, configuredNS, createResourceOnlyIfNotExistingWithSSA, resourceDiscriminator,
useSSA, onAddFilter, onUpdateFilter, onDeleteFilter, genericFilter);
}

// Needed for the recordable constructor
Expand Down Expand Up @@ -69,4 +71,16 @@ public GenericFilter<R> getGenericFilter() {
public boolean getConfiguredNS() {
return wereNamespacesConfigured();
}

// Needed for the recordable constructor
@SuppressWarnings("unused")
public boolean isCreateResourceOnlyIfNotExistingWithSSA() {
return createResourceOnlyIfNotExistingWithSSA();
}

// Needed for the recordable constructor
@SuppressWarnings("unused")
public Boolean isUseSSA() {
return useSSA().orElse(null);
}
}
16 changes: 11 additions & 5 deletions docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -593,11 +593,17 @@ ifndef::no-duration-note[]
[id='duration-note-anchor-{summaryTableId}']
.About the Duration format
====
The format for durations uses the standard `java.time.Duration` format.
You can learn more about it in the link:https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence-[Duration#parse() javadoc].
To write duration values, use the standard `java.time.Duration` format.
See the link:https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)[Duration#parse() javadoc] for more information.

You can also provide duration values starting with a number.
In this case, if the value consists only of a number, the converter treats the value as seconds.
Otherwise, `PT` is implicitly prepended to the value to obtain a standard `java.time.Duration` format.
You can also use a simplified format, starting with a number:

* If the value is only a number, it represents time in seconds.
* If the value is a number followed by `ms`, it represents time in milliseconds.

In other cases, the simplified format is translated to the `java.time.Duration` format for parsing:

* If the value is a number followed by `h`, `m`, or `s`, it is prefixed with `PT`.
* If the value is a number followed by `d`, it is prefixed with `P`.
====
endif::no-duration-note[]
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
<artifactId>quarkus-operator-sdk-integration-tests</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
</parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-parent</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Quarkus - Operator SDK - Parent</name>
<properties>
<quarkus.version>3.2.6.Final</quarkus.version>
<java-operator-sdk.version>4.4.3</java-operator-sdk.version>
<quarkus.version>3.4.0</quarkus.version>
<java-operator-sdk.version>4.5.0-SNAPSHOT</java-operator-sdk.version>
</properties>
<scm>
<connection>:git:git@github.com:quarkiverse/quarkus-operator-sdk.git</connection>
Expand Down
2 changes: 1 addition & 1 deletion samples/exposedapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>quarkus-operator-sdk-samples</artifactId>
<groupId>io.quarkiverse.operatorsdk</groupId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion samples/joke/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-samples</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion samples/mysql-schema/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-samples</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>

<artifactId>quarkus-operator-sdk-samples-mysql-schema</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion samples/pingpong/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-samples</artifactId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>quarkus-operator-sdk-build-parent</artifactId>
<groupId>io.quarkiverse.operatorsdk</groupId>
<version>6.3.3-SNAPSHOT</version>
<version>6.4.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down