summaryrefslogtreecommitdiffstats
path: root/odlparent/client-parent
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-04-21 13:26:37 -0400
committerDan Timoney <dtimoney@att.com>2020-04-21 13:26:37 -0400
commitc24de69490cb2c9b32b39f97a726dc57811dab3e (patch)
treec846fd2aad94bcb920429121031e99eb72acc86f /odlparent/client-parent
parentb4c9d0b09f912733c2fc374f8bb2f8e1bb4508dd (diff)
Fix settings for yang2swagger
Fix settings for yang2swagger in client pom Change-Id: I345007bc573ffe7af166c7fd2a307c1693d8abb1 Issue-ID: SDNC-1173 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'odlparent/client-parent')
-rw-r--r--odlparent/client-parent/pom.xml26
1 files changed, 16 insertions, 10 deletions
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 0f5aefe2..c7d771dc 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -62,7 +62,7 @@
<checkstyle.skip>true</checkstyle.skip>
<org.json.version>20170516</org.json.version>
- <jackson.version>2.8.9</jackson.version>
+ <jackson.version>2.9.5</jackson.version>
<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
is fixed (either in PowerMock or with a new JUnit release) -->
<!-- Used everywhere -->
@@ -71,8 +71,10 @@
<lombok.version>1.18.0</lombok.version>
<openpojo.version>0.8.10</openpojo.version>
<spring.version>4.3.7.RELEASE</spring.version>
- <javax.validation.version>2.0.0.Final</javax.validation.version>
- <swagger.version>1.5.16</swagger.version>
+ <javax.validation.version>1.1.0.Final</javax.validation.version>
+ <swagger.version>1.5.21</swagger.version>
+ <yangtools.version>1.2.3</yangtools.version>
+ <yang2swagger.version>1.1.12</yang2swagger.version>
<!-- ONAP repositories -->
<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -85,6 +87,9 @@
<onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
<onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+ <!-- Default api name for client -->
+ <api.name>client</api.name>
+
</properties>
<dependencies>
@@ -422,17 +427,17 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${yangtools.version}</version>
<dependencies>
<dependency>
<groupId>com.mrv.yangtools</groupId>
<artifactId>swagger-maven-plugin</artifactId>
- <version>1.1.9</version>
+ <version>${yang2swagger.version}</version>
</dependency>
<dependency>
- <groupId>com.github.romix</groupId>
- <artifactId>java-concurrent-hash-trie-map</artifactId>
- <version>0.2.23</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
</dependencies>
<executions>
@@ -449,8 +454,9 @@
<resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
<additionalConfiguration>
<api-version>${project.version}</api-version>
- <base-module>client</base-module>
+ <base-module>${api.name}</base-module>
<swagger-format>yaml</swagger-format>
+ <path-format>odl</path-format>
</additionalConfiguration>
</generator>
</codeGenerators>
@@ -502,7 +508,7 @@
<goal>generate</goal>
</goals>
<configuration>
- <inputSpec>${project.build.directory}/generated-sources/swagger-maven-api-gen/client.yaml</inputSpec>
+ <inputSpec>${project.build.directory}/generated-sources/swagger-maven-api-gen/${api.name}.yaml</inputSpec>
<language>spring</language>
</configuration>
</execution>