Skip to content

Commit

Permalink
Remove dependency on the reactive feature pack
Browse files Browse the repository at this point in the history
  • Loading branch information
jmartisk committed Nov 19, 2024
1 parent 957d81a commit 1dbadf1
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 21 deletions.
6 changes: 0 additions & 6 deletions feature-pack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@
<!-- <version>${version.org.wildfly}</version>-->
<!-- <type>zip</type>-->
<!-- </dependency>-->
<dependency>
<groupId>org.wildfly.extras.reactive</groupId>
<artifactId>wildfly-microprofile-reactive-feature-pack</artifactId>
<version>${version.org.wildfly.reactive-feature-pack}</version>
<type>zip</type>
</dependency>

<!-- Project modules -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<dependencies>
<layer name="cdi"/>
<layer name="microprofile-config"/>
<layer name="microprofile-context-propagation"/>
</dependencies>

<feature-group name="graphql"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
<module name="org.eclipse.microprofile.config.api"/>
<module name="org.eclipse.microprofile.graphql.api" export="true"/>

<!-- from the reactive feature pack -->
<module name="io.smallrye.context-propagation"/>
<module name="org.eclipse.microprofile.context-propagation.api"/>
<module name="io.smallrye.reactive.mutiny" export="true"/>
<module name="io.smallrye.reactive.mutiny.zero-flow-adapters" export="true"/>
<module name="org.reactivestreams" export="true"/>
Expand Down
7 changes: 0 additions & 7 deletions feature-pack/wildfly-feature-pack-build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@
</packages>
<default-configs inherit="false"/>
</dependency>
<dependency group-id="org.wildfly.extras.reactive" artifact-id="wildfly-microprofile-reactive-feature-pack">
<name>org.wildfly:wildfly-microprofile-reactive-feature-pack</name>
<packages inherit="false">
<include name="docs.examples"/>
</packages>
<default-configs inherit="false"/>
</dependency>
</dependencies>

<default-packages>
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
<version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
<version.org.jboss.galleon>6.0.3.Final</version.org.jboss.galleon>

<!-- Other WildFly feature pack that we depend on -->
<version.org.wildfly.reactive-feature-pack>3.0.0.Final</version.org.wildfly.reactive-feature-pack>

<!-- Libraries provided by this feature pack. These variables directly affect what will be in
the built feature pack. -->
<version.io.smallrye.graphql>2.11.0</version.io.smallrye.graphql>
Expand All @@ -60,7 +57,7 @@

<!-- Dependencies which are not included directly in the built feature pack but are dragged from WildFly,
so they are here mostly just for compilation and testing purposes -->
<version.io.smallrye.reactive.mutiny>2.5.1</version.io.smallrye.reactive.mutiny>
<version.io.smallrye.reactive.mutiny>2.6.2</version.io.smallrye.reactive.mutiny>
<version.io.smallrye.config>3.3.1</version.io.smallrye.config>
<version.org.reactivestreams>1.0.4</version.org.reactivestreams>
<version.elytron>2.1.0.Final</version.elytron>
Expand All @@ -71,6 +68,7 @@
<version.kotlinx.metadata.jvm>0.7.0</version.kotlinx.metadata.jvm>
<version.kotlin.stdlib>1.9.0</version.kotlin.stdlib>


<!-- Testing-only dependencies -->
<version.shrinkwrap>2.2.4</version.shrinkwrap>
<version.commons-logging>1.1.3</version.commons-logging>
Expand All @@ -79,6 +77,9 @@
<version.rest-assured>5.3.0</version.rest-assured>
<version.arquillian-junit>1.7.0.Alpha12</version.arquillian-junit>
<version.wildfly.glow>1.1.0.Final</version.wildfly.glow>
<!-- this is a dependency of Mutiny, and we need to bring it in separately to have it on
the test class path of @RunAsClient graphql-client tests -->
<version.jctools>4.0.5</version.jctools>

<!-- Plugin versions and their dependency versions -->
<version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
Expand Down
5 changes: 5 additions & 0 deletions testsuite/client-vertx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
<artifactId>mutiny</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jctools</groupId>
<artifactId>jctools-core</artifactId>
<version>${version.jctools}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.graphql</groupId>
<artifactId>microprofile-graphql-api</artifactId>
Expand Down

0 comments on commit 1dbadf1

Please sign in to comment.