diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 73 |
1 files changed, 58 insertions, 15 deletions
@@ -5,7 +5,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <relativePath /> </parent> <groupId>org.onap.so</groupId> @@ -32,8 +32,8 @@ <module>cloudify-client</module> <module>cxf-logging</module> <module>so-monitoring</module> - <module>vnfm-simulator</module> <module>packages</module> + <module>so-simulator</module> </modules> <properties> <project.mso.base.folder>.</project.mso.base.folder> @@ -49,7 +49,7 @@ <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions> <jacoco.version>0.7.5.201505241946</jacoco.version> <org.apache.maven.user-settings /> - <openstack.version>1.5.0-SNAPSHOT</openstack.version> + <openstack.version>1.5.1</openstack.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> <originalClassifier>original</originalClassifier> <docker.skip>true</docker.skip> @@ -58,7 +58,7 @@ <docker.buildArg.project_version>${project.version}</docker.buildArg.project_version> <docker.buildArg.artifact_id>${project.artifactId}</docker.buildArg.artifact_id> <docker.buildArg.docker_repository>${dockerPullRepo}</docker.buildArg.docker_repository> - <enforcer.skip>true</enforcer.skip> + <enforcer.skip>false</enforcer.skip> <nexusproxy>https://nexus.onap.org</nexusproxy> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> @@ -497,6 +497,42 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> + <executions> + <execution> + <id>enforce-property</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.powermock</exclude> + </excludes> + <searchTransitive>false</searchTransitive> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -593,21 +629,13 @@ <version>3.0.2</version> <executions> <execution> - <id>tests</id> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - <execution> <id>original</id> <phase>package</phase> <goals> <goal>jar</goal> </goals> <configuration> + <skip>true</skip> <classifier>${originalClassifier}</classifier> <includes> <include>**</include> @@ -636,6 +664,21 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-slf4j</artifactId> + <version>1.6.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <version>1.6.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-spring</artifactId> + <version>1.6.3-SNAPSHOT</version> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> @@ -837,12 +880,12 @@ <dependency> <groupId>net.javacrumbs.shedlock</groupId> <artifactId>shedlock-spring</artifactId> - <version>0.18.2</version> + <version>4.0.0</version> </dependency> <dependency> <groupId>net.javacrumbs.shedlock</groupId> <artifactId>shedlock-provider-jdbc-template</artifactId> - <version>0.18.2</version> + <version>4.0.0</version> </dependency> <dependency> <groupId>org.flywaydb</groupId> |