Merge pull request #390 from Jiri-Kremser/inventory-version++

Inventory version++
hawkular · Aug 4, 2015 · db0e41a · db0e41a
2 parents 4b412f2 + a847906
commit db0e41a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/dist/assembly.xml b/dist/assembly.xml
@@ -103,7 +103,7 @@
       <outputDirectory>${hawkular.dist.zip.root.dir}/modules/org/hawkular/nest/main/deployments</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>org.hawkular.inventory:hawkular-integrated-inventory-rest</include>
+        <include>org.hawkular.inventory:hawkular-inventory-dist</include>
         <include>org.hawkular.bus:hawkular-feed-comm-war</include>
         <include>org.hawkular:hawkular-pinger</include>
         <include>org.hawkular:hawkular-avail-creator</include>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>org.hawkular.inventory</groupId>
-      <artifactId>hawkular-integrated-inventory-rest</artifactId>
+      <artifactId>hawkular-inventory-dist</artifactId>
       <type>war</type>
     </dependency>
     <dependency>

diff --git a/dist/src/main/resources/wildfly/patches/standalone.xsl b/dist/src/main/resources/wildfly/patches/standalone.xsl
@@ -968,7 +968,7 @@
           <enable-basic-auth>true</enable-basic-auth>
           <credential name="secret"><xsl:value-of select="$uuid.hawkular.accounts.backend" /></credential>
         </secure-deployment>
-        <secure-deployment name="hawkular-integrated-inventory-rest.war">
+        <secure-deployment name="hawkular-inventory-dist.war">
           <realm>hawkular</realm>
           <resource>hawkular-accounts-backend</resource>
           <use-resource-role-mappings>true</use-resource-role-mappings>

diff --git a/modules/end-to-end-test/pom.xml b/modules/end-to-end-test/pom.xml
@@ -35,7 +35,7 @@
 
     <dependency>
       <groupId>org.hawkular.inventory</groupId>
-      <artifactId>inventory-api</artifactId>
+      <artifactId>hawkular-inventory-api</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/modules/pinger/pom.xml b/modules/pinger/pom.xml
@@ -49,13 +49,7 @@
 
     <dependency>
       <groupId>org.hawkular.inventory</groupId>
-      <artifactId>inventory-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hawkular.inventory</groupId>
-      <artifactId>inventory-bus-api</artifactId>
+      <artifactId>hawkular-inventory-api</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/modules/pinger/src/main/webapp/WEB-INF/jboss-all.xml b/modules/pinger/src/main/webapp/WEB-INF/jboss-all.xml
@@ -19,6 +19,6 @@
 -->
 <jboss umlns="urn:jboss:1.0">
   <jboss-deployment-dependencies xmlns="urn:jboss:deployment-dependencies:1.0">
-    <dependency name="hawkular-integrated-inventory-rest.war"/>
+    <dependency name="hawkular-inventory-dist.war"/>
   </jboss-deployment-dependencies>
 </jboss>
diff --git a/modules/pinger/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/modules/pinger/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -22,7 +22,7 @@
     <dependencies>
       <module name="org.hawkular.nest" />
       <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import"/>
-      <module name="deployment.hawkular-integrated-inventory-rest.war" services="import"/>
+      <module name="deployment.hawkular-inventory-dist.war" services="import"/>
     </dependencies>
   </deployment>
 </jboss-deployment-structure>
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
     <version.org.hawkular.bus>0.3.3.Final</version.org.hawkular.bus>
     <version.org.hawkular.commons>0.1.1.Final</version.org.hawkular.commons>
     <version.org.hawkular.metrics>0.5.0.Final</version.org.hawkular.metrics>
-    <version.org.hawkular.inventory>0.2.0.Alpha2</version.org.hawkular.inventory>
+    <version.org.hawkular.inventory>0.2.0.Final</version.org.hawkular.inventory>
     <version.org.hawkular.nest>0.3.3.Final</version.org.hawkular.nest>
     <version.org.keycloak>1.3.1.Final</version.org.keycloak>
     <version.org.testng>6.5.2</version.org.testng>
@@ -183,7 +183,7 @@
 
       <dependency>
         <groupId>org.hawkular.inventory</groupId>
-        <artifactId>inventory-api</artifactId>
+        <artifactId>hawkular-inventory-api</artifactId>
         <version>${version.org.hawkular.inventory}</version>
       </dependency>
 
@@ -195,13 +195,7 @@
 
       <dependency>
         <groupId>org.hawkular.inventory</groupId>
-        <artifactId>inventory-bus-api</artifactId>
-        <version>${version.org.hawkular.inventory}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hawkular.inventory</groupId>
-        <artifactId>hawkular-integrated-inventory-rest</artifactId>
+        <artifactId>hawkular-inventory-dist</artifactId>
         <version>${version.org.hawkular.inventory}</version>
         <type>war</type>
       </dependency>