diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 44 |
1 files changed, 17 insertions, 27 deletions
@@ -1,11 +1,11 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.so</groupId> <artifactId>so</artifactId> @@ -29,6 +29,8 @@ <module>asdc-controller</module> <module>bpmn</module> <module>cloudify-client</module> + <module>cxf-logging</module> + <module>so-monitoring</module> <module>packages</module> </modules> <properties> @@ -44,7 +46,7 @@ <sonar.projectVersion>${project.version}</sonar.projectVersion> <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions> <jacoco.version>0.7.5.201505241946</jacoco.version> - <org.apache.maven.user-settings></org.apache.maven.user-settings> + <org.apache.maven.user-settings/> <openstack.version>1.2.2</openstack.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> <springboot.version>1.5.13.RELEASE</springboot.version> @@ -57,7 +59,6 @@ <docker.buildArg.docker_repository>${dockerPullRepo}</docker.buildArg.docker_repository> <enforcer.skip>true</enforcer.skip> <nexusproxy>https://nexus.onap.org</nexusproxy> - <stagingNexusPath>content/repositories/staging/</stagingNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <publicNexusPath>content/repositories/public/</publicNexusPath> @@ -112,13 +113,6 @@ <url>http://maven.restlet.com</url> </pluginRepository> <pluginRepository> - <id>ecomp-staging</id> - <url>${nexusproxy}/${stagingNexusPath}</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> <id>ecomp-public</id> <url>${nexusproxy}/${publicNexusPath}</url> <snapshots> @@ -142,13 +136,6 @@ </pluginRepositories> <repositories> <repository> - <id>ecomp-staging</id> - <url>https://nexus.onap.org/content/repositories/staging/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> <id>ecomp-public</id> <url>https://nexus.onap.org/content/repositories/public/</url> <snapshots> @@ -233,7 +220,7 @@ <artifactId>maven-deploy-plugin</artifactId> <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter --> <configuration> - <skip /> + <skip/> </configuration> </plugin> @@ -249,6 +236,9 @@ <showWarnings>true</showWarnings> <source>1.8</source> <target>1.8</target> + <compilerArgs> + <arg>-parameters</arg> + </compilerArgs> </configuration> </plugin> <plugin> @@ -439,7 +429,7 @@ <version>2.20</version> <configuration> <systemPropertyVariables> - <so.log.level>${so.log.level}</so.log.level> + <so.log.level>DEBUG</so.log.level> </systemPropertyVariables> <rerunFailingTestsCount>2</rerunFailingTestsCount> </configuration> @@ -451,7 +441,7 @@ <configuration> <skip>true</skip> <systemPropertyVariables> - <so.log.level>${so.log.level}</so.log.level> + <so.log.level>DEBUG</so.log.level> </systemPropertyVariables> <rerunFailingTestsCount>2</rerunFailingTestsCount> </configuration> @@ -518,7 +508,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.7</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -528,12 +518,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.7</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.7</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> @@ -799,7 +789,7 @@ </property> </activation> <properties> - <originalClassifier></originalClassifier> + <originalClassifier/> </properties> </profile> </profiles> |