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

Set version to 5.x and upgrade to Quarkus 3.16 #268

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Set version to 5.x and upgrade to Quarkus 3.16 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba6ffe
main is now 5.x
yrodiere Oct 28, 2024
a4a9b57
Bump the quarkus group with 5 updates
dependabot[bot] Oct 28, 2024
6fe2373
Remove hack around documentation of AWS credentials provider config
yrodiere Oct 28, 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
4 changes: 0 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ updates:
- "io.quarkiverse:*"
- "io.quarkiverse.*:*"
ignore:
# We require JDK 11, so we don't need "-jdk8"
- dependency-name: "org.bsc.maven:maven-processor-plugin"
# Apparently patterns using wildcards are not supported here. Hopefully this will last until they drop these silly -jdk8 packages.
versions: ["5.0-jdk8", "5.1-jdk8", "5.2-jdk8", "5.3-jdk8", "5.4-jdk8", "5.5-jdk8", "5.6-jdk8", "5.7-jdk8", "5.8-jdk8", "5.9-jdk8"]
# Releases too often, it's annoying
- dependency-name: "org.assertj:*"
update-types: ["version-update:semver-patch"]
Expand Down
13 changes: 7 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ It is the new home for the `quarkus-hibernate-search-orm-elasticsearch-aws` exte

Quarkus Hibernate Search Extras provides different version streams for different versions of Quarkus.

| Quarkus | Quarkus Hibernate Search Extras | Documentation |
|------------|---------------------------------|----------------------------------------------------------------------------------------------------------------|
| 2.x | 1.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/1.x/index.html) |
| 3.0, 3.1 | 2.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/2.x/index.html) |
| 3.2 to 3.6 | 3.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/3.x/index.html) |
| 3.7+ | 4.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/dev/index.html) |
| Quarkus | Quarkus Hibernate Search Extras | Documentation |
|-------------|---------------------------------|----------------------------------------------------------------------------------------------------------------|
| 2.x | 1.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/1.x/index.html) |
| 3.0, 3.1 | 2.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/2.x/index.html) |
| 3.2 to 3.6 | 3.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/3.x/index.html) |
| 3.7 to 3.15 | 4.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/4.x/index.html) |
| 3.16+ | 5.x | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/dev/index.html) |


Use the latest version of the corresponding stream, [the list of versions is available on Maven Central](https://search.maven.org/artifact/io.quarkiverse.hibernatesearchextras/quarkus-hibernate-search-orm-elasticsearch-aws).
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/includes/attributes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:quarkus-version: 3.13.0
:quarkus-version: 3.16.0
:quarkus-hibernate-search-extras-version: 4.1.0

:quarkus-org-url: https://github.com/quarkusio
Expand Down
29 changes: 0 additions & 29 deletions hibernate-search-orm-elasticsearch-aws/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,35 +71,6 @@

<build>
<plugins>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>${maven-processor-plugin.version}</version>
<executions>
<!-- Run annotation processors on quarkus-amazon-common,
just to generate the necessary metadata/documentation for AwsCredentialsProviderConfig,
so that it will get embedded in our own documentation. -->
<execution>
<id>process-quarkus-amazon-common</id>
<goals>
<goal>process</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<addCompileSourceRoots>false</addCompileSourceRoots>
<includes>io/quarkus/amazon/**/*.java</includes>
<processSourceArtifacts>io.quarkiverse.amazonservices:quarkus-amazon-common:${quarkus-amazon-services.version}</processSourceArtifacts>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ticsearch/aws/runtime/HibernateSearchOrmElasticsearchAwsRuntimeConfigPersistenceUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Map;
import java.util.Optional;

import io.quarkus.amazon.common.runtime.AwsCredentialsProviderConfig;
import io.quarkiverse.amazon.common.runtime.AwsCredentialsProviderConfig;
import io.quarkus.runtime.annotations.ConfigDocMapKey;
import io.quarkus.runtime.annotations.ConfigGroup;
import io.smallrye.config.WithName;
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.version>3.15.1</quarkus.version>
<maven-processor-plugin.version>5.1</maven-processor-plugin.version>
<quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
<quarkus.version>3.16.0</quarkus.version>
<quarkus-amazon-services.version>3.0.1</quarkus-amazon-services.version>
<assertj.version>3.26.0</assertj.version>
<wiremock.version>2.27.2</wiremock.version>
<wiremock-maven-plugin.version>7.3.0</wiremock-maven-plugin.version>
Expand Down
Loading