diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2018-09-13 21:01:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-13 21:01:20 +0000 |
| commit | f6e512bb85978cd8320ee4ea2ed4da234fa0d10b (patch) | |
| tree | 805dccfa30bbbea90ae9faf92ce11328ab5a234a | |
| parent | a203ce0d45caf8e103c3edaa4647268237d96306 (diff) | |
| parent | 925e5cb21c993145ae11763d7f67b935b966d690 (diff) | |
Merge "Use managed guava version"
| -rw-r--r-- | ecomp-sdk/epsdk-app-os/pom.xml | 11 | ||||
| -rw-r--r-- | ecomp-sdk/pom.xml | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 8b67bd5b..21f75af3 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> -<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"> +<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> <!-- This is the Maven project object model (POM) file for the open-source @@ -61,7 +60,7 @@ </systemPropertyVariables> </configuration> </plugin> - + <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> @@ -121,8 +120,8 @@ </execution> </executions> </plugin> - - + + <!-- add version number to manifest --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -373,6 +372,6 @@ <version>${jacoco.version}</version> <classifier>runtime</classifier> </dependency> - + </dependencies> </project> diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml index 4f812a90..a88481b4 100644 --- a/ecomp-sdk/pom.xml +++ b/ecomp-sdk/pom.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> <!-- OParent provides audits etc. --> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <!-- Portal SDK Maven parent project --> @@ -143,7 +142,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> @@ -222,7 +221,7 @@ </execution> </executions> </plugin> - + </plugins> </pluginManagement> |