Bug 1315203 - Plugin for eap7 is not deployed

Added the new plugin to the EAR build Also, added it to plugin validation module and created the version property in parent POM. Fixed a couple of typos.
rhq-project · Mar 7, 2016 · 3501943 · 3501943
1 parent f0d02ed
commit 3501943
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
@@ -780,6 +780,12 @@
                                             <artifactId>rhq-jboss-as-7-plugin</artifactId>
                                             <version>${project.version}</version>
                                         </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-wfly-10-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                     <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
                                 </configuration>

diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
@@ -44,6 +44,7 @@
                               <pathelement location="../jboss-as-5/target/jopr-jboss-as-5-plugin-${project.version}.jar" />
 -->
                              <pathelement location="../jboss-as-7/target/rhq-jboss-as-7-plugin-${project.version}.jar" />
+                             <pathelement location="../wlfy-10/target/rhq-wfly-10-plugin-${project.version}.jar"/>
                               <!--<pathelement location="../jira/target/rhq-jira-plugin-${project.version}.jar" />-->
                               <pathelement location="../jmx/target/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                               <pathelement location="../mysql/target/rhq-mysql-plugin-${project.version}.jar" />

diff --git a/modules/plugins/wfly-10/pom.xml b/modules/plugins/wfly-10/pom.xml
@@ -15,7 +15,7 @@
   <packaging>jar</packaging>
 
   <name>RHQ Wildfly 10 Plugin</name>
-  <description>a plugin for monitoring and managing Wildfly 10 and JBoss platforms based on it (e.g. JBoss EAP 7)</description>
+  <description>A plugin for monitoring and managing Wildfly 10 and JBoss platforms based on it (e.g. JBoss EAP 7)</description>
 
 
   <properties>

diff --git a/modules/plugins/wfly-10/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/wfly-10/src/main/resources/META-INF/rhq-plugin.xml
@@ -1092,7 +1092,7 @@
     ]>
 <plugin name="&pluginName;"
         displayName="Enterprise Application Server 7"
-        description="provides monitoring and management of Wildfly 10 and JBoss EAP7"
+        description="Provides monitoring and management of Wildfly 10 and JBoss EAP7"
         package="org.rhq.modules.plugins.wildfly10"
         pluginLifecycleListener="PluginLifecycleListener"
         xmlns="urn:xmlns:rhq-plugin"

diff --git a/pom.xml b/pom.xml
@@ -410,6 +410,7 @@
     <rhq-irc-plugin.version>${rhq.pom.version}</rhq-irc-plugin.version>
     <jopr-jboss-as-5-plugin.version>${rhq.pom.version}</jopr-jboss-as-5-plugin.version>
     <rhq-jboss-as-7-plugin.version>${rhq.pom.version}</rhq-jboss-as-7-plugin.version>
+    <rhq-wfly-10-plugin.version>${rhq.pom.version}</rhq-wfly-10-plugin.version>
     <jopr-jboss-as-plugin.version>${rhq.pom.version}</jopr-jboss-as-plugin.version>
     <jopr-jboss-cache-v3-plugin.version>${rhq.pom.version}</jopr-jboss-cache-v3-plugin.version>
     <jopr-jboss-cache-plugin.version>${rhq.pom.version}</jopr-jboss-cache-plugin.version>