A few tweaks...

- fix some formatting violations - add a missing <activeByDefault> - restore the actions profile in root pom
hawkular · Oct 5, 2016 · a29fd0b · a29fd0b
1 parent f7d9040
commit a29fd0b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 40 deletions.
diff --git a/hawkular-alerts-actions/hawkular-alerts-actions-plugins/pom.xml b/hawkular-alerts-actions/hawkular-alerts-actions-plugins/pom.xml
@@ -17,7 +17,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -110,33 +111,33 @@
   </build>
 
   <profiles>
-   <profile>
-     <id>default</id>
-     <activation>
-       <activeByDefault>true</activeByDefault>
-     </activation>
-     <modules>
-       <module>hawkular-alerts-actions-aerogear</module>
-       <module>hawkular-alerts-actions-email</module>
-       <module>hawkular-alerts-actions-file</module>
-       <module>hawkular-alerts-actions-generic</module>
-       <module>hawkular-alerts-actions-irc</module>
-       <module>hawkular-alerts-actions-pagerduty</module>
-       <module>hawkular-alerts-actions-sms</module>
-       <module>hawkular-alerts-actions-webhook</module>
-       <module>hawkular-alerts-actions-webhook-global</module>
-     </modules>
-   </profile>
-
-   <profile>
-     <id>openshift</id>
-     <modules>
-       <module>hawkular-alerts-actions-email</module>
-       <module>hawkular-alerts-actions-file</module>
-       <module>hawkular-alerts-actions-generic</module>
-       <module>hawkular-alerts-actions-webhook</module>
-       <module>hawkular-alerts-actions-webhook-global</module>
-     </modules>
-   </profile>
- </profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>hawkular-alerts-actions-aerogear</module>
+        <module>hawkular-alerts-actions-email</module>
+        <module>hawkular-alerts-actions-file</module>
+        <module>hawkular-alerts-actions-generic</module>
+        <module>hawkular-alerts-actions-irc</module>
+        <module>hawkular-alerts-actions-pagerduty</module>
+        <module>hawkular-alerts-actions-sms</module>
+        <module>hawkular-alerts-actions-webhook</module>
+        <module>hawkular-alerts-actions-webhook-global</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>openshift</id>
+      <modules>
+        <module>hawkular-alerts-actions-email</module>
+        <module>hawkular-alerts-actions-file</module>
+        <module>hawkular-alerts-actions-generic</module>
+        <module>hawkular-alerts-actions-webhook</module>
+        <module>hawkular-alerts-actions-webhook-global</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>
diff --git a/hawkular-alerts-actions/pom.xml b/hawkular-alerts-actions/pom.xml
@@ -47,6 +47,7 @@
     <profile>
       <id>default</id>
       <activation>
+        <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
         <module>hawkular-alerts-actions-api</module>

diff --git a/hawkular-alerts-rest/pom.xml b/hawkular-alerts-rest/pom.xml
@@ -67,5 +67,4 @@
     </profile>
   </profiles>
 
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,6 @@
       </activation>
       <modules>
         <module>hawkular-alerts-api</module>
-        <module>hawkular-alerts-actions</module>
         <module>hawkular-alerts-bus-api</module>
         <module>hawkular-alerts-engine</module>
         <module>hawkular-alerts-bus</module>
@@ -134,14 +133,12 @@
     </profile>
 
     <profile>
-      <id>noactions</id>
+      <id>actions</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <modules>
-        <module>hawkular-alerts-api</module>
-        <module>hawkular-alerts-bus-api</module>
-        <module>hawkular-alerts-engine</module>
-        <module>hawkular-alerts-bus</module>
-        <module>hawkular-alerts-rest</module>
-        <module>hawkular-alerts-rest-tests</module>
+        <module>hawkular-alerts-actions</module>
       </modules>
     </profile>
 
@@ -157,7 +154,6 @@
         <module>hawkular-alerts-actions</module>
       </modules>
     </profile>
-
   </profiles>
 
 </project>