Code Review
/
holmes
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed the CLM Issues
[holmes/common.git]
/
holmes-actions
/
pom.xml
diff --git
a/holmes-actions/pom.xml
b/holmes-actions/pom.xml
index
b13870a
..
9a516b6
100644
(file)
--- a/
holmes-actions/pom.xml
+++ b/
holmes-actions/pom.xml
@@
-1,5
+1,5
@@
<?xml version="1.0" encoding="UTF-8"?>
\r
<?xml version="1.0" encoding="UTF-8"?>
\r
-<!-- Copyright 2017 ZTE Corporation. Licensed under the Apache License, Version
\r
+<!-- Copyright 2017
-2020
ZTE Corporation. Licensed under the Apache License, Version
\r
2.0 (the "License"); you may not use this file except in compliance with
\r
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
\r
Unless required by applicable law or agreed to in writing, software distributed
\r
2.0 (the "License"); you may not use this file except in compliance with
\r
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
\r
Unless required by applicable law or agreed to in writing, software distributed
\r
@@
-12,31
+12,40
@@
<parent>
\r
<groupId>org.onap.holmes.common</groupId>
\r
<artifactId>holmes-common-parent</artifactId>
\r
<parent>
\r
<groupId>org.onap.holmes.common</groupId>
\r
<artifactId>holmes-common-parent</artifactId>
\r
- <version>1.
1
.0-SNAPSHOT</version>
\r
+ <version>1.
3
.0-SNAPSHOT</version>
\r
</parent>
\r
\r
<name>holmes-common-service</name>
\r
<packaging>jar</packaging>
\r
<artifactId>holmes-actions</artifactId>
\r
<dependencies>
\r
</parent>
\r
\r
<name>holmes-common-service</name>
\r
<packaging>jar</packaging>
\r
<artifactId>holmes-actions</artifactId>
\r
<dependencies>
\r
+ <dependency>
\r
+ <groupId>ch.qos.logback</groupId>
\r
+ <artifactId>logback-classic</artifactId>
\r
+ </dependency>
\r
<dependency>
\r
<groupId>org.onap.msb.java-sdk</groupId>
\r
<artifactId>msb-java-sdk</artifactId>
\r
<dependency>
\r
<groupId>org.onap.msb.java-sdk</groupId>
\r
<artifactId>msb-java-sdk</artifactId>
\r
+ <scope>provided</scope>
\r
<exclusions>
\r
<exclusion>
\r
<groupId>com.eclipsesource.jaxrs</groupId>
\r
<artifactId>jersey-all</artifactId>
\r
</exclusion>
\r
<exclusions>
\r
<exclusion>
\r
<groupId>com.eclipsesource.jaxrs</groupId>
\r
<artifactId>jersey-all</artifactId>
\r
</exclusion>
\r
+ <exclusion>
\r
+ <groupId>ch.qos.logback</groupId>
\r
+ <artifactId>logback-classic</artifactId>
\r
+ </exclusion>
\r
+ <exclusion>
\r
+ <groupId>org.slf4j</groupId>
\r
+ <artifactId>slf4j-api</artifactId>
\r
+ </exclusion>
\r
</exclusions>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.apache.geronimo.specs</groupId>
\r
<artifactId>geronimo-jms_1.1_spec</artifactId>
\r
</dependency>
\r
</exclusions>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.apache.geronimo.specs</groupId>
\r
<artifactId>geronimo-jms_1.1_spec</artifactId>
\r
</dependency>
\r
- <dependency>
\r
- <groupId>org.apache.activemq</groupId>
\r
- <artifactId>activemq-pool</artifactId>
\r
- </dependency>
\r
<dependency>
\r
<groupId>org.antlr</groupId>
\r
<artifactId>stringtemplate</artifactId>
\r
<dependency>
\r
<groupId>org.antlr</groupId>
\r
<artifactId>stringtemplate</artifactId>
\r
@@
-44,6
+53,7
@@
<dependency>
\r
<groupId>io.dropwizard</groupId>
\r
<artifactId>dropwizard-core</artifactId>
\r
<dependency>
\r
<groupId>io.dropwizard</groupId>
\r
<artifactId>dropwizard-core</artifactId>
\r
+ <scope>provided</scope>
\r
<exclusions>
\r
<exclusion>
\r
<groupId>com.fasterxml.jackson.core</groupId>
\r
<exclusions>
\r
<exclusion>
\r
<groupId>com.fasterxml.jackson.core</groupId>
\r
@@
-71,23
+81,24
@@
<groupId>com.fasterxml.jackson.dataformat</groupId>
\r
<artifactId>jackson-dataformat-xml</artifactId>
\r
</exclusion>
\r
<groupId>com.fasterxml.jackson.dataformat</groupId>
\r
<artifactId>jackson-dataformat-xml</artifactId>
\r
</exclusion>
\r
+ <exclusion>
\r
+ <groupId>org.slf4j</groupId>
\r
+ <artifactId>slf4j-api</artifactId>
\r
+ </exclusion>
\r
+ <exclusion>
\r
+ <groupId>org.yaml</groupId>
\r
+ <artifactId>snakeyaml</artifactId>
\r
+ </exclusion>
\r
</exclusions>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.projectlombok</groupId>
\r
<artifactId>lombok</artifactId>
\r
</dependency>
\r
</exclusions>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.projectlombok</groupId>
\r
<artifactId>lombok</artifactId>
\r
</dependency>
\r
- <dependency>
\r
- <groupId>io.dropwizard</groupId>
\r
- <artifactId>dropwizard-jdbi</artifactId>
\r
- </dependency>
\r
- <dependency>
\r
- <groupId>org.quartz-scheduler</groupId>
\r
- <artifactId>quartz</artifactId>
\r
- </dependency>
\r
<dependency>
\r
<groupId>junit</groupId>
\r
<artifactId>junit</artifactId>
\r
<dependency>
\r
<groupId>junit</groupId>
\r
<artifactId>junit</artifactId>
\r
+ <scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.hamcrest</groupId>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.hamcrest</groupId>
\r
@@
-96,32
+107,21
@@
<dependency>
\r
<groupId>org.powermock</groupId>
\r
<artifactId>powermock-module-junit4</artifactId>
\r
<dependency>
\r
<groupId>org.powermock</groupId>
\r
<artifactId>powermock-module-junit4</artifactId>
\r
+ <scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
<groupId>io.dropwizard</groupId>
\r
<artifactId>dropwizard-jdbi</artifactId>
\r
</dependency>
\r
<dependency>
\r
<groupId>io.dropwizard</groupId>
\r
<artifactId>dropwizard-jdbi</artifactId>
\r
- </dependency>
\r
- <dependency>
\r
- <groupId>com.google.guava</groupId>
\r
- <artifactId>guava</artifactId>
\r
- </dependency>
\r
- <dependency>
\r
- <groupId>org.apache.poi</groupId>
\r
- <artifactId>poi</artifactId>
\r
- <version>3.10.1</version>
\r
+ <scope>provided</scope>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.easymock</groupId>
\r
<artifactId>easymock</artifactId>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.easymock</groupId>
\r
<artifactId>easymock</artifactId>
\r
- </dependency>
\r
- <dependency>
\r
- <groupId>org.powermock</groupId>
\r
- <artifactId>powermock-api-easymock</artifactId>
\r
<scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.powermock</groupId>
\r
<scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.powermock</groupId>
\r
- <artifactId>powermock-api-
mockito
</artifactId>
\r
+ <artifactId>powermock-api-
easymock
</artifactId>
\r
<scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
<scope>test</scope>
\r
</dependency>
\r
<dependency>
\r
@@
-137,54
+137,47
@@
<dependency>
\r
<groupId>org.glassfish.jersey.containers</groupId>
\r
<artifactId>jersey-container-servlet-core</artifactId>
\r
<dependency>
\r
<groupId>org.glassfish.jersey.containers</groupId>
\r
<artifactId>jersey-container-servlet-core</artifactId>
\r
- <version>${jersey.version}</version>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.glassfish.jersey.core</groupId>
\r
<artifactId>jersey-common</artifactId>
\r
</dependency>
\r
<dependency>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.glassfish.jersey.core</groupId>
\r
<artifactId>jersey-common</artifactId>
\r
</dependency>
\r
<dependency>
\r
- <groupId>org.
apache.httpcomponents
</groupId>
\r
- <artifactId>
http
client</artifactId>
\r
+ <groupId>org.
glassfish.jersey.core
</groupId>
\r
+ <artifactId>
jersey-
client</artifactId>
\r
</dependency>
\r
</dependency>
\r
-
\r
<dependency>
\r
<dependency>
\r
- <groupId>net.sf.json-lib</groupId>
\r
- <artifactId>json-lib</artifactId>
\r
- <version>2.4</version>
\r
- <classifier>jdk15</classifier>
\r
+ <groupId>org.apache.httpcomponents</groupId>
\r
+ <artifactId>httpclient</artifactId>
\r
<exclusions>
\r
<exclusion>
\r
<exclusions>
\r
<exclusion>
\r
- <groupId>commons-collections</groupId>
\r
- <artifactId>commons-collections</artifactId>
\r
- </exclusion>
\r
- <exclusion>
\r
- <groupId>commons-beanutils</groupId>
\r
- <artifactId>commons-beanutils</artifactId>
\r
+ <groupId>commons-codec</groupId>
\r
+ <artifactId>commons-codec</artifactId>
\r
</exclusion>
\r
</exclusions>
\r
</dependency>
\r
</exclusion>
\r
</exclusions>
\r
</dependency>
\r
+ <dependency>
\r
+ <groupId>commons-codec</groupId>
\r
+ <artifactId>commons-codec</artifactId>
\r
+ </dependency>
\r
<dependency>
\r
<groupId>commons-collections</groupId>
\r
<artifactId>commons-collections</artifactId>
\r
<version>3.2.2</version>
\r
</dependency>
\r
<dependency>
\r
<groupId>commons-collections</groupId>
\r
<artifactId>commons-collections</artifactId>
\r
<version>3.2.2</version>
\r
</dependency>
\r
- <dependency>
\r
- <groupId>commons-beanutils</groupId>
\r
- <artifactId>commons-beanutils</artifactId>
\r
- <version>1.8.3</version>
\r
- </dependency>
\r
<dependency>
\r
<groupId>com.google.code.gson</groupId>
\r
<artifactId>gson</artifactId>
\r
<version>2.8.2</version>
\r
</dependency>
\r
<dependency>
\r
<dependency>
\r
<groupId>com.google.code.gson</groupId>
\r
<artifactId>gson</artifactId>
\r
<version>2.8.2</version>
\r
</dependency>
\r
<dependency>
\r
- <groupId>com.alibaba</groupId>
\r
- <artifactId>fastjson</artifactId>
\r
- <version>1.1.23</version>
\r
+ <groupId>com.google.guava</groupId>
\r
+ <artifactId>guava</artifactId>
\r
+ </dependency>
\r
+ <dependency>
\r
+ <groupId>com.google.code.gson</groupId>
\r
+ <artifactId>gson</artifactId>
\r
</dependency>
\r
</dependency>
\r
-
\r
</dependencies>
\r
<build>
\r
<resources>
\r
</dependencies>
\r
<build>
\r
<resources>
\r