Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed Sonar issue in SubDelivery.Java
[dmaap/datarouter.git]
/
datarouter-prov
/
pom.xml
diff --git
a/datarouter-prov/pom.xml
b/datarouter-prov/pom.xml
index
0f1030d
..
8473141
100755
(executable)
--- a/
datarouter-prov/pom.xml
+++ b/
datarouter-prov/pom.xml
@@
-57,7
+57,7
@@
<dependency>
\r
<groupId>com.thoughtworks.xstream</groupId>
\r
<artifactId>xstream</artifactId>
\r
<dependency>
\r
<groupId>com.thoughtworks.xstream</groupId>
\r
<artifactId>xstream</artifactId>
\r
- <version>
1.4.7
</version>
\r
+ <version>
${thoughtworks.version}
</version>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.json</groupId>
\r
</dependency>
\r
<dependency>
\r
<groupId>org.json</groupId>
\r
@@
-74,11
+74,6
@@
<artifactId>eelf-core</artifactId>
\r
<version>0.0.1</version>
\r
</dependency>
\r
<artifactId>eelf-core</artifactId>
\r
<version>0.0.1</version>
\r
</dependency>
\r
- <dependency>
\r
- <groupId>javax.servlet</groupId>
\r
- <artifactId>servlet-api</artifactId>
\r
- <version>2.5</version>
\r
- </dependency>
\r
<dependency>
\r
<groupId>org.eclipse.jetty</groupId>
\r
<artifactId>jetty-server</artifactId>
\r
<dependency>
\r
<groupId>org.eclipse.jetty</groupId>
\r
<artifactId>jetty-server</artifactId>
\r
@@
-200,6
+195,11
@@
<version>1.6.4</version>
\r
<scope>test</scope>
\r
</dependency>
\r
<version>1.6.4</version>
\r
<scope>test</scope>
\r
</dependency>
\r
+ <dependency>
\r
+ <groupId>org.apache.commons</groupId>
\r
+ <artifactId>commons-lang3</artifactId>
\r
+ <version>3.0</version>
\r
+ </dependency>
\r
<dependency>
\r
<groupId>org.mariadb.jdbc</groupId>
\r
<artifactId>mariadb-java-client</artifactId>
\r
<dependency>
\r
<groupId>org.mariadb.jdbc</groupId>
\r
<artifactId>mariadb-java-client</artifactId>
\r
@@
-208,7
+208,7
@@
<dependency>
\r
<groupId>org.eclipse.jetty.cdi</groupId>
\r
<artifactId>cdi-websocket</artifactId>
\r
<dependency>
\r
<groupId>org.eclipse.jetty.cdi</groupId>
\r
<artifactId>cdi-websocket</artifactId>
\r
- <version>
9.3.11.v20160721
</version>
\r
+ <version>
${jetty.version}
</version>
\r
</dependency>
\r
<dependency>
\r
<groupId>log4j</groupId>
\r
</dependency>
\r
<dependency>
\r
<groupId>log4j</groupId>
\r
@@
-277,7
+277,7
@@
<directory>src/main/resources</directory>
\r
<filtering>true</filtering>
\r
<includes>
\r
<directory>src/main/resources</directory>
\r
<filtering>true</filtering>
\r
<includes>
\r
- <include>**/proserver.properties</include>
\r
+ <include>**/pro
v
server.properties</include>
\r
</includes>
\r
</resource>
\r
<resource>
\r
</includes>
\r
</resource>
\r
<resource>
\r
@@
-426,10
+426,10
@@
<goal>copy-resources</goal>
\r
</goals>
\r
<configuration>
\r
<goal>copy-resources</goal>
\r
</goals>
\r
<configuration>
\r
- <outputDirectory>${basedir}/target/opt/app/datartr/
self_signed
</outputDirectory>
\r
+ <outputDirectory>${basedir}/target/opt/app/datartr/
aaf_certs
</outputDirectory>
\r
<resources>
\r
<resource>
\r
<resources>
\r
<resource>
\r
- <directory>${basedir}/
self_signed
</directory>
\r
+ <directory>${basedir}/
aaf_certs
</directory>
\r
<includes>
\r
<include>misc/**</include>
\r
<include>**/**</include>
\r
<includes>
\r
<include>misc/**</include>
\r
<include>**/**</include>
\r