Skip to content

Commit

Permalink
Merge branch 'main' into fix-491
Browse files Browse the repository at this point in the history
  • Loading branch information
loicmathieu authored Sep 8, 2023
2 parents 816616b + c2b5e1f commit e2dc8c9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
<opencensus.version>0.31.1</opencensus.version><!-- mess in google-pubsub and grpc deps; should be rather stable as OpenCensus has been sunsetted already - see https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/862 -->
<threeten.version>1.6.8</threeten.version><!-- mess in google-cloud-core transitive deps -->
<perfmark-api.version>0.26.0</perfmark-api.version><!-- mess in grpc-core and google-cloud-secretmanager-->
<conscrypt-version>2.5.2</conscrypt-version><!-- mess in google-cloud-bigquery and the other google cloud lib-->
<conscrypt.version>2.5.2</conscrypt.version><!-- mess in google-cloud-bigquery and the other google cloud lib-->
<a11y-base.version>24.1.6</a11y-base.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,7 +84,12 @@
<dependency>
<groupId>org.conscrypt</groupId>
<artifactId>conscrypt-openjdk-uber</artifactId>
<version>${conscrypt-version}</version>
<version>${conscrypt.version}</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>a11y-base</artifactId>
<version>${a11y-base.version}</version>
</dependency>

<!-- Google Cloud Services Extensions -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<maven.compiler.parameters>true</maven.compiler.parameters>
<quarkus.version>3.3.0</quarkus.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<enforcer-plugin.version>3.3.0</enforcer-plugin.version>
<enforcer-plugin.version>3.4.0</enforcer-plugin.version>
<assertj.version>3.24.2</assertj.version>
</properties>
<scm>
Expand Down

0 comments on commit e2dc8c9

Please sign in to comment.