Merge "update sync queries to use searh data service"

[aai/sparky-be.git] / sparkybe-onap-service / pom.xml

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 69d5884..5527f71 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,12 +4,12 @@
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.10.RELEASE</version>
+               <version>1.5.12.RELEASE</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-service</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
+       <version>1.3.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>
@@ -17,12 +17,16 @@
                <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
                <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
                <frontEndArtifactId>sparky-fe</frontEndArtifactId>
-               <frontEndVersion>1.2.0</frontEndVersion>
+               <frontEndVersion>1.3.0-SNAPSHOT</frontEndVersion>
                <serverPort>9517</serverPort>
                <sslport>8000</sslport>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <camel-spring-boot.version>2.20.0</camel-spring-boot.version>
                <config-home>${basedir}/</config-home>
+               <version.aai.aai-schema-ingest>1.2.4</version.aai.aai-schema-ingest>
+               <version.aai-schema>1.2.4</version.aai-schema>
+               <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
        </properties>
 
 
@@ -40,12 +44,6 @@
                                <scope>import</scope>
                        </dependency>
 
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-                       <version>1.2.1</version>
-               </dependency>
-
 
                </dependencies>
        </dependencyManagement>
@@ -99,6 +97,10 @@ some of the depedencies should probably have a scope of provided so they don't a
                                <groupId>ch.qos.logback</groupId>
                                <artifactId>logback-classic</artifactId>
                                </exclusion>
+                               <exclusion>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>log4j-over-slf4j</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
@@ -214,13 +216,25 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <version>1.2.2-SNAPSHOT</version>
+                       <version>${version.aai-schema}</version>
                </dependency>
 
+       <dependency>
+                   <groupId>org.onap.aai.aai-common</groupId>
+                   <artifactId>aai-schema-ingest</artifactId>
+                   <version>${version.aai.aai-schema-ingest}</version>
+                   <exclusions>
+                               <exclusion>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>slf4j-log4j12</artifactId>
+                               </exclusion>
+                   </exclusions>
+           </dependency>
+                               
                <dependency>
                        <groupId>org.onap.aai</groupId>
                        <artifactId>rest-client</artifactId>
-                       <version>1.2.1</version>
+                       <version>1.3.0-SNAPSHOT</version>
                </dependency>
 
                <!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
@@ -313,6 +327,12 @@ some of the depedencies should probably have a scope of provided so they don't a
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
+        <dependency>
+                   <groupId>javax.inject</groupId>
+                   <artifactId>javax.inject</artifactId>
+                   <version>1</version>
+                       <scope>test</scope>
+               </dependency>           
 
                <dependency>
                        <groupId>org.hamcrest</groupId>
@@ -556,20 +576,72 @@ some of the depedencies should probably have a scope of provided so they don't a
                                </executions>
                        </plugin>
  -->
-               </plugins>
-       </build>
-
-               <distributionManagement>
+<plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                    <executions>
+                        <execution>
+                            <id>default-deploy</id>
+                            <phase>none</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+                <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>
+             </plugins>
+</build>
+
+       
+    <distributionManagement>
+       <repository>
+          <id>ecomp-releases</id>
+          <name>ECOMP Release Repository</name>
+          <url>${onap.nexus.url}/content/repositories/releases/</url>
+       </repository>
+       <snapshotRepository>
+          <id>ecomp-snapshots</id>
+          <name>ECOMP Snapshot Repository</name>
+          <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+      </snapshotRepository>
+      <site>
+        <id>ecomp-site</id>
+        <url>dav:${onap.nexus.url}${sitePath}</url>
+      </site>
+   </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven 2 repository 2</name>
+            <url>http://repo2.maven.org/maven2/</url>
+        </repository>
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
+            <url>${onap.nexus.url}/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ECOMP Staging Repository</name>
+            <url>${onap.nexus.url}/content/repositories/staging/</url>
         </repository>
-        <snapshotRepository>
+        <repository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+
 
 </project>