Skip to content

Commit

Permalink
Merge pull request #26069 from ppalaga/i26068
Browse files Browse the repository at this point in the history 
Manage artifacts used by us and other Quarkus Platform participants
  • Loading branch information
@gsmet
gsmet committed Jun 23, 2022
2 parents eaafaa7 + 83688f6 commit 9694bd4
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 13 deletions.
37 changes: 34 additions & 3 deletions bom/application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
<opentelemetry-alpha.version>1.13.0-alpha</opentelemetry-alpha.version>
<jaeger.version>1.8.0</jaeger.version>
<quarkus-http.version>4.1.9</quarkus-http.version>
<micrometer.version>1.9.0</micrometer.version>
<micrometer.version>1.9.0</micrometer.version><!-- keep in sync with hdrhistogram -->
<hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
<google-auth.version>0.22.0</google-auth.version>
<microprofile-config-api.version>2.0.1</microprofile-config-api.version>
<microprofile-metrics-api.version>3.0.1</microprofile-metrics-api.version>
Expand Down Expand Up @@ -61,6 +62,7 @@
<jakarta.interceptor-api.version>1.2.5</jakarta.interceptor-api.version>
<jakarta.json.version>1.1.6</jakarta.json.version>
<jakarta.json.bind-api.version>1.0.2</jakarta.json.bind-api.version>
<jakarta.mail.version>1.6.7</jakarta.mail.version>
<jakarta.persistence-api.version>2.2.3</jakarta.persistence-api.version>
<jakarta.security.jacc-api.version>1.6.1</jakarta.security.jacc-api.version>
<jakarta.security.auth.message-api.version>1.1.3</jakarta.security.auth.message-api.version>
Expand Down Expand Up @@ -161,7 +163,8 @@
<mongo-crypt.version>1.4.0</mongo-crypt.version>
<proton-j.version>0.33.10</proton-j.version>
<javaparser.version>3.24.2</javaparser.version>
<okhttp.version>3.14.9</okhttp.version>
<okhttp.version>3.14.9</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
<hibernate-quarkus-local-cache.version>0.1.1</hibernate-quarkus-local-cache.version>
<flapdoodle.mongo.version>3.3.0</flapdoodle.mongo.version>
<quarkus-spring-api.version>5.2.SP7</quarkus-spring-api.version>
Expand Down Expand Up @@ -2885,7 +2888,12 @@
<version>${bytebuddy.version}</version>
</dependency>

<!-- GRPC dependency -->
<!-- GRPC dependencies -->
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${proto-google-common-protos.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down Expand Up @@ -3743,6 +3751,11 @@
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>${jakarta.mail.version}</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand Down Expand Up @@ -3914,6 +3927,11 @@
<artifactId>logging-interceptor</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
Expand Down Expand Up @@ -4820,6 +4838,12 @@
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
<version>${cronutils.version}</version>
<exclusions>
<exclusion><!-- Remove once https://github.com/jmrozanec/cron-utils/pull/521 reaches us -->
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
Expand Down Expand Up @@ -5503,6 +5527,13 @@
<version>${picocli.version}</version>
</dependency>

<!-- Micrometer -->
<dependency>
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
<version>${hdrhistogram.version}</version>
</dependency>

<!-- Quarkus build related dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
22 changes: 12 additions & 10 deletions build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,8 @@
<!-- Includes its own copy of an old version of the servlet API-->
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
<exclude>org.jboss.modules:jboss-modules</exclude>
<!-- We prefer ByteBuddy where possible -->
<exclude>org.javassist:javassist</exclude>
</excludes>
<includes>
<!-- this is for REST Assured -->
Expand Down Expand Up @@ -1162,13 +1164,13 @@
<newArtifacts>
<artifact>${project.groupId}:${project.artifactId}:${revapi.newVersion}</artifact>
</newArtifacts>
<!-- don't fail is false making it possible to have
<!-- don't fail is false making it possible to have
revapi checks without requiring config files -->
<failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
<!-- Consider changes from the latest .Final version,
<!-- Consider changes from the latest .Final version,
not from the latest non-snapshot. -->
<versionFormat>\d+\.\d+\.\d+\.Final</versionFormat>
<!-- By default revapi will check the oldArtifact
<!-- By default revapi will check the oldArtifact
against the currently executed build -->
<!-- <checkDependencies>false</checkDependencies> -->
<analysisConfigurationFiles>
Expand All @@ -1182,8 +1184,8 @@
</roots>
</configurationFile>
</analysisConfigurationFiles>
<!-- By default, revapi will only fail the build
if there are potentially breaking or breaking changes. However, in the report
<!-- By default, revapi will only fail the build
if there are potentially breaking or breaking changes. However, in the report
we want even non breaking changes to be present. -->
<reportSeverity>nonBreaking</reportSeverity>
<failSeverity>potentiallyBreaking</failSeverity>
Expand All @@ -1193,11 +1195,11 @@
<ignoreSuggestionsFile>${project.build.directory}/api-changes-suggestions.xml</ignoreSuggestionsFile>
<expandProperties>true</expandProperties>
</configuration>
<!-- Running two executions is a workaround to make sure
we get a HTML report in case revapi finds some incompatible changes. The
"check" goal will simply fail the whole build before it could get to the
report. To make sure we always get a HTML report, the "report" goal needs
to be executed before the "check" goal. Once https://github.com/revapi/revapi/issues/11
<!-- Running two executions is a workaround to make sure
we get a HTML report in case revapi finds some incompatible changes. The
"check" goal will simply fail the whole build before it could get to the
report. To make sure we always get a HTML report, the "report" goal needs
to be executed before the "check" goal. Once https://github.com/revapi/revapi/issues/11
is fixed it should be possible to use single execution. -->
<executions>
<execution>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<grpc-jprotoc.version>1.2.1</grpc-jprotoc.version>
<protoc.version>3.19.3</protoc.version>
<protobuf-java.version>${protoc.version}</protobuf-java.version>
<proto-google-common-protos.version>2.0.1</proto-google-common-protos.version>

</properties>

Expand Down

0 comments on commit 9694bd4

Please sign in to comment.