Merge remote-tracking branch 'origin/master' into mazz/hawkular-483-e…

…xecute-op Conflicts: pom.xml
hawkular · Jul 28, 2015 · ef76278 · ef76278
2 parents c63a910 + 71c246d
commit ef76278
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dist/assembly.xml b/dist/assembly.xml
@@ -109,7 +109,7 @@
         <include>org.hawkular:hawkular-avail-creator</include>
         <include>org.hawkular.accounts:hawkular-accounts:war</include>
         <include>org.hawkular.alerts:hawkular-alerts-rest:war</include>
-        <include>org.hawkular.alerts:hawkular-actions-email</include>
+        <include>org.hawkular.alerts:hawkular-alerts-actions-email:war</include>
         <include>org.hawkular.metrics:hawkular-metrics-api-jaxrs</include>
         <include>org.hawkular.commons:hawkular-commons-embedded-cassandra-ear</include>
         <include>org.hawkular.accounts:hawkular-accounts-events-backend:war</include>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -94,7 +94,7 @@
     </dependency>
     <dependency>
       <groupId>org.hawkular.alerts</groupId>
-      <artifactId>hawkular-actions-email</artifactId>
+      <artifactId>hawkular-alerts-actions-email</artifactId>
       <type>war</type>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
     <version.gnu.getopt>1.0.13</version.gnu.getopt>
     <version.org.hawkular.accounts>1.0.8.Final</version.org.hawkular.accounts>
     <version.org.hawkular.agent>0.3.3.Final</version.org.hawkular.agent>
-    <version.org.hawkular.alerts>0.3.0.Final</version.org.hawkular.alerts>
+    <version.org.hawkular.alerts>0.3.1.Final</version.org.hawkular.alerts>
     <version.org.hawkular.availCreator>${project.version}</version.org.hawkular.availCreator>
     <version.org.hawkular.bus>0.3.3.Final</version.org.hawkular.bus>
     <version.org.hawkular.commons>0.1.1.Final</version.org.hawkular.commons>
@@ -154,7 +154,7 @@
       </dependency>
       <dependency>
         <groupId>org.hawkular.alerts</groupId>
-        <artifactId>hawkular-actions-email</artifactId>
+        <artifactId>hawkular-alerts-actions-email</artifactId>
         <version>${version.org.hawkular.alerts}</version>
         <type>war</type>
       </dependency>