summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--discovery-ui/pom.xml4
-rw-r--r--distributions/msb-discovery/pom.xml4
-rw-r--r--distributions/pom.xml4
-rw-r--r--nginx-ext-consul/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--sdclient/discovery-service/dependency-reduced-pom.xml79
-rw-r--r--sdclient/discovery-service/pom.xml4
-rw-r--r--sdclient/discovery-standalone/pom.xml4
-rw-r--r--sdclient/pom.xml4
9 files changed, 92 insertions, 17 deletions
diff --git a/discovery-ui/pom.xml b/discovery-ui/pom.xml
index 6344943..58ec61e 100644
--- a/discovery-ui/pom.xml
+++ b/discovery-ui/pom.xml
@@ -21,14 +21,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>discovery-ui</artifactId>
<name>onap/msb/discovery/discovery-ui</name>
<packaging>jar</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</project>
diff --git a/distributions/msb-discovery/pom.xml b/distributions/msb-discovery/pom.xml
index ee68d9a..aac914a 100644
--- a/distributions/msb-discovery/pom.xml
+++ b/distributions/msb-discovery/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>msb-discovery</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<name>onap/msb/discovery/distributions/msb-discovery</name>
<packaging>pom</packaging>
diff --git a/distributions/pom.xml b/distributions/pom.xml
index c3d6f8b..fa5e23b 100644
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery.distributions</groupId>
<artifactId>distributions-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<name>onap/msb/discovery/distributions</name>
<packaging>pom</packaging>
<modules>
diff --git a/nginx-ext-consul/pom.xml b/nginx-ext-consul/pom.xml
index 1d8c28d..46285ee 100644
--- a/nginx-ext-consul/pom.xml
+++ b/nginx-ext-consul/pom.xml
@@ -20,14 +20,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>nginx-ext-consul</artifactId>
<name>onap/msb/discovery/nginx-ext-consul</name>
<packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<properties>
<outputdir>target/assembly/openresty</outputdir>
diff --git a/pom.xml b/pom.xml
index 2ba98dc..f2a6f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>msb-discovery</name>
diff --git a/sdclient/discovery-service/dependency-reduced-pom.xml b/sdclient/discovery-service/dependency-reduced-pom.xml
index bced298..7e607ba 100644
--- a/sdclient/discovery-service/dependency-reduced-pom.xml
+++ b/sdclient/discovery-service/dependency-reduced-pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>sdclient</artifactId>
<groupId>org.onap.msb.discovery</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery.sdclient</groupId>
<artifactId>discovery-service</artifactId>
<name>onap/msb/discovery/sdclient/discovery-service</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<build>
<resources>
<resource>
@@ -24,6 +24,81 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${basedir}/src/main/resources/swagger.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.kongchen</groupId>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <version>3.1.4</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <apiSources>
+ <apiSource>
+ <locations>${api-rest-package}</locations>
+ <schemes>
+ <scheme>http</scheme>
+ <scheme>https</scheme>
+ </schemes>
+ <host>${api-host-ip}:${api-host-port}</host>
+ <basePath>${api-base-path}</basePath>
+ <info>
+ <title>${api-title}</title>
+ <version>${api-version}</version>
+ <description>${api-description}</description>
+ <license>
+ <name>${api-license}</name>
+ </license>
+ </info>
+ <swaggerDirectory>${basedir}/target/classes</swaggerDirectory>
+ </apiSource>
+ </apiSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/swagger.json</file>
+ <type>json</type>
+ <classifier>schema</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
diff --git a/sdclient/discovery-service/pom.xml b/sdclient/discovery-service/pom.xml
index a3eb85c..227be6a 100644
--- a/sdclient/discovery-service/pom.xml
+++ b/sdclient/discovery-service/pom.xml
@@ -13,14 +13,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery.sdclient</groupId>
<artifactId>discovery-service</artifactId>
<name>onap/msb/discovery/sdclient/discovery-service</name>
<packaging>jar</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<dependencies>
diff --git a/sdclient/discovery-standalone/pom.xml b/sdclient/discovery-standalone/pom.xml
index dcba8bd..d72e881 100644
--- a/sdclient/discovery-standalone/pom.xml
+++ b/sdclient/discovery-standalone/pom.xml
@@ -11,14 +11,14 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.msb.discovery.sdclient</groupId>
<artifactId>discovery-standalone</artifactId>
<name>onap/msb/discovery/sdclient/discovery-standalone</name>
<packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<properties>
<packageid>discovery-standalone</packageid>
diff --git a/sdclient/pom.xml b/sdclient/pom.xml
index 69b116f..d7c81af 100644
--- a/sdclient/pom.xml
+++ b/sdclient/pom.xml
@@ -13,12 +13,12 @@
<parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>msb-discovery-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.msb.discovery</groupId>
<artifactId>sdclient</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<name>onap/msb/discovery/sdclient</name>
<packaging>pom</packaging>