Skip to content

Commit

Permalink
Merge pull request wildfly#6164 from jfdenise/WFCORE-6980
Browse files Browse the repository at this point in the history 
Fix for WFCORE-6980, Replace usage of wildfly-jar-maven-plugin with wildfly-maven-plugin
  • Loading branch information
@yersan
yersan authored Sep 11, 2024
2 parents a829306 + 9243b90 commit ace0616
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 155 deletions.
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
<version.org.eclipse.m2e.lifecycle-mapping>1.0.0</version.org.eclipse.m2e.lifecycle-mapping>
<!-- wildfly-maven-plugin-->
<version.wildfly.plugin>5.0.0.Final</version.wildfly.plugin>
<version.org.wildfly.jar.plugin>11.0.2.Final</version.org.wildfly.jar.plugin>
<!-- plugins related to wildfly build and tooling -->
<version.org.wildfly.component-matrix-plugin>1.0.3.Final</version.org.wildfly.component-matrix-plugin>
<version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
Expand Down
111 changes: 67 additions & 44 deletions testsuite/elytron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<!--<artifactId>wildfly-core-galleon-pack</artifactId>-->
<version>${project.version}</version>
<inherit-configs>false</inherit-configs>
<inherit-packages>false</inherit-packages>
Expand Down Expand Up @@ -396,42 +395,6 @@
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<configuration>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<!--<artifactId>wildfly-core-galleon-pack</artifactId>-->
<version>${project.version}</version>
<!-- Specifically include patching -->
<included-packages>
<name>org.jboss.as.patching.cli</name>
</included-packages>
<excluded-packages>
<name>product.conf</name>
</excluded-packages>
</feature-pack>
</feature-packs>
<layers>
<layer>core-server</layer>
<layer>core-tools</layer>
<layer>deployment-scanner</layer>
</layers>
</configuration>
<executions>
<!-- Provision a server with the core functionality we will provide in OpenShift images -->
<execution>
<id>bootable-jar-packaging</id>
Expand All @@ -440,14 +403,46 @@
</goals>
<phase>compile</phase>
<configuration>
<output-file-name>test-wildfly.jar</output-file-name>
<cli-sessions>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly.jar</bootableJarName>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>true</offline-provisioning>
<packaging-scripts>
<cli-session>
<script-files>
<javaOpts>
<opt>-Dmaven.repo.local=${settings.localRepository}</opt>
</javaOpts>
<scripts>
<script>${ts.config.elytron.cli.no.embedded}</script>
</script-files>
</scripts>
</cli-session>
</cli-sessions>
</packaging-scripts>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</galleon-options>
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${project.version}</version>
<!-- Specifically include patching -->
<included-packages>
<name>org.jboss.as.patching.cli</name>
</included-packages>
<excluded-packages>
<name>product.conf</name>
</excluded-packages>
</feature-pack>
</feature-packs>
<layers>
<layer>core-server</layer>
<layer>core-tools</layer>
<layer>deployment-scanner</layer>
</layers>
</configuration>
</execution>
<!-- execution with elytron configuration done at runtime -->
Expand All @@ -458,8 +453,36 @@
</goals>
<phase>compile</phase>
<configuration>
<bootable-jar-build-artifacts>bootable-jar-build-artifacts-runtime</bootable-jar-build-artifacts>
<output-file-name>test-wildfly-runtime.jar</output-file-name>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly-runtime.jar</bootableJarName>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>true</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</galleon-options>
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${project.version}</version>
<!-- Specifically include patching -->
<included-packages>
<name>org.jboss.as.patching.cli</name>
</included-packages>
<excluded-packages>
<name>product.conf</name>
</excluded-packages>
</feature-pack>
</feature-packs>
<layers>
<layer>core-server</layer>
<layer>core-tools</layer>
<layer>deployment-scanner</layer>
</layers>
</configuration>
</execution>
</executions>
Expand Down
22 changes: 9 additions & 13 deletions testsuite/manualmode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,6 @@
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<executions>
<!-- Provision a server with the core functionality we will provide in OpenShift images -->
<execution>
<id>bootable-jar-packaging</id>
Expand All @@ -522,15 +516,17 @@
</goals>
<phase>compile</phase>
<configuration>
<output-file-name>test-wildfly.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<plugin-options>
<overwrite-provisioned-server>true</overwrite-provisioned-server>
<bootableJar>true</bootableJar>
<skipDeployment>true</skipDeployment>
<bootableJarName>test-wildfly.jar</bootableJarName>
<record-provisioning-state>false</record-provisioning-state>
<log-provisioning-time>${galleon.log.time}</log-provisioning-time>
<offline-provisioning>true</offline-provisioning>
<galleon-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
</galleon-options>
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/jboss/as/test/manualmode/management/persistence/yaml/YamlExtensionTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class YamlExtensionTestCase {
private ServerController container;

private static final Path jbossHome = System.getProperty("ts.bootable") != null ? Path.of(WildFlySecurityManager.getPropertyPrivileged("basedir", "."),
"target" , "bootable-jar-build-artifacts", "wildfly") : Path.of(WildFlySecurityManager.getPropertyPrivileged("jboss.home", "toto"));
"target" , "server") : Path.of(WildFlySecurityManager.getPropertyPrivileged("jboss.home", "toto"));
private static final Path basedir = jbossHome.resolve("standalone");
private static Path markerDirectory;
private static Path testYaml;
Expand Down
11 changes: 0 additions & 11 deletions testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,17 +413,6 @@
<name>ts.bootable</name>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<version>${version.org.wildfly.jar.plugin}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<module>rbac</module>
<module>manualmode</module>
Expand Down
Loading

0 comments on commit ace0616

Please sign in to comment.