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

3.7.1 backports 2 #38484

Merged
merged 19 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
de8cf2e
Bump com.gradle.enterprise from 3.16.1 to 3.16.2 in /devtools/gradle
dependabot[bot] Jan 26, 2024
ebafe47
Bump testcontainers.version from 1.19.3 to 1.19.4
dependabot[bot] Jan 26, 2024
548d3a1
Store ConfigItem Javadocs in jdp files without timestamps
yurloc Jan 26, 2024
d346228
Align Panache's jpamodelgen version on the main Hibernate ORM version…
yrodiere Jan 26, 2024
00a9376
Remove explicit versions for Panache's uses of jpamodelgen
yrodiere Jan 26, 2024
2a88fc1
Fix static JPA metamodel generated for Panache classes
yrodiere Jan 26, 2024
19d9dfe
Test jpamodelgen in Quarkus applications
yrodiere Jan 26, 2024
1bf880f
Bump org.jboss.resteasy.spring:resteasy-spring-web
dependabot[bot] Jan 26, 2024
d641e4f
feat: add resolve names annotation to OpenShift Deploymnets
iocanel Jan 26, 2024
7bd8925
Upgrade to Mutiny 2.5.6
jponge Jan 28, 2024
f5305d2
#38445 append label instead of replacing whole URI
troosan Jan 29, 2024
3a24cbc
Fix quarkus.hibernate-search-orm.elasticsearch.version-check.enabled …
yrodiere Jan 29, 2024
78d9686
Replace {project-name} attribute in document title for downstream
gsmet Jan 26, 2024
b4be787
RestEasy Reactive sends SameSite cookie param with wrong case
stianst Jan 30, 2024
9638a15
Ignore annotation process warning when restarting dev mode
gsmet Jan 30, 2024
1c8c3a8
Scheduler: fix usage of some Quartz int config properties
mkouba Jan 30, 2024
9947e46
feat(oidc-client): allow forcing the oidc client filter to get new to…
lordvlad Jan 23, 2024
3fb5ee6
Avoid dots in config doc ids as it's causing issues for downstream
gsmet Jan 26, 2024
7e45196
MySQL Connector 8.3
jmartisk Jan 30, 2024
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 .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ updates:
# JDBC Drivers
- dependency-name: org.postgresql:postgresql
- dependency-name: org.mariadb.jdbc:mariadb-java-client
- dependency-name: mysql:mysql-connector-java
- dependency-name: com.mysql:mysql-connector-j
- dependency-name: org.apache.derby:*
- dependency-name: com.ibm.db2:jcc
# Kafka
Expand Down
8 changes: 4 additions & 4 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<javax.inject.version>1</javax.inject.version>
<parsson.version>1.1.5</parsson.version>
<resteasy-microprofile.version>2.1.5.Final</resteasy-microprofile.version>
<resteasy-spring-web.version>3.1.0.Final</resteasy-spring-web.version>
<resteasy-spring-web.version>3.1.1.Final</resteasy-spring-web.version>
<resteasy.version>6.2.7.Final</resteasy.version>
<opentracing.version>0.33.0</opentracing.version>
<opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
Expand Down Expand Up @@ -130,7 +130,7 @@
<h2.version>2.2.224</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
<postgresql-jdbc.version>42.7.1</postgresql-jdbc.version>
<mariadb-jdbc.version>3.3.2</mariadb-jdbc.version>
<mysql-jdbc.version>8.0.33</mysql-jdbc.version>
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
<mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
<adal4j.version>1.6.7</adal4j.version>
<oracle-jdbc.version>23.3.0.23.09</oracle-jdbc.version>
Expand All @@ -148,7 +148,7 @@
<brotli4j.version>1.12.0</brotli4j.version>
<reactive-streams.version>1.0.4</reactive-streams.version>
<jboss-logging.version>3.5.3.Final</jboss-logging.version>
<mutiny.version>2.5.5</mutiny.version>
<mutiny.version>2.5.6</mutiny.version>
<kafka3.version>3.6.1</kafka3.version>
<lz4.version>1.8.0</lz4.version> <!-- dependency of the kafka-clients that could be overridden by other imported BOMs in the platform -->
<snappy.version>1.1.10.5</snappy.version>
Expand Down Expand Up @@ -207,7 +207,7 @@
<avro.version>1.11.3</avro.version>
<apicurio-registry.version>2.5.8.Final</apicurio-registry.version>
<apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
<testcontainers.version>1.19.3</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
<testcontainers.version>1.19.4</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
<docker-java.version>3.3.4</docker-java.version> <!-- must be the version Testcontainers use -->
<!-- Check the compatibility matrix (https://github.com/opensearch-project/opensearch-testcontainers) before upgrading: -->
<opensearch-testcontainers.version>2.0.0</opensearch-testcontainers.version>
Expand Down
6 changes: 4 additions & 2 deletions build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@
<!-- MicroProfile TCK versions used to be defined here but have moved to the concrete tck modules -->

<!-- Panache needs to run the hibernate-jpamodelgen annotation processor,
and unfortunately annotation processors are not covered by dependency management -->
<hibernate-orm.version>6.4.0.Final</hibernate-orm.version>
but version 6.3+ leads to issues in applications that use it too:
https://github.com/quarkusio/quarkus/issues/38378
As a workaround, we generate the static metamodel of Panache using an older version of jpamodelgen. -->
<hibernate-orm.jpamodelgen.for-panache.version>6.2.22.Final</hibernate-orm.jpamodelgen.for-panache.version>
<!-- Antlr 4 is used by the PanacheQL parser but also needs to match the requirements of Hibernate ORM 6.x-->
<antlr.version>4.13.0</antlr.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class JavaCompilationProvider implements CompilationProvider {
// -parameters is used to generate metadata for reflection on method parameters
// this is useful when people using debuggers against their hot-reloaded app
private static final Set<String> COMPILER_OPTIONS = Set.of("-g", "-parameters");
private static final Set<String> IGNORE_NAMESPACES = Set.of("org.osgi");
private static final Set<String> IGNORE_NAMESPACES = Set.of("org.osgi", "Annotation processing is enabled because");

private static final String PROVIDER_KEY = "java";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ private void writeJavadocProperties(final TypeElement clazz, final Properties ja
rbn,
clazz);
try (Writer writer = file.openWriter()) {
javadocProps.store(writer, Constants.EMPTY);
PropertyUtils.store(javadocProps, writer);
}
} catch (IOException e) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Failed to persist resource " + rbn + ": " + e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ default String getAnchor(String string) {

// Apostrophes.
string = string.replaceAll("([a-z])'s([^a-z])", "$1s$2");
// Allow only letters, -, _, .
string = string.replaceAll("[^\\w-_\\.]", "-").replaceAll("-{2,}", "-");
// Allow only letters, -, _
string = string.replaceAll("[^\\w-_]", "-").replaceAll("-{2,}", "-");
// Get rid of any - at the start and end.
string = string.replaceAll("-+$", "").replaceAll("^-+", "");

Expand Down
2 changes: 1 addition & 1 deletion devtools/gradle/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.gradle.enterprise") version "3.16.1"
id("com.gradle.enterprise") version "3.16.2"
}

