diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 70 |
1 files changed, 63 insertions, 7 deletions
@@ -1,17 +1,36 @@ +<!-- +================================================================================ +Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +================================================================================ +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========================================================= + +ECOMP is a trademark and service mark of AT&T Intellectual Property. +--> <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> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.onap.dcaegen2.platform</groupId> <artifactId>inventory-api</artifactId> - <version>1.2.0</version> + <version>3.0.2</version> <name>dcaegen2-platform-inventory-api</name> - <!--internal <version>2.4.0</version>--> + <!--internal <version>3.0.0</version>--> <properties> <dropwizard.version>1.1.1</dropwizard.version> @@ -21,7 +40,7 @@ <ecomp.inceptionYear>2017</ecomp.inceptionYear> <ecomp.organizationName>AT&T Intellectual Property. All rights reserved.</ecomp.organizationName> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshots.path>content/repositories/snapshots/</snapshots.path> <releases.path>content/repositories/releases/</releases.path> @@ -49,6 +68,16 @@ <groupId>io.dropwizard</groupId> <artifactId>dropwizard-core</artifactId> <version>${dropwizard.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.dropwizard</groupId> @@ -65,7 +94,21 @@ is malformed in the internal Maven central. --> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.2</version> + <version>4.5.5</version> + </dependency> + <dependency> + <!-- To address security issue - CVE-2017-7536 --> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>5.3.6.Final</version> + </dependency> + <dependency> + <!-- To address security issue - CVE-2017-9735 + REVIEW: Only updated jetty-util which may introduce runtime issues because + other jetty libraries are on 9.4.2 still --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>9.4.6.v20170531</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -171,6 +214,18 @@ <version>1.6.5</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.dropwizard</groupId> + <artifactId>dropwizard-testing</artifactId> + <version>${dropwizard.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.4.197</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -258,7 +313,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <!-- add Main-Class to manifest file --> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.openecomp.dcae.inventory.InventoryApplication</mainClass> + <mainClass>org.onap.dcae.inventory.InventoryApplication</mainClass> </transformer> </transformers> </configuration> @@ -285,7 +340,8 @@ <expose>8080</expose> </exposes> <imageTags> - <imageTag>${project.version}-${maven.build.timestamp}</imageTag> + <imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag> + <imageTag>${project.version}</imageTag> <imageTag>latest</imageTag> </imageTags> <serverId>${onap.nexus.dockerregistry.daily}</serverId> |