Skip to content

Commit

Permalink
Merge pull request #1330 from gsmet/3.16.2-backports-1
Browse files Browse the repository at this point in the history 
3.16.2 backports 1
  • Loading branch information
@gsmet
gsmet authored Oct 31, 2024
2 parents 7fe4e7c + c0a73df commit b687e76
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 48 deletions.
5 changes: 5 additions & 0 deletions generated-platform-project/quarkus-camel/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,11 @@
<artifactId>camel-quarkus-beanio-deployment</artifactId>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-beanio</artifactId>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bindy-deployment</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-ftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>${quarkus-google-cloud-services.version}</version>
<version>2.12.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<version>${quarkus-google-cloud-services.version}</version>
<version>2.12.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
42 changes: 21 additions & 21 deletions generated-platform-project/quarkus-google-cloud-services/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4508,107 +4508,107 @@
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigquery-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigquery</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigtable-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigtable</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common-grpc</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firebase-admin-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firebase-admin</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firestore-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firestore</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-logging-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-logging</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-pubsub-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-pubsub</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-secret-manager-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-secret-manager</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-spanner-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-spanner</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-storage-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-storage</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.conscrypt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...kus-google-cloud-services/integration-tests/quarkus-google-cloud-services-main-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
47 changes: 26 additions & 21 deletions generated-platform-project/quarkus-universe/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9827,107 +9827,107 @@
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigquery-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigquery</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigtable-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-bigtable</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common-grpc</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-common</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firebase-admin-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firebase-admin</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firestore-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-firestore</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-logging-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-logging</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-pubsub-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-pubsub</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-secret-manager-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-secret-manager</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-spanner-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-spanner</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-storage-deployment</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.googlecloudservices</groupId>
<artifactId>quarkus-google-cloud-storage</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.groovy</groupId>
Expand Down Expand Up @@ -16046,6 +16046,11 @@
<artifactId>camel-quarkus-beanio-deployment</artifactId>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-beanio</artifactId>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bindy-deployment</artifactId>
Expand Down
4 changes: 1 addition & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<drools-quarkus.version>8.33.0.Final</drools-quarkus.version>
<optaplanner-quarkus.version>9.37.0.Final</optaplanner-quarkus.version>

<quarkus-google-cloud-services.version>2.12.1</quarkus-google-cloud-services.version>
<quarkus-google-cloud-services.version>2.13.0</quarkus-google-cloud-services.version>
<quarkus-vault.version>4.1.0</quarkus-vault.version>
<quarkus-operator-sdk.version>6.8.3</quarkus-operator-sdk.version>

Expand Down Expand Up @@ -586,8 +586,6 @@
<dependency>log4j:log4j</dependency>
<!-- AssertJ -->
<dependency>org.assertj:assertj-core</dependency>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/5803 -->
<dependency>org.apache.camel.quarkus:camel-quarkus-beanio</dependency>
</excludedDependencies>
</bomGenerator>
<descriptorGenerator>
Expand Down

0 comments on commit b687e76

Please sign in to comment.