summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-09-19 06:59:20 -0500
committerInstrumental <jonathan.gathman@att.com>2018-09-19 06:59:31 -0500
commit413480483ae4dbbeb34b454ffc164f81867b4a9c (patch)
tree798b3febd13d8bfcc8a46fe61e588ca0499881b7 /pom.xml
parente66b95f220bbef1efeaee337749f91e7b15b1fd7 (diff)
Update to new Oparent
Issue-ID: AAF-509 Change-Id: Ic9235812d4a396fdc86a4938b626805c22773c00 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml21
1 files changed, 14 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index 985160e9..51c64638 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,12 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</parent>
<properties>
<nexusproxy>https://nexus.onap.org</nexusproxy>
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
@@ -49,7 +50,8 @@
<powermock.version>1.5.1</powermock.version>
<mockito.version>1.9.5</mockito.version>
<project.interfaceVersion>${project.version}</project.interfaceVersion>
- <project.jettyVersion>9.4.11.v20180605</project.jettyVersion>
+ <project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
+ <project.cassVersion>3.6.0</project.cassVersion>
</properties>
<build>
@@ -248,7 +250,10 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
- </dependency><dependency>
+ </dependency>
+
+ <!-- JettyVersion is partly covered in "OParent"
+ dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${project.jettyVersion}</version>
@@ -257,30 +262,32 @@
<artifactId>jetty-server</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
+ <artifactId>jetty-http</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
+ <artifactId>jetty-io</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
+ <artifactId>jetty-security</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
+ -->
<dependency>
<groupId>org.slf4j</groupId>