Merge pull request #393 from ppalaga/hawkular-parent-19

Import WildFly BoM
hawkular · Aug 6, 2015 · 012eeec · 012eeec
2 parents 52e204f + a8501a9
commit 012eeec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/...les/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy b/...les/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *

diff --git a/modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1ITest.groovy b/modules/end-to-end-test/src/test/groovy/org/hawkular/integration/test/Scenario1ITest.groovy
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *

diff --git a/...es/end-to-end-test/src/test/groovy/org/hawkular/inventory/rest/test/InventoryITest.groovy b/...es/end-to-end-test/src/test/groovy/org/hawkular/inventory/rest/test/InventoryITest.groovy
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.hawkular</groupId>
     <artifactId>hawkular-parent</artifactId>
-    <version>18</version>
+    <version>19</version>
   </parent>
 
   <groupId>org.hawkular</groupId>
@@ -244,6 +244,15 @@
         <artifactId>commons-io</artifactId>
         <version>${version.commons.io}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.wildfly.bom</groupId>
+        <artifactId>jboss-javaee-7.0-wildfly</artifactId>
+        <version>${version.org.wildfly}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>