Skip to content

Commit

Permalink
Preparation for 0.2.0.Final
Browse files Browse the repository at this point in the history
- up dep versions to match the Hawkular/WF9 branch
- remove H2 dep in engine, H2 support now in a separate branch
- remove unnecessary extend of BasicLogger, it seemed to cause at least one
  test run issue. And fix one import in a MsgLogger.
  • Loading branch information
jshaughn committed Jun 23, 2015
1 parent 91474d5 commit 611da1b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
*/
package org.hawkular.actions.api.log;

import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
import org.jboss.logging.Message;
import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageLogger;
import org.jboss.logging.annotations.ValidIdRange;

Expand All @@ -30,7 +29,7 @@
*/
@MessageLogger(projectCode = "HAWKALERT")
@ValidIdRange(min = 240000, max = 249999)
public interface MsgLogger extends BasicLogger {
public interface MsgLogger {
MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName());

@LogMessage(level = Logger.Level.INFO)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.hawkular.alerts.api.log;

import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger;
import org.jboss.logging.Message;
import org.jboss.logging.annotations.LogMessage;
Expand All @@ -30,7 +29,7 @@
*/
@MessageLogger(projectCode = "HAWKALERT")
@ValidIdRange(min = 200000, max = 209999)
public interface MsgLogger extends BasicLogger {
public interface MsgLogger {
MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName());

@LogMessage(level = Logger.Level.WARN)
Expand Down
7 changes: 0 additions & 7 deletions hawkular-alerts-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${version.com.h2database}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand Down
14 changes: 8 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -83,17 +84,18 @@
<org.hawkular.wildfly.home>${project.basedir}/../../hawkular-bus/hawkular-nest/hawkular-nest-distro/target/wildfly-${version.org.wildfly}</org.hawkular.wildfly.home>
<org.hawkular.wildfly.deployments>${org.hawkular.wildfly.home}/modules/system/layers/base/org/hawkular/nest/main/deployments</org.hawkular.wildfly.deployments>
<version.com.datastax.cassandra>2.1.2</version.com.datastax.cassandra>
<version.com.h2database>1.4.185</version.com.h2database>
<!-- <version.com.h2database>1.4.185</version.com.h2database> -->
<version.javaee.spec>7.0</version.javaee.spec>
<version.maven-patch-plugin>1.2</version.maven-patch-plugin>
<version.org.apache.cassandra>2.1.1</version.org.apache.cassandra>
<version.org.codehaus.groovy.maven>1.0</version.org.codehaus.groovy.maven>
<version.org.drools>6.1.0.Final</version.org.drools>
<!-- this is for integration testing, and should be a formal release, not the version of the parent -->
<version.org.hawkular>1.0.0.Alpha1</version.org.hawkular>
<version.org.hawkular.accounts>1.0.4</version.org.hawkular.accounts>
<version.org.hawkular.bus>0.0.6</version.org.hawkular.bus>
<version.org.hawkular.nest>0.0.6</version.org.hawkular.nest>
<version.org.hawkular.metrics>0.3.3</version.org.hawkular.metrics>
<version.org.hawkular.accounts>1.0.6</version.org.hawkular.accounts>
<version.org.hawkular.bus>0.1.1</version.org.hawkular.bus>
<version.org.hawkular.nest>0.1.1</version.org.hawkular.nest>
<version.org.hawkular.metrics>0.4.0</version.org.hawkular.metrics>
<version.org.slf4j>1.7.2</version.org.slf4j>
<version.org.yaml>1.11</version.org.yaml>
</properties>
Expand Down

0 comments on commit 611da1b

Please sign in to comment.