Skip to content

Commit a011a32

Browse files
t1jmartisk
authored andcommitted
fix wildfly-extras#111: update wildfly-plugin and configure for dev mode; fix some pom issues
1 parent 066c452 commit a011a32

File tree

7 files changed

+27
-20
lines changed

7 files changed

+27
-20
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ target
4141
# gradle
4242
.gradle
4343
**/gradle/wrapper
44+
45+
/quickstart/wildfly/

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ See [Installation guide](https://github.com/wildfly-extras/wildfly-graphql-featu
2323
**For development purposes, one way to obtain a WildFly distribution with a snapshot of this feature pack installed is to simply build the contents of this repository.
2424
After building (`mvn clean install`), it will appear under build/target/wildfly-$VERSION. The Galleon definition of what will be included can be found in `build/pom.xml`.**
2525

26+
You can also build a server by using the wildfly plugin, maybe even in `dev` mode. See the Quickstart for details.
2627

2728
-------------
2829

feature-pack/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<plugin>
8080
<groupId>org.wildfly.maven.plugins</groupId>
8181
<artifactId>licenses-plugin</artifactId>
82+
<version>2.3.1.Final</version>
8283
<inherited>false</inherited>
8384
<executions>
8485
<execution>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<!-- Plugin versions and their dependency versions -->
8181
<version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
8282
<version.org.wildfly.galleon-plugins>6.4.2.Final</version.org.wildfly.galleon-plugins>
83-
<version.wildfly.maven.plugin>2.2.0.Final</version.wildfly.maven.plugin>
83+
<version.wildfly.maven.plugin>4.1.0.Final</version.wildfly.maven.plugin>
8484

8585
<!-- Misc. -->
8686
<wildfly-extras.repo.scm.connection>[email protected]:wildfly-extras/wildfly-graphql-feature-pack.git</wildfly-extras.repo.scm.connection>

quickstart/README.md

+4-14
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@
22

33
## Prerequisites
44
- JDK 1.8+
5-
- Maven
6-
- Galleon downloaded and available on your path as described in the [main README](../README.md). The main README also provides background on how to provision WildFly servers and which Galleon layers are available.
5+
- Maven
76

87

98
## Building and deploying the quickstart
10-
You need to provision a server (remember you need to have Galleon installed as described in
11-
the [main README](../README.md)). Go to the folder containing this README in a new
12-
terminal, and then run:
13-
```
14-
galleon.sh provision ./provision.xml --dir=target/my-wildfly
15-
./target/my-wildfly/bin/standalone.sh
16-
```
17-
This provisions the server with the relevant Galleon layers, and starts it. The
18-
[main README](../README.md) contains information about the layers in this feature pack.
199

20-
Then in another terminal window, go to the same folder and run:
10+
The [main README](../README.md) contains information about the layers in this feature pack. You can use the `wildfly-maven-plugin` to build and run the server with the feature pack, and deploy the quickstart war.
11+
2112
```
22-
mvn package wildfly:deploy
13+
mvn wildfly:provision wildfly:dev
2314
```
24-
This builds and deploys the application into the provisioned WildFly server.
2515

2616
## Check the GraphQL schema
2717
To view the schema, execute this command:

quickstart/pom.xml

+17
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<dependency>
125125
<groupId>jakarta.validation</groupId>
126126
<artifactId>jakarta.validation-api</artifactId>
127+
<scope>provided</scope>
127128
</dependency>
128129

129130
<!-- Other dependencies needed for the testing infrastructure -->
@@ -156,6 +157,22 @@
156157
<!-- To be able to deploy the app by doing mvn package wildfly:deploy -->
157158
<groupId>org.wildfly.plugins</groupId>
158159
<artifactId>wildfly-maven-plugin</artifactId>
160+
<configuration>
161+
<feature-packs>
162+
<feature-pack>
163+
<location>wildfly@maven(org.jboss.universe:community-universe):current#${version.org.wildfly}</location>
164+
</feature-pack>
165+
<feature-pack>
166+
<location>org.wildfly.extras.graphql:wildfly-microprofile-graphql-feature-pack:${project.version}</location>
167+
</feature-pack>
168+
</feature-packs>
169+
<layers>
170+
<layer>cloud-server</layer>
171+
<layer>jmx-remoting</layer>
172+
<layer>management</layer>
173+
<layer>microprofile-graphql</layer>
174+
</layers>
175+
</configuration>
159176
</plugin>
160177

161178
<!-- Prepare a WildFly distribution for testing. Only relevant for the tests. -->

testsuite/client-vertx/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>jakarta.json</groupId>
3939
<artifactId>jakarta.json-api</artifactId>
40-
<scope>test</scope>
40+
<optional>true</optional>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.eclipse</groupId>
@@ -135,10 +135,6 @@
135135
<artifactId>jakarta.json</artifactId>
136136
<scope>test</scope>
137137
</dependency>
138-
<dependency>
139-
<groupId>jakarta.json</groupId>
140-
<artifactId>jakarta.json-api</artifactId>
141-
</dependency>
142138
<dependency>
143139
<groupId>org.wildfly.arquillian</groupId>
144140
<artifactId>wildfly-arquillian-protocol-jmx</artifactId>

0 commit comments

Comments
 (0)