aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml86
1 files changed, 66 insertions, 20 deletions
diff --git a/pom.xml b/pom.xml
index 277d60d938..5e4cadc241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
<modules>
<module>deployment-configs</module>
<module>common</module>
+ <module>graph-inventory</module>
<module>mso-catalog-db</module>
<module>mso-api-handlers</module>
<module>adapters</module>
@@ -49,7 +50,7 @@
<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
<jacoco.version>0.8.5</jacoco.version>
<org.apache.maven.user-settings />
- <openstack.version>1.5.2-SNAPSHOT</openstack.version>
+ <openstack.version>1.6.1-SNAPSHOT</openstack.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
<originalClassifier>original</originalClassifier>
<docker.skip>true</docker.skip>
@@ -70,7 +71,8 @@
<camunda.springboot.version>3.2.0</camunda.springboot.version>
<format.skipValidate>false</format.skipValidate>
<format.skipExecute>true</format.skipExecute>
- <io.fabric8.version>4.1.0</io.fabric8.version>
+ <io.fabric8.version>0.33.0</io.fabric8.version>
+ <appc.client.version>1.7.1</appc.client.version>
</properties>
<distributionManagement>
<repository>
@@ -210,17 +212,9 @@
</resource>
</resources>
<plugins>
- <!-- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin> -->
+ <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.7</version>
+ <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId> </configuration> </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -540,9 +534,46 @@
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
<plugin>
<groupId>io.fabric8</groupId>
- <artifactId>fabric8-maven-plugin</artifactId>
+ <artifactId>docker-maven-plugin</artifactId>
<version>${io.fabric8.version}</version>
<configuration>
<skip>${docker.skip}</skip>
@@ -560,7 +591,7 @@
<images>
<image>
<alias>service</alias>
- <name>${artifactId}:${project.version}</name>
+ <name>${project.artifactId}:${project.version}</name>
<build>
<dockerFileDir>${project.build.directory}</dockerFileDir>
</build>
@@ -670,17 +701,14 @@
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
- <version>1.6.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
- <version>1.6.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-spring</artifactId>
- <version>1.6.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -830,6 +858,21 @@
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<!-- force use of version 4.5 everywhere in transient deps, aligned on WildFly 10 version -->
<dependency>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-slf4j</artifactId>
+ <version>1.6.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-filter-base</artifactId>
+ <version>1.6.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-filter-spring</artifactId>
+ <version>1.6.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
@@ -901,6 +944,11 @@
<artifactId>json</artifactId>
<version>20140107</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.aai.schema-service</groupId>
+ <artifactId>aai-schema</artifactId>
+ <version>1.7.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
@@ -909,7 +957,6 @@
<properties>
<docker.skip>false</docker.skip>
<docker.skip.build>false</docker.skip.build>
- <fabric8.skipResourceValidation>true</fabric8.skipResourceValidation>
</properties>
</profile>
<profile>
@@ -918,7 +965,6 @@
<docker.skip>false</docker.skip>
<docker.skip.build>false</docker.skip.build>
<docker.skip.push>false</docker.skip.push>
- <fabric8.skipResourceValidation>true</fabric8.skipResourceValidation>
</properties>
</profile>
<profile>