Skip to content

Commit

Permalink
Merge pull request wildfly#18167 from jfdenise/WFLY-19702
Browse files Browse the repository at this point in the history 
Fix for WFLY-19702, Replace usage of wildfly-jar-maven-plugin with wildfly-maven-plugin
  • Loading branch information
@bstansberry
bstansberry authored Sep 6, 2024
2 parents 0e64301 + b44a2c4 commit 4998e0d
Show file tree
Hide file tree
Showing 13 changed files with 329 additions and 368 deletions.
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@
<version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
<version.org.wildfly.galleon-plugins>7.1.2.Final</version.org.wildfly.galleon-plugins>
<version.org.wildfly.glow>1.0.0.Final</version.org.wildfly.glow>
<version.org.wildfly.jar.plugin>11.0.2.Final</version.org.wildfly.jar.plugin>
<version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
<version.org.wildfly.plugin>5.0.0.Final</version.org.wildfly.plugin>
<version.org.wildfly.unstable.annotation.api>1.0.0.Final</version.org.wildfly.unstable.annotation.api>
Expand Down
24 changes: 21 additions & 3 deletions testsuite/integration/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1473,13 +1473,31 @@
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.org.wildfly.plugin}</version>
<configuration>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>${galleon.offline}</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</galleon-options>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
</configuration>
<executions>
<!-- Package a cloud-profile server with the default 'bootable-jar-packaging' execution -->
<execution>
<id>bootable-jar-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-cloud-profile.jar</output-file-name>
<bootableJarName>test-wildfly-cloud-profile.jar</bootableJarName>
<extra-server-content-dirs>
<extraServerContent>${project.build.directory}/extraContent/</extraServerContent>
</extra-server-content-dirs>
Expand All @@ -1495,7 +1513,7 @@
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-jpa.jar</output-file-name>
<bootableJarName>test-wildfly-jpa.jar</bootableJarName>
<extra-server-content-dirs>
<extraServerContent>${project.build.directory}/extraContent/</extraServerContent>
</extra-server-content-dirs>
Expand Down
78 changes: 62 additions & 16 deletions testsuite/integration/clustering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,22 +507,40 @@
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<artifactId>wildfly-maven-plugin</artifactId>
<executions>
<!-- Package a cloud-profile server with the default 'bootable-jar-packaging' execution -->
<execution>
<id>bootable-jar-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-cloud-profile.jar</output-file-name>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>${galleon.offline}</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</galleon-options>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly-cloud-profile.jar</bootableJarName>
<!-- content that is installed in wildfly home -->
<extra-server-content-dirs>${wildfly.dir}</extra-server-content-dirs>
<cli-sessions>
<packaging-scripts>
<cli-session>
<script-files>
<javaOpts>
<opt>-Dmaven.repo.local=${maven.repo.local}</opt>
</javaOpts>
<scripts>
<script>clustering-ha-bootable-jar.cli</script>
</script-files>
</scripts>
</cli-session>
</cli-sessions>
</packaging-scripts>
<provisioning-file>target/glow-scan/ts.surefire.clustering.microprofile/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand All @@ -535,14 +553,28 @@
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-jpa-distributed.jar</output-file-name>
<cli-sessions>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>${galleon.offline}</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</galleon-options>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly-jpa-distributed.jar</bootableJarName>
<packaging-scripts>
<cli-session>
<script-files>
<javaOpts>
<opt>-Dmaven.repo.local=${maven.repo.local}</opt>
</javaOpts>
<scripts>
<script>clustering-ha-bootable-jar.cli</script>
</script-files>
</scripts>
</cli-session>
</cli-sessions>
</packaging-scripts>
<provisioning-file>target/glow-scan/ts.surefire.clustering.all.jpa2lc/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand All @@ -555,14 +587,28 @@
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-cloud-profile-load-balancer.jar</output-file-name>
<cli-sessions>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>${galleon.offline}</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</galleon-options>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly-cloud-profile-load-balancer.jar</bootableJarName>
<packaging-scripts>
<cli-session>
<script-files>
<javaOpts>
<opt>-Dmaven.repo.local=${maven.repo.local}</opt>
</javaOpts>
<scripts>
<script>clustering-load-balancer-bootable-jar.cli</script>
</script-files>
</scripts>
</cli-session>
</cli-sessions>
</packaging-scripts>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand Down
48 changes: 26 additions & 22 deletions testsuite/integration/elytron-oidc-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,42 +173,46 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.org.wildfly.plugin}</version>
<configuration>
<offline>true</offline>
<jboss-home>${wildfly.dir}</jboss-home>
<stdout>none</stdout>
<java-opts>${modular.jdk.args}</java-opts>
<system-properties>
<maven.repo.local>${settings.localRepository}</maven.repo.local>
<module.path>${jboss.dist}/modules</module.path>
</system-properties>
</configuration>
<executions>
<execution>
<configuration>
<offline>true</offline>
<jboss-home>${wildfly.dir}</jboss-home>
<stdout>none</stdout>
<java-opts>${modular.jdk.args}</java-opts>
<system-properties>
<maven.repo.local>${settings.localRepository}</maven.repo.local>
<module.path>${jboss.dist}/modules</module.path>
</system-properties>
</configuration>
<phase>process-test-resources</phase>
<goals>
<goal>execute-commands</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<executions>
<!-- Provision a cloud server -->
<execution>
<id>bootable-jar-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>${galleon.offline}</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<optional-packages>passive+</optional-packages>
</galleon-options>
<!-- content that is installed in wildfly home -->
<extra-server-content-dirs>${wildfly.dir}</extra-server-content-dirs>
<output-file-name>test-wildfly.jar</output-file-name>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly.jar</bootableJarName>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
<goals>
<goal>package</goal>
</goals>
<phase>${ts.bootable-jar-packaging.phase}</phase>
</execution>
</executions>
</plugin>
Expand Down
Loading

0 comments on commit 4998e0d

Please sign in to comment.