Skip to content

Commit

Permalink
Use WildFly Glow discovery in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfdenise @jmartisk
jfdenise authored and jmartisk committed Nov 2, 2023
1 parent efc5071 commit 89afc4e
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 97 deletions.
5 changes: 5 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,11 @@
<artifactId>galleon-maven-plugin</artifactId>
<version>${version.org.jboss.galleon}</version>
</plugin>
<plugin>
<groupId>org.wildfly.glow</groupId>
<artifactId>wildfly-glow-arquillian-plugin</artifactId>
<version>${version.wildfly.glow}</version>
</plugin>
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
Expand Down
65 changes: 33 additions & 32 deletions testsuite/client-vertx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,36 @@

<build>
<plugins>
<plugin>
<groupId>org.wildfly.glow</groupId>
<artifactId>wildfly-glow-arquillian-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
</feature-pack>
</feature-packs>
</configuration>
<executions>
<execution>
<id>scan-graphql</id>
<goals>
<goal>scan</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<expected-discovery>[cdi, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
Expand All @@ -157,9 +187,9 @@
<execution>
<id>server-provisioning</id>
<goals>
<goal>provision</goal>
<goal>provision-file</goal>
</goals>
<phase>compile</phase>
<phase>process-test-classes</phase>
<configuration>
<install-dir>${project.build.directory}/wildfly</install-dir>
<record-state>false</record-state>
Expand All @@ -169,36 +199,7 @@
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</plugin-options>
<feature-packs>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
<configurations>
<config>
<model>standalone</model>
<name>standalone.xml</name>
<layers>
<layer>jaxrs-server</layer>
<layer>jmx-remoting</layer>
<layer>observability</layer>
<!-- Layers from this FP -->
<layer>microprofile-graphql</layer>
</layers>
</config>
</configurations>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
</execution>
</executions>
Expand Down
67 changes: 34 additions & 33 deletions testsuite/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,37 @@

<build>
<plugins>
<plugin>
<groupId>org.wildfly.glow</groupId>
<artifactId>wildfly-glow-arquillian-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
</feature-pack>
</feature-packs>
<config-name>standalone-graphql.xml</config-name>
</configuration>
<executions>
<execution>
<id>scan-graphql</id>
<goals>
<goal>scan</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<expected-discovery>[bean-validation, cdi, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
Expand All @@ -212,9 +243,9 @@
<execution>
<id>server-provisioning</id>
<goals>
<goal>provision</goal>
<goal>provision-file</goal>
</goals>
<phase>compile</phase>
<phase>process-test-classes</phase>
<configuration>
<install-dir>${project.build.directory}/wildfly</install-dir>
<record-state>false</record-state>
Expand All @@ -224,37 +255,7 @@
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</plugin-options>
<feature-packs>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
<configurations>
<config>
<model>standalone</model>
<name>standalone-graphql.xml</name>
<layers>
<!-- jaxrs-server and jmx-remoting are needed by Arquillian -->
<layer>jaxrs-server</layer>
<layer>jmx-remoting</layer>

<layer>microprofile-platform</layer>
<layer>microprofile-graphql</layer>
</layers>
</config>
</configurations>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
</execution>
</executions>
Expand Down
69 changes: 37 additions & 32 deletions testsuite/server-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,40 @@

<build>
<plugins>
<plugin>
<groupId>org.wildfly.glow</groupId>
<artifactId>wildfly-glow-arquillian-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
</feature-pack>
</feature-packs>
</configuration>
<executions>
<execution>
<id>scan-graphql</id>
<goals>
<goal>scan</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.graphql:microprofile-graphql-server-tck</dependency>
<dependency>org.eclipse.microprofile.graphql:microprofile-graphql-tck</dependency>
</dependenciesToScan>
<expected-discovery>[cdi, jsonb, jsonp, microprofile-config, microprofile-graphql]==>ee-core-profile-server,microprofile-graphql</expected-discovery>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
Expand All @@ -77,9 +111,9 @@
<execution>
<id>server-provisioning</id>
<goals>
<goal>provision</goal>
<goal>provision-file</goal>
</goals>
<phase>compile</phase>
<phase>process-test-classes</phase>
<configuration>
<install-dir>${project.build.directory}/wildfly</install-dir>
<record-state>false</record-state>
Expand All @@ -89,36 +123,7 @@
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</plugin-options>
<feature-packs>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-microprofile-graphql-feature-pack</artifactId>
<version>${project.version}</version>
<inherit-packages>false</inherit-packages>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
<configurations>
<config>
<model>standalone</model>
<name>standalone.xml</name>
<layers>
<layer>jaxrs-server</layer>
<layer>jmx-remoting</layer>
<layer>observability</layer>
<!-- Layers from this FP -->
<layer>microprofile-graphql</layer>
</layers>
</config>
</configurations>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
</execution>
</executions>
Expand Down

0 comments on commit 89afc4e

Please sign in to comment.