Try to move the env vars into pluginManagement

wildfly · Apr 25, 2024 · 54b647d · 54b647d
1 parent 6696a55
commit 54b647d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
@@ -190,6 +190,16 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.plugin.wildfly}</version>
+                    <configuration>
+                        <!-- Env used when calling wildfly:start goal -->
+                        <env>
+                            <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
+                            <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
+                            <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
+                            <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
+                        </env>
+                    </configuration>
+
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -215,13 +225,10 @@
                         <configuration>
                             <filename>client.war</filename>
                             <serverConfig>standalone.xml</serverConfig>
-                            <!-- Env used when calling wildfly:start goal -->
-                            <env>
-                                <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
-                                <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
-                                <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
-                                <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
-                            </env>
+                            <!--
+                                Note that the pluginManagement section for this plugin contains environment variables
+                                which are needed to connect to the database when doing 'mvn wildfly:start'
+                            -->
                         </configuration>
                         <executions>
                             <execution>

diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
@@ -174,6 +174,15 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.plugin.wildfly}</version>
+                    <configuration>
+                        <!-- Env used when calling wildfly:start goal -->
+                        <env>
+                            <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
+                            <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
+                            <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
+                            <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
+                        </env>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -201,13 +210,10 @@
                         <configuration>
                             <filename>server.war</filename>
                             <serverConfig>standalone-ha.xml</serverConfig>
-                            <!-- Env used when calling wildfly:start goal -->
-                            <env>
-                                <POSTGRESQL_DATABASE>test</POSTGRESQL_DATABASE>
-                                <POSTGRESQL_JNDI>java:jboss/datasources/ejbJtaDs</POSTGRESQL_JNDI>
-                                <POSTGRESQL_PASSWORD>${postgresqlUsername}</POSTGRESQL_PASSWORD>
-                                <POSTGRESQL_USER>${postgresqlPassword}</POSTGRESQL_USER>
-                            </env>
+                            <!--
+                                Note that the pluginManagement section for this plugin contains environment variables
+                                which are needed to connect to the database when doing 'mvn wildfly:start'
+                            -->
                         </configuration>
                         <executions>
                             <execution>