Bump minor version

[sdnc/northbound.git] / generic-resource-api / provider / pom.xml

diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml
index 649b35e..4d82ec9 100644 (file)
--- a/generic-resource-api/provider/pom.xml
+++ b/generic-resource-api/provider/pom.xml
@@ -5,16 +5,16 @@
        <parent>
                <groupId>org.onap.sdnc.northbound</groupId>
                <artifactId>generic-resource-api</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
-       <artifactId>generic-resource-api.provider</artifactId>
+       <artifactId>generic-resource-api-provider</artifactId>
        <packaging>bundle</packaging>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.sdnc.northbound</groupId>
-                       <artifactId>generic-resource-api.model</artifactId>
+                       <artifactId>generic-resource-api-model</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
@@ -37,7 +37,6 @@
                        <version>${odl.mdsal.version}</version>
                </dependency>
 
-        <!--
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-test-model</artifactId>
@@ -60,12 +59,12 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-broker-impl</artifactId>
-                       <version>${odl.mdsal.version}}</version>
+                       <version>${odl.mdsal.version}</version>
                        <type>test-jar</type>
                        <classifier>tests</classifier>
                        <scope>test</scope>
                </dependency>
-        -->
+
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
@@ -76,114 +75,42 @@
             <artifactId>sli-common</artifactId>
             <version>${sdnctl.sli.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <version>${sdnctl.sli.version}</version>
+        </dependency>
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
                        <version>${junit.version}</version>
                        <scope>test</scope>
                </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
-        </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+                       <version>${mockito.version}</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
        <build>
            <plugins>
-        <!--
-               <plugin>
-                <groupId>com.brocade.tools</groupId>
-                    <artifactId>providermodule-plugin</artifactId>
-                    <version>1.0.0-SNAPSHOT</version>
-                    <configuration>
-                        <packageId>org.onap.sdnc.northbound</packageId>
-                        <appName>generic-resource-api</appName>
-                    </configuration>
-                    <executions>
-                       <execution>
-                          <phase>process-sources</phase>
-                          <goals>
-                              <goal>process</goal>
-                          </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
+
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>
-                                               <Export-Package>org.opendaylight.controller.config.yang.config.generic-resource-api_provider.impl</Export-Package>
+                                               <Export-Package>!*</Export-Package>
                                                <Import-Package>*</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>config</id>
-                                               <goals>
-                                                       <goal>generate-sources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <codeGenerators>
-                                                               <generator>
-                                                                       <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                                                                       <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                                                                       <additionalConfiguration>
-                                                                               <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                                                                       </additionalConfiguration>
-                                                               </generator>
-                                                               <generator>
-                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                                                       <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                                               </generator>
-                                                       </codeGenerators>
-                                                       <inspectDependencies>true</inspectDependencies>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.opendaylight.mdsal</groupId>
-                                               <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.sal.api.gen.plugin.version}</version>
-                                               <type>jar</type>
-                                       </dependency>
-                                       <dependency>
-                                               <groupId>org.opendaylight.controller</groupId>
-                                               <artifactId>yang-jmx-generator-plugin</artifactId>
-                                               <version>${odl.yang.jmx.generator.version}</version>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-artifacts</id>
-                                               <goals>
-                                                       <goal>attach-artifact</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>${project.build.directory}/classes/initial/generic-resource-api-provider.xml</file>
-                                                                       <type>xml</type>
-                                                                       <classifier>config</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+
+
                </plugins>
        </build>
 </project>