diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-24 15:24:19 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-27 10:29:08 -0700 |
| commit | 26b50af4c6efc1e4c4b834048ec159fdd77d17a1 (patch) | |
| tree | c43e2bba5dc19048d47622b69149bab20ab551bc /javatoscachecker | |
| parent | 1ca11342468ac121e6468ecf5ece5bdfa329eecb (diff) | |
Use managed guava version
Use centrally managed guava version specified in
oparent. Includes upgrade to oparent 1.2.0.
This change was submitted by script and may include
additional whitespace or formatting changes.
Change-Id: I730a98eec3ed1785c90da091611b0a20c82264ea
Issue-ID: INT-619
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'javatoscachecker')
| -rw-r--r-- | javatoscachecker/checker/pom.xml | 6 | ||||
| -rw-r--r-- | javatoscachecker/pom.xml | 21 |
2 files changed, 10 insertions, 17 deletions
diff --git a/javatoscachecker/checker/pom.xml b/javatoscachecker/checker/pom.xml index 93c4822..469faca 100644 --- a/javatoscachecker/checker/pom.xml +++ b/javatoscachecker/checker/pom.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- * Copyright (c) 2017 <AT&T>. All rights reserved. * =================================================================== @@ -12,7 +11,6 @@ * 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. --> - <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> @@ -91,7 +89,7 @@ </archive> </configuration> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -193,7 +191,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>[21.0,)</version> + </dependency> <dependency> <groupId>org.yaml</groupId> diff --git a/javatoscachecker/pom.xml b/javatoscachecker/pom.xml index a7df537..b26c1d6 100644 --- a/javatoscachecker/pom.xml +++ b/javatoscachecker/pom.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- * Copyright (c) 2017 <AT&T>. All rights reserved. * =================================================================== @@ -12,17 +11,13 @@ * 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. --> - -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> <relativePath/> </parent> @@ -46,13 +41,13 @@ <snapshots.path>content/repositories/snapshots/</snapshots.path> <staging.path>content/repositories/staging/</staging.path> </properties> - + <modules> <module>kwalify</module> <module>checker</module> <module>service</module> </modules> - + <distributionManagement> <repository> <id>ecomp-releases</id> @@ -69,7 +64,7 @@ <url>dav:${nexusproxy}${sitePath}</url> </site> </distributionManagement> - + <!-- Black Duck plugin dependencies --> <!-- <pluginRepositories> @@ -78,7 +73,7 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - + <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> @@ -106,10 +101,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> - <skip /> + <skip/> </configuration> </plugin> - + <!-- <plugin> <groupId>org.jacoco</groupId> |