Upgrade to hawkular-parent 18

hawkular · Jul 17, 2015 · 83a15d3 · 83a15d3
1 parent fb75fcb
commit 83a15d3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/modules/avail-creator/pom.xml b/modules/avail-creator/pom.xml
@@ -40,7 +40,7 @@
 
     <dependency>
       <groupId>org.jboss.spec.javax.ejb</groupId>
-      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+      <artifactId>jboss-ejb-api_3.2_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java
@@ -17,10 +17,10 @@
 package org.hawkular.component.availcreator;
 
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.LogMessage;
 import org.jboss.logging.Logger;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 import org.jboss.logging.annotations.Cause;
 
 /**

diff --git a/modules/pinger/pom.xml b/modules/pinger/pom.xml
@@ -73,7 +73,7 @@
 
     <dependency>
       <groupId>org.jboss.spec.javax.ejb</groupId>
-      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+      <artifactId>jboss-ejb-api_3.2_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -125,6 +125,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -136,6 +137,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-processor</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java b/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
@@ -19,10 +19,10 @@
 import java.io.IOException;
 
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.LogMessage;
 import org.jboss.logging.Logger;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 import org.jboss.logging.annotations.Cause;
 
 /**

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.hawkular</groupId>
     <artifactId>hawkular-parent</artifactId>
-    <version>17</version>
+    <version>18</version>
   </parent>
 
   <groupId>org.hawkular</groupId>