gradleEnterprise {
Expand Down
6 changes: 3 additions & 3 deletions docs/src/main/asciidoc/build-analytics.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -166,19 +166,19 @@ mvn clean install -Dquarkus.analytics.disabled=true
|===
| Configuration property | Type | Default

| [[build-analytics.quarkus.analytics.disabled]]`link:#build-analytics.quarkus.analytics.disabled[quarkus.analytics.disabled]`
| [[build-analytics-quarkus-analytics-disabled]]`link:#build-analytics-quarkus-analytics-disabled[quarkus.analytics.disabled]`

Values can be `true` or `false`.

Setting this property to `true` will disable the collection of analytics data on that specific project regardless of any other configuration.
| boolean
| false
| [[build-analytics.quarkus.analytics.uri.base]]`link:#build-analytics.quarkus.analytics.uri.base[quarkus.analytics.uri.base]`
| [[build-analytics-quarkus-analytics-uri-base]]`link:#build-analytics.quarkus-analytics-uri-base[quarkus.analytics.uri.base]`

Base URL of the analytics service. This is were all the data is sent to.
| String
| "https://api.segment.io/"
| [[build-analytics.quarkus.analytics.timeout]]`link:#build-analytics.quarkus.analytics.timeout[quarkus.analytics.timeout]`
| [[build-analytics-quarkus-analytics-timeout]]`link:#build-analytics-quarkus-analytics-timeout[quarkus.analytics.timeout]`

Value in milliseconds for the timeout of the HTTP request to submit the analytics service.
| int
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/databases-dev-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ In that case, you will need to stop and remove these containers manually.
If you want to reuse containers for some Quarkus applications but not all of them,
or some Dev Services but not all of them,
you can disable this feature for a specific Dev Service by setting the configuration property
xref:databases-dev-services.adoc#quarkus-datasource-config-group-dev-services-build-time-config_quarkus.datasource.devservices.reuse[`quarkus.datasource.devservices.reuse`/`quarkus.datasource."datasource-name".devservices.reuse`]
xref:databases-dev-services.adoc#quarkus-datasource-config-group-dev-services-build-time-config_quarkus-datasource-devservices-reuse[`quarkus.datasource.devservices.reuse`/`quarkus.datasource."datasource-name".devservices.reuse`]
to `false`.

== Mapping volumes into Dev Services for Database
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/datasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ and pull requests should be submitted there:
https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
////
[id="datasources"]
= Configure data sources in Quarkus
= Configure data sources in {project-name}
include::_attributes.adoc[]
:diataxis-type: reference
:categories: data,getting-started,reactive
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/deploying-to-kubernetes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ You can provide the arguments that will be used by the Kubernetes Job via the pr

Finally, the Kubernetes job will be launched every time it is installed in Kubernetes. You can know more about how to run Kubernetes jobs in this https://kubernetes.io/docs/concepts/workloads/controllers/job/#running-an-example-job[link].

You can configure the rest of the Kubernetes Job configuration using the properties under `quarkus.kubernetes.job.xxx` (see xref:deploying-to-kubernetes.adoc#quarkus-kubernetes-kubernetes-config_quarkus.kubernetes.job.parallelism[link]).
You can configure the rest of the Kubernetes Job configuration using the properties under `quarkus.kubernetes.job.xxx` (see xref:deploying-to-kubernetes.adoc#quarkus-kubernetes-kubernetes-config_quarkus-kubernetes-job-parallelism[link]).

==== Generating CronJob resources

Expand All @@ -253,7 +253,7 @@ quarkus.kubernetes.cron-job.schedule=0 * * * *

IMPORTANT: CronJob resources require the https://en.wikipedia.org/wiki/Cron[Cron] expression to specify when to launch the job via the property `quarkus.kubernetes.cron-job.schedule`. If not provide, the build will fail.

You can configure the rest of the Kubernetes CronJob configuration using the properties under `quarkus.kubernetes.cron-job.xxx` (see xref:deploying-to-kubernetes.adoc#quarkus-kubernetes-kubernetes-config_quarkus.kubernetes.cron-job.parallelism[link]).
You can configure the rest of the Kubernetes CronJob configuration using the properties under `quarkus.kubernetes.cron-job.xxx` (see xref:deploying-to-kubernetes.adoc#quarkus-kubernetes-kubernetes-config_quarkus-kubernetes-cron-job-parallelism[link]).

=== Namespace

Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/deploying-to-openshift.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ You can provide the arguments that will be used by the Kubernetes Job via the pr

Finally, the Kubernetes job will be launched every time that is installed in OpenShift. You can know more about how to run Kubernetes jobs in this https://kubernetes.io/docs/concepts/workloads/controllers/job/#running-an-example-job[link].

You can configure the rest of the Kubernetes Job configuration using the properties under `quarkus.openshift.job.xxx` (see xref:deploying-to-openshift#quarkus-openshift-openshift-config_quarkus.openshift.job.parallelism[link]).
You can configure the rest of the Kubernetes Job configuration using the properties under `quarkus.openshift.job.xxx` (see xref:deploying-to-openshift#quarkus-openshift-openshift-config_quarkus-openshift-job-parallelism[link]).

===== Generating CronJob resources

Expand All @@ -432,7 +432,7 @@ quarkus.openshift.cron-job.schedule=0 * * * *

IMPORTANT: CronJob resources require the https://en.wikipedia.org/wiki/Cron[Cron] expression to specify when to launch the job via the property `quarkus.openshift.cron-job.schedule`. If not provide, the build will fail.

You can configure the rest of the Kubernetes CronJob configuration using the properties under `quarkus.openshift.cron-job.xxx` (see xref:deploying-to-openshift.adoc#quarkus-openshift-openshift-config_quarkus.openshift.cron-job.parallelism[link]).
You can configure the rest of the Kubernetes CronJob configuration using the properties under `quarkus.openshift.cron-job.xxx` (see xref:deploying-to-openshift.adoc#quarkus-openshift-openshift-config_quarkus-openshift-cron-job-parallelism[link]).

==== Validation

Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/elasticsearch-dev-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ including the Elasticsearch schema and the content of indexes.
If that's not what you want -- and if your tests write to the indexes, that's probably not what you want --
consider reinitializing your schema and data on application startup.
If you use Hibernate Search,
xref:hibernate-search-orm-elasticsearch.adoc#quarkus-hibernate-search-orm-elasticsearch_quarkus.hibernate-search-orm.schema-management.strategy[Hibernate Search's schema management]
xref:hibernate-search-orm-elasticsearch.adoc#quarkus-hibernate-search-orm-elasticsearch_quarkus-hibernate-search-orm-schema-management-strategy[Hibernate Search's schema management]
may help with that.
====

Expand All @@ -138,7 +138,7 @@ In that case, you will need to stop and remove these containers manually.
If you want to reuse containers for some Quarkus applications but not all of them,
or some Dev Services but not all of them,
you can disable this feature for a specific Dev Service by setting the configuration property
xref:elasticsearch-dev-services.adoc#quarkus-elasticsearch-devservices-elasticsearch-dev-services-build-time-config_quarkus.elasticsearch.devservices.reuse[`quarkus.elasticsearch.devservices.reuse`]
xref:elasticsearch-dev-services.adoc#quarkus-elasticsearch-devservices-elasticsearch-dev-services-build-time-config_quarkus-elasticsearch-devservices-reuse[`quarkus.elasticsearch.devservices.reuse`]
to `false`.

== Current limitations
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/getting-started-dev-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ Quarkus will automatically stop the container when your application stops.
If you play with your code some more, you may notice that sometimes, after making an application change, http://localhost:8080/hello/names doesn't list any names.
What's going on? By default, in dev mode, with a Dev Services database,
Quarkus configures Hibernate ORM database generation to be `drop-and-create`.
See the xref:hibernate-orm.adoc#quarkus-hibernate-orm_quarkus.hibernate-orm.database-database-related-configuration[Hibernate configuration reference] for more details.
See the xref:hibernate-orm.adoc#quarkus-hibernate-orm_quarkus-hibernate-orm-database-database-related-configuration[Hibernate configuration reference] for more details.
If a code change triggers an application restart, the database tables
will be dropped (deleted) and then re-created.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/hibernate-orm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ You can add mapping files following
the https://jakarta.ee/specifications/persistence/3.0/jakarta-persistence-spec-3.0.html#a16944[`orm.xml` format (Jakarta Persistence)]
or the http://hibernate.org/dtd/hibernate-mapping-3.0.dtd[`hbm.xml` format (specific to Hibernate ORM, deprecated)]:

* in `application.properties` through the (build-time) link:#quarkus-hibernate-orm_quarkus.hibernate-orm.mapping-files[`quarkus.hibernate-orm.mapping-files`] property.
* in `application.properties` through the (build-time) link:#quarkus-hibernate-orm_quarkus-hibernate-orm-mapping-files[`quarkus.hibernate-orm.mapping-files`] property.
* in <<persistence-xml,`persistence.xml`>> through the `<mapping-file>` element.

XML mapping files are parsed at build time.
Expand Down
Loading
Loading