Merge "[SDNC-30] summary"
authorDan Timoney <dtimoney@att.com>
Tue, 15 Aug 2017 13:31:27 +0000 (13:31 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 15 Aug 2017 13:31:27 +0000 (13:31 +0000)
1  2 
aai-service/provider/pom.xml

@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                <artifactId>aai-service</artifactId>
 -              <version>0.0.1-SNAPSHOT</version>
 +              <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>aai-service-provider</artifactId>
        <packaging>bundle</packaging>
@@@ -22,7 -22,7 +22,7 @@@
                </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
 -                      <artifactId>mockito-all</artifactId>
 +                      <artifactId>mockito-core</artifactId>
                        <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
                                <configuration>
                                        <instructions>
                                                <Bundle-SymbolicName>org.openecomp.sdnc.sli.aai</Bundle-SymbolicName>
-                                               <Bundle-Activator>org.openecomp.sdnc.sli.aai.AAIServiceActivator</Bundle-Activator>
-                                               <Export-Package>org.openecomp.sdnc.sli.aai.*,org.openecomp.aai.inventory.v10.*</Export-Package>
+                                               <Bundle-Activator>org.onap.ccsdk.sli.adaptors.aai.AAIServiceActivator</Bundle-Activator>
+                                               <Export-Package>org.onap.ccsdk.sli.adaptors.aai.*,org.openecomp.aai.inventory.v11.*</Export-Package>
                          <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,org.apache.commons.lang3.*,javax.xml.bind.annotation.*,javax.ws.rs.*,javax.ws.rs.core.*,com.fasterxml.jackson.module.jaxb.*,com.sun.jersey.client.urlconnection.*,com.sun.jersey.api.client.config.*,com.fasterxml.jackson.databind.type.*,com.fasterxml.jackson.module.jaxb.*,com.fasterxml.jackson.databind.introspect.*,com.fasterxml.jackson.annotation.*,com.fasterxml.jackson.databind.*</Import-Package>
                                                <Import-Package>*</Import-Package>
                                                <Embed-Transitive>true</Embed-Transitive>
                                <configuration>
                                <schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
                                        <schemaIncludes>
-                                               <value>aai_schema_v10.xsd</value>
+                                               <value>aai_schema_v11.xsd</value>
                                        </schemaIncludes>
                                        <bindingIncludes>
                                                <include>aai-schema-bindings.xjb</include>
                                        </bindingIncludes>
                                        <generateDirectory>${project.build.directory}/generated-sources/main/java</generateDirectory>
-                                         <generatePackage>org.openecomp.aai.inventory.v10</generatePackage>
+                                         <generatePackage>org.openecomp.aai.inventory.v11</generatePackage>
                                        <extension>true</extension>
                                <args>
                                        <arg>-Xannotate</arg>