Upgrade to Accounts 2.0.22.Final and Commons 0.4.0.Final

hawkular · Mar 1, 2016 · 5f2e78d · 5f2e78d
1 parent 0c840be
commit 5f2e78d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/hawkular-alerts-rest-tests/pom.xml b/hawkular-alerts-rest-tests/pom.xml
@@ -316,23 +316,23 @@
                       <version>${project.version}</version>
                       <type>war</type>
                       <overWrite>true</overWrite>
-                      <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/modules/org/hawkular/nest/main/deployments</outputDirectory>
+                      <outputDirectory>${project.build.directory}/${project.build.finalName}/modules/system/layers/hawkular/org/hawkular/nest/main/deployments</outputDirectory>
                       <destFileName>hawkular-alerts-rest.war</destFileName>
                     </artifactItem>
                     <artifactItem>
                       <groupId>org.hawkular.alerts</groupId>
                       <artifactId>hawkular-alerts-actions-email</artifactId>
                       <type>war</type>
                       <overWrite>true</overWrite>
-                      <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/modules/org/hawkular/nest/main/deployments</outputDirectory>
+                      <outputDirectory>${project.build.directory}/${project.build.finalName}/modules/system/layers/hawkular/org/hawkular/nest/main/deployments</outputDirectory>
                       <destFileName>hawkular-alerts-actions-email.war</destFileName>
                     </artifactItem>
                     <artifactItem>
                       <groupId>org.hawkular.alerts</groupId>
                       <artifactId>hawkular-alerts-actions-file</artifactId>
                       <type>war</type>
                       <overWrite>true</overWrite>
-                      <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/modules/org/hawkular/nest/main/deployments</outputDirectory>
+                      <outputDirectory>${project.build.directory}/${project.build.finalName}/modules/system/layers/hawkular/org/hawkular/nest/main/deployments</outputDirectory>
                       <destFileName>hawkular-alerts-actions-file.war</destFileName>
                     </artifactItem>
                   </artifactItems>
@@ -353,7 +353,7 @@
                   <goal>copy-resources</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/standalone/configuration</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/standalone/configuration</outputDirectory>
                   <overwrite>true</overwrite>
                   <resources>
                     <resource>
@@ -373,7 +373,7 @@
                   <goal>copy-resources</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/standalone/data</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/standalone/data</outputDirectory>
                   <overwrite>true</overwrite>
                   <resources>
                     <resource>
@@ -403,12 +403,12 @@
                   <transformationSets>
                     <!-- standalone.xml -->
                     <transformationSet>
-                      <dir>${project.build.directory}/${project.artifactId}-${project.version}/standalone/configuration</dir>
+                      <dir>${project.build.directory}/${project.build.finalName}/standalone/configuration</dir>
                       <stylesheet>src/test/resources/standalone-hawkular.xsl</stylesheet>
                       <includes>
                         <include>standalone.xml</include>
                       </includes>
-                      <outputDir>${project.build.directory}/${project.artifactId}-${project.version}/standalone/configuration</outputDir>
+                      <outputDir>${project.build.directory}/${project.build.finalName}/standalone/configuration</outputDir>
                     </transformationSet>
                   </transformationSets>
                 </configuration>
@@ -421,7 +421,7 @@
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-maven-plugin</artifactId>
             <configuration>
-              <jboss-home>${project.build.directory}/${project.artifactId}-${project.version}</jboss-home>
+              <jboss-home>${project.build.directory}/${project.build.finalName}</jboss-home>
               <skip>${skipTests}</skip>
               <startupTimeout>240</startupTimeout>
               <port>${hawkular.management.port}</port>
@@ -434,7 +434,7 @@
                 <javaOpt>-Djava.awt.headless=true</javaOpt>
                 <javaOpt>-Djboss.bind.address=${hawkular.host}</javaOpt>
                 <javaOpt>-Djboss.socket.binding.port-offset=${hawkular.port.offset}</javaOpt>
-                <javaOpt>-Dkeycloak.import=${project.build.directory}/${project.artifactId}-${project.version}/standalone/configuration/hawkular-realm-for-dev.json</javaOpt>
+                <javaOpt>-Dkeycloak.import=${project.build.directory}/${project.build.finalName}/standalone/configuration/hawkular-realm-for-dev.json</javaOpt>
                 <javaOpt>-Dmail.smtp.host=localhost</javaOpt>
                 <javaOpt>-Dmail.smtp.port=2525</javaOpt>
                 <!--<javaOpt>-Xdebug</javaOpt>-->

diff --git a/pom.xml b/pom.xml
@@ -91,8 +91,8 @@
     <version.org.codehaus.groovy.maven>1.0</version.org.codehaus.groovy.maven>
     <version.org.drools>6.3.0.Final</version.org.drools>
     <version.org.freemarker>2.3.17</version.org.freemarker>
-    <version.org.hawkular.accounts>2.0.21.Final</version.org.hawkular.accounts>
-    <version.org.hawkular.commons>0.3.5.Final</version.org.hawkular.commons>
+    <version.org.hawkular.accounts>2.0.22.Final</version.org.hawkular.accounts>
+    <version.org.hawkular.commons>0.4.0.Final</version.org.hawkular.commons>
     <version.org.hawkular.metrics>0.12.0.Final</version.org.hawkular.metrics>
     <version.org.infinispan.wildfly>8.0.1.Final</version.org.infinispan.wildfly>
     <version.org.infinispan.eap64>5.2.9.Final</version.org.infinispan.eap64>