<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- <relativePath />
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>aai-service-provider</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
- <url>http://maven.apache.org</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- <version>${sdnctl.sli.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
+ <!-- let filters project deliver this to the karaf container -->
<dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
- <version>${sdnctl.sli.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>utils-provider</artifactId>
- <version>${sdnctl.sli.version}</version>
- </dependency>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-filter-base</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>equinoxSDK381</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.osgi.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.client.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${apache.httpcomponents.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${apache.httpcomponents.client.version}</version>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <!-- <type>bundle</type> -->
- <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.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <!-- <type>bundle</type> -->
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <!-- <type>bundle</type> -->
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
</dependency>
-
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.8.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>4.3.5.RELEASE</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.13.1</version>
+ <version>0.14.0</version>
<executions>
<execution>
- <id>gen-xjc</id>
+ <id>gen-xjc</id>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
- <schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
+ <schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
<schemaIncludes>
- <value>aai_schema_v13.xsd</value>
+ <value>aai_schema_v19.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.v13</generatePackage>
+ <generatePackage>org.onap.aai.inventory.v19</generatePackage>
<extension>true</extension>
- <args>
- <arg>-Xannotate</arg>
- </args>
+ <args>
+ <arg>-Xannotate</arg>
+ </args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics-annotate</artifactId>
- <version>0.6.4</version>
+ <artifactId>jaxb2-basics-annotate</artifactId>
+ <version>0.6.5</version>
</plugin>
</plugins>
</configuration>