X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=blobdiff_plain;f=generic-resource-api%2Fclient%2Fpom.xml;h=3a3f39bb3619d5bf07e598ad10f6039f12194c00;hp=8e33a9760a5b8f5dddc2d35c9936245e4a52249d;hb=c6d87ae2f4e1d80f0a3dc867a4a4dd0819601688;hpb=b2ce85f8a244c87b6c858a77bcc9c939cb58c59a

diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml
index 8e33a976..3a3f39bb 100644
--- a/generic-resource-api/client/pom.xml
+++ b/generic-resource-api/client/pom.xml
@@ -1,62 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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.ccsdk.parent</groupId>
+        <artifactId>client-parent</artifactId>
+        <version>2.4.2</version>
+    </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
     <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>generic-resource-api-client</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.4.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>sdnc-northbound :: generic-resource-api:: ${project.artifactId}</name>
-    <url>http://wiki.onap.org</url>
     <description>POM to be used for yang2swagger generation of client in SDNC project</description>
-    
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>client-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-    </parent>
+    <url>http://wiki.onap.org</url>
+
+    <properties>
+        <api.name>generic-resource</api.name>
+        <jackson.version>2.9.5</jackson.version>
+        <jaxb.version>2.2.11</jaxb.version>
+    </properties>
 
     <dependencies>
-        <!-- This is where the yang comes from -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>generic-resource-api-model</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
-        <!-- End this is where the yang comes from -->        
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <includeGroupIds>org.opendaylight.mdsal.model, org.onap.sdnc.northbound</includeGroupIds>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-annotations</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.module</groupId>
+                        <artifactId>jackson-module-jaxb-annotations</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                        <artifactId>jackson-jaxrs-base</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                        <artifactId>jackson-jaxrs-json-provider</artifactId>
+                        <version>${jackson.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
+                            <inputSpec>${project.basedir}/../model/swagger/src/main/json/${api.name}.json</inputSpec>
+                            <language>spring</language>
                             <configOptions>
                                 <java8>true</java8>
                                 <withXml>true</withXml>
@@ -72,7 +106,7 @@
                                 <sourceFolder>src/main/java</sourceFolder>
                                 <useBeanValidation>true</useBeanValidation>
                                 <interfaceOnly>true</interfaceOnly>
-								<serializableModel>true</serializableModel>
+                                <serializableModel>true</serializableModel>
                             </configOptions>
                         </configuration>
                     </execution>
@@ -82,28 +116,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/generated-sources/swagger-maven-api-gen/client.yaml</file>
-                                    <type>yaml</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>