Skip to content

Commit

Permalink
Disable Microprofile OpenTracing modules due to missing relocation
Browse files Browse the repository at this point in the history
  • Loading branch information
@michalvavrik
michalvavrik committed Mar 12, 2024
1 parent c80368a commit 68e1e8c
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 150 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,11 @@ jobs:
for module in $MODULES
do
if [[ "${{ steps.files.outputs.all_changed_and_modified_files }}" =~ ("$module") ]] ; then
CHANGED=$(echo $CHANGED" "$module)
# FIXME: remove next condition when OpenTracing version is bumped
if [[ "$module" != *"opentracing"* ]] ; then
if [[ "${{ steps.files.outputs.all_changed_and_modified_files }}" =~ ("$module") ]] ; then
CHANGED=$(echo $CHANGED" "$module)
fi
fi
done
Expand Down
298 changes: 150 additions & 148 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,154 +589,156 @@
<module>monitoring/micrometer-prometheus-oidc</module>
<module>monitoring/opentelemetry</module>
<module>monitoring/opentelemetry-reactive</module>
<module>monitoring/microprofile-opentracing</module>
<module>monitoring/opentracing-reactive-grpc</module>
</modules>
</profile>
<profile>
<id>sql-db-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>sql-db/hibernate</module>
<module>sql-db/sql-app</module>
<module>sql-db/sql-app-compatibility</module>
<module>sql-db/multiple-pus</module>
<module>sql-db/panache-flyway</module>
<module>sql-db/reactive-rest-data-panache</module>
<module>sql-db/vertx-sql</module>
<module>sql-db/hibernate-reactive</module>
<module>sql-db/reactive-vanilla</module>
<module>sql-db/hibernate-fulltext-search</module>
<module>sql-db/narayana-transactions</module>
</modules>
</profile>
<profile>
<id>nosql-db-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>nosql-db/mongodb</module>
<module>nosql-db/mongodb-reactive</module>
<module>nosql-db/infinispan</module>
<module>nosql-db/elasticsearch</module>
</modules>
</profile>
<profile>
<id>service-binding-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>service-binding/postgresql-crunchy-classic</module>
<module>service-binding/postgresql-crunchy-reactive</module>
</modules>
</profile>
<profile>
<id>spring-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>spring/spring-data</module>
<module>spring/spring-web</module>
<module>spring/spring-web-reactive</module>
<module>spring/spring-properties</module>
<module>spring/spring-cloud-config</module>
<module>cache/spring</module>
<module>scheduling/spring</module>
</modules>
</profile>
<profile>
<id>test-tooling-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>test-tooling/pact</module>
</modules>
</profile>
<profile>
<id>websockets-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>websockets/quarkus-websockets</module>
<module>websockets/websockets-client</module>
</modules>
</profile>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<configuration>
<systemPropertyVariables>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
<quarkus.package.type>${quarkus.package.type}</quarkus.package.type>
<quarkus.native.container-build>${quarkus.native.container-build}</quarkus.native.container-build>
<quarkus.native.native-image-xmx>${quarkus.native.native-image-xmx}</quarkus.native.native-image-xmx>
<quarkus.native.builder-image>${quarkus.native.builder-image}</quarkus.native.builder-image>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<profile.id>native</profile.id>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.native-image-xmx>4g</quarkus.native.native-image-xmx>
<quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21</quarkus.native.builder-image>
<exclude.quarkus.devmode.tests>**/*DevMode*IT.java</exclude.quarkus.devmode.tests>
</properties>
</profile>
<profile>
<!-- You need to be connected to an OpenShift instance to activate this
profile! -->
<!-- FIXME: enable the 'microprofile-opentracing' module when new 'quarkus-smallrye-opentracing' is released -->
<!-- <module>monitoring/microprofile-opentracing</module> -->
<!-- FIXME: enable the 'microprofile-opentracing' module when new 'quarkus-smallrye-opentracing' is released -->
<!-- <module>monitoring/opentracing-reactive-grpc</module> -->
</modules>
</profile>
<profile>
<id>sql-db-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>sql-db/hibernate</module>
<module>sql-db/sql-app</module>
<module>sql-db/sql-app-compatibility</module>
<module>sql-db/multiple-pus</module>
<module>sql-db/panache-flyway</module>
<module>sql-db/reactive-rest-data-panache</module>
<module>sql-db/vertx-sql</module>
<module>sql-db/hibernate-reactive</module>
<module>sql-db/reactive-vanilla</module>
<module>sql-db/hibernate-fulltext-search</module>
<module>sql-db/narayana-transactions</module>
</modules>
</profile>
<profile>
<id>nosql-db-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>nosql-db/mongodb</module>
<module>nosql-db/mongodb-reactive</module>
<module>nosql-db/infinispan</module>
<module>nosql-db/elasticsearch</module>
</modules>
</profile>
<profile>
<id>service-binding-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>service-binding/postgresql-crunchy-classic</module>
<module>service-binding/postgresql-crunchy-reactive</module>
</modules>
</profile>
<profile>
<id>spring-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>spring/spring-data</module>
<module>spring/spring-web</module>
<module>spring/spring-web-reactive</module>
<module>spring/spring-properties</module>
<module>spring/spring-cloud-config</module>
<module>cache/spring</module>
<module>scheduling/spring</module>
</modules>
</profile>
<profile>
<id>test-tooling-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>test-tooling/pact</module>
</modules>
</profile>
<profile>
<id>websockets-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>websockets/quarkus-websockets</module>
<module>websockets/websockets-client</module>
</modules>
</profile>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<configuration>
<systemPropertyVariables>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
<quarkus.package.type>${quarkus.package.type}</quarkus.package.type>
<quarkus.native.container-build>${quarkus.native.container-build}</quarkus.native.container-build>
<quarkus.native.native-image-xmx>${quarkus.native.native-image-xmx}</quarkus.native.native-image-xmx>
<quarkus.native.builder-image>${quarkus.native.builder-image}</quarkus.native.builder-image>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<profile.id>native</profile.id>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.native-image-xmx>4g</quarkus.native.native-image-xmx>
<quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21</quarkus.native.builder-image>
<exclude.quarkus.devmode.tests>**/*DevMode*IT.java</exclude.quarkus.devmode.tests>
</properties>
</profile>
<profile>
<!-- You need to be connected to an OpenShift instance to activate this
profile! -->
<id>openshift</id>
<activation>
<property>
Expand Down

0 comments on commit 68e1e8c

Please sign in to comment.