Maven fixes.

modules/hawkular-api/hawkular-rest-api/pom.xml → modules/hawkular-api-parent/hawkular-rest-api/pom.xml

@@ -22,12 +22,13 @@
 
   <parent>
     <groupId>org.hawkular</groupId>
-    <artifactId>hawkular</artifactId>
+    <artifactId>hawkular-api-parent</artifactId>
     <version>1.0.0.Alpha8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>hawkular-rest-api</artifactId>
+  <version>1.0.0.Alpha8-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Hawkular: REST API Web Application</name>

modules/hawkular-api/hawkular-rx/pom.xml → modules/hawkular-api-parent/hawkular-rx/pom.xml

@@ -22,12 +22,13 @@
 
   <parent>
     <groupId>org.hawkular</groupId>
-    <artifactId>hawkular</artifactId>
+    <artifactId>hawkular-api-parent</artifactId>
     <version>1.0.0.Alpha8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>hawkular-rx</artifactId>
+  <version>1.0.0.Alpha8-SNAPSHOT</version>
 
   <name>Hawkular: RX extensions layer</name>
   <description>blah</description>

modules/hawkular-api/pom.xml → modules/hawkular-api-parent/pom.xml

@@ -28,7 +28,8 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>hawkular-api</artifactId>
+  <artifactId>hawkular-api-parent</artifactId>
+  <version>1.0.0.Alpha8-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hawkular: API parent pom</name>

modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java

@@ -91,7 +91,7 @@ public void startUp() {
         // we use just an observable inventory here, because it allows us to see all the tenants. This essentially
         // circumvents any authz present on the inventory.
         // We need that though because pinger doesn't have storage of its own and is considered "trusted", so it's ok.
-        Set<Resource> urls = inventory.tenants().getAll().allResourceTypes().getAll(With.id(PingDestination.URL_TYPE))
+        Set<Resource> urls = inventory.tenants().getAll().resourceTypes().getAll(With.id(PingDestination.URL_TYPE))
                 .resources().getAll().entities();
         Log.LOG.iInitializedWithUrls(urls.size());
 

modules/pinger/src/main/java/org/hawkular/component/pinger/TraitsPublisher.java

@@ -53,7 +53,7 @@ public void publish(PingStatus status) {
 
         try {
             Resources.ReadWrite resourceAccess = inventory.tenants().get(dest.getTenantId()).environments()
-                    .get(dest.getEnvironmentId()).feedlessResources();
+                    .get(dest.getEnvironmentId()).resources();
 
             Resource resource = resourceAccess.get(dest.getResourceId()).entity();
 
@@ -76,7 +76,7 @@ public void publish(PingStatus status) {
                 updateBuilder.withProperty(TRAIT_PROPERTY_PREFIX + "powered-by", poweredBy);
             }
 
-            inventory.tenants().get(dest.getTenantId()).environments().get(dest.getEnvironmentId()).feedlessResources()
+            inventory.tenants().get(dest.getTenantId()).environments().get(dest.getEnvironmentId()).resources()
                     .update(dest.getResourceId(), updateBuilder.build());
         } catch (EntityNotFoundException e) {
             Log.LOG.iResourceNotFound(dest.getResourceId(), dest.getTenantId());

pom.xml

@@ -57,7 +57,7 @@
     <module>modules/pinger</module>
     <module>modules/avail-creator</module>
     <module>modules/redhat-access-integration-backend</module>
-    <module>modules/hawkular-api</module>
+    <module>modules/hawkular-api-parent</module>
     <module>dist</module>
     <module>modules/end-to-end-test</module>
     <module>modules/nest</module>
@@ -95,7 +95,7 @@
     <version.org.hawkular.commons>0.2.3.Final</version.org.hawkular.commons>
     <version.org.hawkular.cmdgw>0.10.4.Final-SRC-revision-026a46590f53179096f794657d9c6b813313f297</version.org.hawkular.cmdgw>
     <version.org.hawkular.metrics>0.9.0.Final</version.org.hawkular.metrics>
-    <version.org.hawkular.inventory>0.10.0.Final-SRC-revision-64a6eac8decdd9bcfea3c7d5037c2212ecb6485f</version.org.hawkular.inventory>
+    <version.org.hawkular.inventory>0.10.0.Final-SNAPSHOT</version.org.hawkular.inventory>
     <version.org.keycloak>1.6.1.Final</version.org.keycloak>
     <version.rxjava>1.0.16</version.rxjava>
     <version.org.testng>6.5.2</version.org.testng>