aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rwxr-xr-xpom.xml166
1 files changed, 85 insertions, 81 deletions
diff --git a/pom.xml b/pom.xml
index 891c3a2b..b57733dd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,34 @@
-<!-- ============LICENSE_START==========================================
- org.onap.music ===================================================================
- Copyright (c) 2017 AT&T Intellectual Property ===================================================================
- Licensed under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License. You may obtain a copy
- of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. ============LICENSE_END=============================================
- ==================================================================== -->
+<!--
+ ============LICENSE_START==========================================
+ org.onap.music
+ ===================================================================
+ Copyright (c) 2017 AT&T Intellectual Property
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ============LICENSE_END=============================================
+ ====================================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.music</groupId>
<artifactId>MUSIC</artifactId>
<packaging>war</packaging>
- <version>2.4.15</version>
+ <version>2.4.18</version>
<description>
This is the MUSIC REST interface, packaged as a war file.
- </description>
+ </description>
<parent>
<groupId>org.onap.oparent</groupId>
@@ -29,8 +39,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jersey1.version>1.17</jersey1.version>
- <jersey2.version>2.26</jersey2.version>
+ <jersey1.version>1.19</jersey1.version>
<jaxrs.version>2.0.1</jaxrs.version>
<cassandra.version>3.2.0</cassandra.version>
<zookeeper.version>3.4.6</zookeeper.version>
@@ -158,6 +167,21 @@
</build>
<dependencies>
+ <!-- Development -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- /Development -->
+
<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -187,13 +211,16 @@
<version>1.0.1-oss</version>
</dependency>
<!-- End Logging -->
-
+
+ <!-- Cassandra -->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.version}</version>
</dependency>
-
+ <!-- /Cassandra -->
+
+ <!-- Zookeeper -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -205,7 +232,9 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- /Zookeeper -->
+
+ <!-- Jersey -->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
@@ -221,19 +250,13 @@
<artifactId>jersey-json</artifactId>
<version>${jersey1.version}</version>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey1.version}</version>
</dependency>
- <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version> <scope>provided</scope> </dependency>
- <!-- <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency>
- <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId>
- <version>3.3.9</version> </dependency> -->
+ <!-- /Jersey -->
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-core</artifactId>
@@ -244,17 +267,14 @@
<artifactId>commons-codec</artifactId>
<version>1.11</version>
</dependency>
+
+ <!-- Testing -->
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey-jaxrs</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
</dependency>
- <!-- Testing -->
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
@@ -262,18 +282,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<version>2.3.0</version>
@@ -289,13 +297,29 @@
</exclusions>
<scope>test</scope>
</dependency>
- <!-- Added to force update dependency jars that are not secure Cassandra-Unit
- depends on older version that is not secure -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- /Testing -->
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jersey-jaxrs</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>19.0</version>
+ </dependency>
</dependencies>
<reporting>
@@ -362,35 +386,15 @@
</build>
</image>
<!-- Zookeeper -->
- <!--
- <image>
- <name>onap/music/zookeeper_music</name>
- <alias>docker_zookeeper</alias>
- <build>
- <cleanup>true</cleanup>
- <tags>
- <tag>3.4-${timestamp}</tag>
- <tag>3.4-latest</tag>
- </tags>
- <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir>
- </build>
- </image>
- -->
+ <!-- <image> <name>onap/music/zookeeper_music</name>
+ <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag>
+ <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir>
+ </build> </image> -->
<!-- tomcat 8.5 -->
- <!--
- <image>
- <name>onap/music/tomcat_music</name>
- <alias>docker_tomcat</alias>
- <build>
- <cleanup>true</cleanup>
- <tags>
- <tag>8.5-${timestamp}</tag>
- <tag>8.5-latest</tag>
- </tags>
- <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
- </build>
- </image>\
- -->
+ <!-- <image> <name>onap/music/tomcat_music</name>
+ <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
+ <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
+ </build> </image>\ -->
</images>
</configuration>
<executions>