summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortangpeng <tang.peng5@zte.com.cn>2017-02-25 18:09:12 +0800
committertangpeng <tang.peng5@zte.com.cn>2017-02-27 10:38:56 +0800
commita83d08161f34b503fbb9275418b0e828a6d219eb (patch)
treec8d0cd37049dbd1472d55c20a383b74831d8d257
parent2b4967270e624300f2890d604a6d1f013c084f10 (diff)
Modify engine-d pom
Change-Id: Id86a6344a6112d86cd7749d6d7848a4dff37ec4d Issue-Id:HOLMES-47 Signed-off-by: tangpeng <tang.peng5@zte.com.cn>
-rw-r--r--engine-d/pom.xml2
-rw-r--r--engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java2
-rw-r--r--pom.xml1
3 files changed, 2 insertions, 3 deletions
diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 669b4f1..7075c2d 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.16</version>
+ <version>2.22.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
diff --git a/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java b/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java
index 4af2980..6ce0fb6 100644
--- a/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java
+++ b/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java
@@ -32,7 +32,7 @@ public class CorrelationRuleMapper implements ResultSetMapper<CorrelationRule> {
correlationRule.setDescription(resultSet.getString("description"));
correlationRule.setEnabled(resultSet.getInt("enable"));
correlationRule.setTemplateID(resultSet.getInt("templateID"));
- correlationRule.setEngineId(resultSet.getString("engineID"));
+ correlationRule.setEngineID(resultSet.getString("engineID"));
correlationRule.setEngineType(resultSet.getString("engineType"));
correlationRule.setCreator(resultSet.getString("creator"));
correlationRule.setCreateTime(resultSet.getDate("createTime"));
diff --git a/pom.xml b/pom.xml
index eb6d821..c474eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,6 @@
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>