HWKMETRICS-145 Upgrade to WF9

hawkular · Jun 22, 2015 · 86eb802 · 86eb802
1 parent 7b0cbc3
commit 86eb802
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 33 deletions.
diff --git a/README.adoc b/README.adoc
@@ -47,7 +47,7 @@ as possible.
 
 == Getting started with a release build
 
-http://wildfly.org/downloads/[Download a Wildfly 8.2.0.Final] archive and expand it somewhere on your disk.
+http://wildfly.org/downloads/[Download a Wildfly 9] archive and expand it somewhere on your disk.
 
 Check out the https://github.com/hawkular/hawkular-metrics/releases[Metrics releases] page and download the latest
 version of the web application archive: `hawkular-metrics-api-jaxrs-X.Y.Z.war`

diff --git a/api/metrics-api-jaxrs/pom.xml b/api/metrics-api-jaxrs/pom.xml
@@ -34,17 +34,6 @@
   <name>Hawkular Metrics JAXRS API</name>
   <description>The REST-api of Hawkular-Metrics implemented via JAXRS archive</description>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.wildfly.bom</groupId>
-        <artifactId>jboss-javaee-7.0-with-resteasy</artifactId>
-        <version>${version.org.wildfly}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
 
     <dependency>

diff --git a/containers/cassandra-docker/pom.xml b/containers/cassandra-docker/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>cassandra-docker</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cassandra Docker Image</name>

diff --git a/containers/cassandra-seed-provider/pom.xml b/containers/cassandra-seed-provider/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>cassandra-seed-provider</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
 
   <name>Cassandra Seed Provider</name>
 

diff --git a/containers/container-tests/pom.xml b/containers/container-tests/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>hawkular-container-tests</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Hawkular Metrics Container Tests</name>
@@ -38,6 +37,18 @@
     <maven.test.skip>true</maven.test.skip>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.wildfly.bom</groupId>
+        <artifactId>jboss-javaee-7.0-with-all</artifactId>
+        <version>8.2.0.Final</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.fabric8</groupId>

diff --git a/containers/hawkular-metrics-docker/pom.xml b/containers/hawkular-metrics-docker/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>hawkular-metrics-docker</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hawkular Metrics Docker Image</name>

diff --git a/containers/kubernetes/pom.xml b/containers/kubernetes/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>hawkular-metrics-kubernetes-app</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
 
   <name>Hawkular Metrics Kubernetes Application</name>
 

diff --git a/containers/pom.xml b/containers/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>hawkular-metrics-containers</artifactId>
-  <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hawkular Metric Containers</name>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular</groupId>
     <artifactId>hawkular-parent</artifactId>
-    <version>15</version>
+    <version>16</version>
   </parent>
 
   <groupId>org.hawkular.metrics</groupId>
@@ -294,20 +294,6 @@
 
   <profiles>
 
-    <!-- Note that the test.debug profile has moved to hawkular-parent -->
-
-    <profile>
-      <id>download_wildfly</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-dist</artifactId>
-          <version>${version.org.wildfly}</version>
-          <type>zip</type>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <profile>
       <id>publish</id>
 

diff --git a/rest-tests/pom.xml b/rest-tests/pom.xml
@@ -83,6 +83,15 @@
       <artifactId>resteasy-client</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- commons-io added while upgrading to WLF9.CR2 -->
+    <!-- For some reason we need to add it manually now -->
+    <!-- TODO remove when resteasy-client dependency resolution is fixed -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>