summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-08-24 21:53:16 -0400
committerdglFromAtt <dgl@research.att.com>2018-08-24 21:53:27 -0400
commit3252202a1444ae98df477b6964aa8b09666a828c (patch)
treef0311d27e8da0a3c41ccbaef02926725d7245187
parentf17031a9f6bf4913aa3ba86f4322b9ebc2183a87 (diff)
Updated versions for sonar violations
Change-Id: I9c23d1adb1905e1cb580b919978b5682bf4266bd Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-656
-rw-r--r--pom.xml24
-rw-r--r--version.properties2
2 files changed, 17 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index 3a131b8..1cf8e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,8 +212,9 @@
<artifactId>jackson-databind</artifactId>
<!-- for DMAAP-205, a point release on the common version
addresses a security issue. Note the add notation here
- -->
<version>${jackson.version}.1</version>
+ -->
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -230,20 +231,26 @@
<artifactId>logback-classic</artifactId>
<version>1.2.0</version>
</dependency>
+<!-- DMAAP-656:
+ - removed this dependency because it utilized a third party
+ - lib called com.google.guava:20.0 which had severe threat identified.
+ - build code without this dependency and it seemed to work, so perhaps it
+ - is not needed?
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
- <version>1.5.13</version>
+ <version>${swagger.version}</version>
</dependency>
+ -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
- <version>1.5.13</version>
+ <version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.5.13</version>
+ <version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -286,7 +293,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <version>1.11</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
<dependency>
@@ -345,12 +352,13 @@
</site>
</distributionManagement>
<properties>
- <jackson.version>2.8.11</jackson.version>
+ <swagger.version>1.5.19</swagger.version>
+ <jackson.version>2.9.5</jackson.version>
<jersey.version>2.26</jersey.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jettyVersion>9.3.9.v20160517</jettyVersion>
+ <jettyVersion>9.3.8.RC0</jettyVersion>
<eelf.version>0.0.1</eelf.version>
- <artifact.version>1.0.14-SNAPSHOT</artifact.version>
+ <artifact.version>1.0.15-SNAPSHOT</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/version.properties b/version.properties
index 8add583..815d79c 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=14
+patch=15
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins