Merge "Defining glassfish dependency version"
authorDan Timoney <dt5972@att.com>
Thu, 23 Aug 2018 15:10:22 +0000 (15:10 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 23 Aug 2018 15:10:22 +0000 (15:10 +0000)
odlparent/binding-parent/pom.xml
odlparent/bundle-parent/pom.xml
odlparent/client-parent/pom.xml [new file with mode: 0644]
odlparent/feature-repo-parent/pom.xml
odlparent/karaf4-parent/pom.xml
odlparent/mdsal-it-parent/pom.xml
odlparent/odlparent-lite/pom.xml
odlparent/odlparent/pom.xml
odlparent/pom.xml
odlparent/single-feature-parent/pom.xml

index 7cc3694..f2c01eb 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.mdsal</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>0.12.1</version>
+               <version>0.12.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                <artifactId>sal-test-model</artifactId>
                                <version>${odl.mdsal.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.netconf</groupId>
-                               <artifactId>sal-rest-connector</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                       </dependency>
-
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>sal-binding-broker-impl</artifactId>
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index ff841b5..59bdde7 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>bundle-parent</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
new file mode 100644 (file)
index 0000000..51ba507
--- /dev/null
@@ -0,0 +1,558 @@
+<?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">
+
+
+       <modelVersion>4.0.0</modelVersion>
+       <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.parent</groupId>
+       <artifactId>client-parent</artifactId>
+       <version>1.1.0-SNAPSHOT</version>
+
+       <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+       <url>http://wiki.onap.org</url>
+       <description>Root POM to be used for yang2swagger generation in CCSDK based projects</description>
+
+
+       <issueManagement>
+               <system>JIRA</system>
+               <url>https://jira.onap.org/</url>
+       </issueManagement>
+
+       <properties>
+
+               <!-- properties from oparent -->
+               <maven.compiler.source>1.8</maven.compiler.source>
+               <maven.compiler.target>1.8</maven.compiler.target>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+               <!-- sitePath may be overridden in the inheriting POM if desired -->
+               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+
+               <!-- ONAP repositories -->
+               <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+               <onap.nexus.port>443</onap.nexus.port>
+               <onap.nexus.protocol>https</onap.nexus.protocol>
+               <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+               <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+               <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+               <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+               <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+               <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+
+
+               <!-- OpenDaylight repositories -->
+               <opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
+               <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
+
+
+               <java.version.source>1.8</java.version.source>
+               <java.version.target>1.8</java.version.target>
+               <maven.compiler.version>3.6.1</maven.compiler.version>
+
+               <checkstyle.skip>true</checkstyle.skip>
+
+               <org.json.version>20170516</org.json.version>
+               <jackson.version>2.8.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 -->
+               <junit.version>4.11</junit.version>
+               <mockito.version>2.8.9</mockito.version>
+               <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>
+
+               <!-- ONAP repositories -->
+               <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+               <onap.nexus.port>443</onap.nexus.port>
+               <onap.nexus.protocol>https</onap.nexus.protocol>
+               <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+               <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+               <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+               <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+               <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+               <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+
+       </properties>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>${lombok.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>com.openpojo</groupId>
+                       <artifactId>openpojo</artifactId>
+                       <version>${openpojo.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.json</groupId>
+                       <artifactId>json</artifactId>
+                       <version>${org.json.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>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.datatype</groupId>
+                       <artifactId>jackson-datatype-jsr310</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.dataformat</groupId>
+                       <artifactId>jackson-dataformat-xml</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <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>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${spring.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.swagger</groupId>
+                       <artifactId>swagger-annotations</artifactId>
+                       <version>${swagger.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>javax.validation</groupId>
+                       <artifactId>validation-api</artifactId>
+                       <version>${javax.validation.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.swagger</groupId>
+                       <artifactId>swagger-jaxrs</artifactId>
+                       <version>${swagger.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.swagger</groupId>
+                       <artifactId>swagger-models</artifactId>
+                       <version>${swagger.version}</version>
+               </dependency>
+       </dependencies>
+
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>onap-public</id>
+                       <url>${onap.nexus.public-url}</url>
+                       <releases>
+                               <enabled>true</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>onap-staging</id>
+                       <url>${onap.nexus.staging-url}</url>
+                       <releases>
+                               <enabled>true</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>onap-snapshot</id>
+                       <url>${onap.nexus.snapshot-url}</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>opendaylight-mirror</id>
+                       <name>opendaylight-mirror</name>
+                       <url>${opendaylight.nexus.public-url}</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>opendaylight-snapshot</id>
+                       <name>opendaylight-snapshot</name>
+                       <url>${opendaylight.nexus.snapshot-url}</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <!-- Black Duck plugin dependencies -->
+               <pluginRepository>
+                       <id>JCenter</id>
+                       <name>JCenter Repository</name>
+                       <url>http://jcenter.bintray.com</url>
+               </pluginRepository>
+
+               <pluginRepository>
+                       <id>Restlet</id>
+                       <name>Restlet Repository</name>
+                       <url>http://maven.restlet.com</url>
+               </pluginRepository>
+
+               <pluginRepository>
+                       <id>onap-bintray</id>
+                       <name>onap-bintray</name>
+                       <url>https://nexus.onap.org/content/repositories/bintray/</url>
+               </pluginRepository>
+       </pluginRepositories>
+
+
+       <repositories>
+               <repository>
+                       <id>onap-public</id>
+                       <url>https://nexus.onap.org/content/groups/public</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>always</updatePolicy>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>onap-staging</id>
+                       <url>https://nexus.onap.org/content/groups/staging</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>always</updatePolicy>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>ecomp-release</id>
+                       <name>onap-repository-releases</name>
+                       <url>https://nexus.onap.org/content/repositories/releases</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>ecomp-snapshot</id>
+                       <name>onap-repository-snapshots</name>
+                       <url>https://nexus.onap.org/content/repositories/snapshots</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>opendaylight-mirror</id>
+                       <name>opendaylight-mirror</name>
+                       <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>opendaylight-snapshot</id>
+                       <name>opendaylight-snapshot</name>
+                       <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+                       <id>onap-bintray</id>
+                       <name>onap-bintray</name>
+                       <url>https://nexus.onap.org/content/repositories/bintray/</url>
+               </repository>
+       </repositories>
+
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <url>http://nexus.onap.org/content/repositories/releases</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <url>http://nexus.onap.org/content/repositories/snapshots</url>
+               </snapshotRepository>
+       </distributionManagement>
+
+       <build>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-compiler-plugin</artifactId>
+                                       <version>${maven.compiler.version}</version>
+                                       <configuration>
+                                               <source>${java.version.source}</source>
+                                               <target>${java.version.target}</target>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-source-plugin</artifactId>
+                                       <version>3.0.1</version>
+                                       <executions>
+                                               <execution>
+                                                       <id>install-sources</id>
+                                                       <goals>
+                                                               <goal>jar</goal>
+                                                       </goals>
+                                               </execution>
+                                               <execution>
+                                                       <id>deploy-sources</id>
+                                                       <phase>deploy</phase>
+                                                       <goals>
+                                                               <goal>jar</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-dependency-plugin</artifactId>
+                                       <version>2.10</version>
+                                       <configuration>
+                                               <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                                               <includes>**\/*.yang</includes>
+                                       </configuration>
+                                       <executions>
+                                               <execution>
+                                                       <id>unpack-shared-resources</id>
+                                                       <goals>
+                                                               <goal>unpack-dependencies</goal>
+                                                       </goals>
+                                                       <phase>initialize</phase>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-antrun-plugin</artifactId>
+                                       <version>1.8</version>
+                                       <executions>
+                                               <execution>
+                                                       <phase>initialize</phase>
+                                                       <goals>
+                                                               <goal>run</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                                       <configuration>
+                                               <tasks>
+                                                       <!-- flatten out structure -->
+                                                       <move todir="${project.build.directory}/dependency"
+                                                               failonerror="false">
+                                                               <fileset dir="${project.build.directory}/dependency" />
+                                                               <mapper type="flatten" />
+                                                       </move>
+                                                       <!-- move to yang folder -->
+                                                       <copy todir="${project.build.directory}/yang"
+                                                               failonerror="false">
+                                                               <fileset dir="${project.build.directory}/dependency"
+                                                                       includes="**/*.yang" />
+                                                               <mapper type="flatten" />
+                                                       </copy>
+                                                       <!-- add in hard coded items from src/main/yang -->
+                                                       <copy todir="${project.build.directory}/yang"
+                                                               failonerror="false">
+                                                               <fileset dir="${project.basedir}/src/main/yang"
+                                                                       includes="**/*.yang" />
+                                                               <mapper type="flatten" />
+                                                       </copy>
+                                               </tasks>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.opendaylight.yangtools</groupId>
+                                       <artifactId>yang-maven-plugin</artifactId>
+                                       <version>1.2.3</version>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>com.mrv.yangtools</groupId>
+                                                       <artifactId>swagger-maven-plugin</artifactId>
+                                                       <version>1.1.9</version>
+                                               </dependency>
+                                               <dependency>
+                                                       <groupId>com.github.romix</groupId>
+                                                       <artifactId>java-concurrent-hash-trie-map</artifactId>
+                                                       <version>0.2.23</version>
+                                               </dependency>
+                                       </dependencies>
+                                       <executions>
+                                               <execution>
+                                                       <goals>
+                                                               <goal>generate-sources</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <codeGenerators>
+                                                                       <generator>
+                                                                               <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                                                               <outputBaseDir>${project.build.directory}/generated-sources/swagger-maven-api-gen</outputBaseDir>
+                                                                               <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
+                                                                               <additionalConfiguration>
+                                                                                       <api-version>${project.version}</api-version>
+                                                                                       <base-module>client</base-module>
+                                                                                       <swagger-format>yaml</swagger-format>
+                                                                               </additionalConfiguration>
+                                                                       </generator>
+                                                               </codeGenerators>
+                                                               <inspectDependencies>false</inspectDependencies>
+                                                               <yangFilesRootDir>${project.build.directory}/yang</yangFilesRootDir>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                               <plugin>
+                                       <groupId>io.swagger</groupId>
+                                       <artifactId>swagger-codegen-maven-plugin</artifactId>
+                                       <version>2.2.3</version>
+                                       <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.build.directory}/generated-sources/swagger-maven-api-gen/client.yaml</inputSpec>
+                                                               <language>spring</language>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+
+
+                       </plugins>
+
+               </pluginManagement>
+               <plugins>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${onap.nexus.url}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>versions-maven-plugin</artifactId>
+                               <version>2.5</version>
+                               <configuration>
+                                       <processAllModules>true</processAllModules>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-scm-plugin</artifactId>
+                               <version>1.8.1</version>
+                               <configuration>
+                                       <tag>${project.artifactId}-${project.version}</tag>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <organization>
+               <name>ONAP</name>
+       </organization>
+</project>
index 7ed4ef7..61c79c5 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index 0fcf9a6..3ec5629 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>karaf4-parent</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
                <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index 5c87337..621b1fb 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.controller</groupId>
                <artifactId>mdsal-it-parent</artifactId>
-               <version>1.7.1</version>
+               <version>1.7.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index db080eb..65ec036 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index ac63b59..ba034d7 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>odlparent</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>
 
index b4c0891..da1f38f 100755 (executable)
@@ -39,6 +39,7 @@
                <module>odlparent</module>
                <module>odlparent-lite</module>
                <module>single-feature-parent</module>
+               <module>client-parent</module>
        </modules>
 
 </project>
index cb4833d..c9aabdc 100755 (executable)
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>3.1.1</version>
+               <version>3.1.3</version>
                <relativePath />
        </parent>
 
@@ -30,7 +30,7 @@
 
        <properties>
 
-               <!--- properties from oparent -->
+               <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-               <!--- end of properties from oparent -->
+               <!-- end of properties from oparent -->
 
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
 
 
                <!-- Support libraries used by OpenDaylight -->
-               <odl.mdsal.version>1.7.1</odl.mdsal.version>
-               <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+               <odl.mdsal.version>1.7.3</odl.mdsal.version>
+               <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.1</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <!-- produce source artifact for main project sources -->
-                                                               <goal>jar-no-fork</goal>
-
-                                                               <!-- produce source artifact for project test sources -->
-                                                               <goal>test-jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
 
                        </plugins>