X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-service%2Fprovider%2Fpom.xml;h=ca3fda2880d4cdd4598aa207799fc6049f1e4b7e;hb=HEAD;hp=bbd759f4962c67a5c7e6e48a9f16ab2392ae929c;hpb=7cf0006685aa6dcf357dc4705ee29ec2df75a663;p=ccsdk%2Fsli%2Fadaptors.git

diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index bbd759f4..ca3fda28 100755
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -5,34 +5,32 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.2</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>aai-service-provider</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <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>
+        <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>
@@ -49,17 +47,12 @@
             <artifactId>sli-common</artifactId>
             <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>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>utils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-filter-base</artifactId>
             <scope>provided</scope>
-        </dependency>
+         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -70,24 +63,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -109,7 +86,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -120,6 +96,14 @@
             <artifactId>spring-core</artifactId>
             <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>
@@ -127,7 +111,7 @@
             <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>
@@ -139,13 +123,13 @@
                 <configuration>
                     <schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
                     <schemaIncludes>
-                        <value>aai_schema_v16.xsd</value>
+                        <value>aai_schema_v21.xsd</value>
                     </schemaIncludes>
                     <bindingIncludes>
                         <include>aai-schema-bindings.xjb</include>
                     </bindingIncludes>
                     <generateDirectory>${project.build.directory}/generated-sources/main/java</generateDirectory>
-                    <generatePackage>org.onap.aai.inventory.v16</generatePackage>
+                    <generatePackage>org.onap.aai.inventory.v21</generatePackage>
                     <extension>true</extension>
                     <args>
                         <arg>-Xannotate</arg>
@@ -154,7 +138,7 @@
                         <plugin>
                             <groupId>org.jvnet.jaxb2_commons</groupId>
                             <artifactId>jaxb2-basics-annotate</artifactId>
-                            <version>0.6.4</version>
+                            <version>0.6.5</version>
                         </plugin>
                     </plugins>
                 </configuration>